Updates and corrections (#67)

* clean up dependency definitions

* add new config keys for the webserver related pieces

* clean up docker compose, key ordering and remove deprecated key

* fix the warning around non-json ENTRYPOINT directive

* make requested changes

Author: AbstractUmbra

Dockerfile

@@ -51,4 +51,4 @@ COPY poetry.lock pyproject.toml ./
 RUN poetry install --only=main
 
 COPY . /app/
-ENTRYPOINT poetry run python -O launcher.py
+ENTRYPOINT ["poetry", "run", "python", "-O", "launcher.py" ]

config.template.toml

@@ -31,3 +31,7 @@ url = 'http://snekbox:8060/eval' # default url
 
 [GITHUB] # optional
 bot_secret = ""
+
+[WEBSERVER] # optional
+host = "127.0.0.1"
+port = 2332

dev-requirements.txt

@@ -1,14 +1,15 @@
 services:
   bot:
-    container_name: pythonista-bot
-    depends_on:
-      - database
     image: ghcr.io/pythonistaguild/pythonista-bot:latest
+    container_name: pythonista-bot
     restart: unless-stopped
     volumes:
       - ./config.toml:/app/config.toml:ro
+    depends_on:
+      - database
 
   database:
+    image: postgres
     container_name: pythonista-bot-db
     env_file:
       - .env
@@ -19,21 +20,16 @@ services:
     healthcheck:
       interval: 1s
       retries: 10
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"
-        ]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       timeout: 5s
-    image: postgres
     restart: always
     volumes:
       - pgdata:/var/lib/postgresql/data
       - ./database/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
 
   snekbox:
-    container_name: snekbox-eval
     image: ghcr.io/python-discord/snekbox
+    container_name: snekbox-eval
     ipc: "none"
     ports:
       - "127.0.0.1:8060:8060"
@@ -42,6 +38,5 @@ services:
       - "snekbox"
     restart: always
 
-version: "3"
 volumes:
   pgdata:

docker-compose.yml

@@ -63,12 +63,14 @@ async def main() -> None:
                 extension.name,
             )
 
-        app: Application = Application(bot=bot)
-        config: uvicorn.Config = uvicorn.Config(app, port=2332)
-        server: uvicorn.Server = uvicorn.Server(config)
-
-        tasks.add(asyncio.create_task(bot.start(core.CONFIG["TOKENS"]["bot"])))
-        await server.serve()
+        server_config = core.CONFIG.get("WEBSERVER")
+        if server_config:
+            app: Application = Application(bot=bot)
+            config: uvicorn.Config = uvicorn.Config(app, host=server_config["host"], port=server_config["port"])
+            server: uvicorn.Server = uvicorn.Server(config)
+
+            tasks.add(asyncio.create_task(server.serve()))
+        await bot.start(core.CONFIG["TOKENS"]["bot"])
 
 
 try:

launcher.py

@@ -12,7 +12,9 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-"discord.py" = { git = "https://github.com/Rapptz/discord.py.git"}
+"discord.py" = { git = "https://github.com/Rapptz/discord.py.git", extras = [
+    "speed",
+] }
 aiohttp = "*"
 asyncpg = "*"
 toml = "*"
@@ -26,16 +28,11 @@ ruff = "*"
 "asyncpg-stubs" = "*"
 "typing-extensions" = "*"
 
-[tool.black]
-line-length = 125
-preview = true
-
 [tool.ruff]
 line-length = 125
 target-version = "py311"
 
 [tool.ruff.lint]
-exclude = ["docs/extensions/*.py"]
 select = [
     "C4",
     "F",

poetry.lock

@@ -34,6 +34,11 @@ class Suggestions(TypedDict):
     webhook_url: str
 
 
+class Webserver(TypedDict):
+    host: str
+    port: int
+
+
 class Config(TypedDict):
     prefix: str
     owner_ids: NotRequired[list[int]]
@@ -43,3 +48,4 @@ class Config(TypedDict):
     SNEKBOX: NotRequired[Snekbox]
     BADBIN: BadBin
     SUGGESTIONS: NotRequired[Suggestions]
+    WEBSERVER: NotRequired[Webserver]