Fix import paths.

.dockerignore

@@ -0,0 +1,4 @@
+.*
+Dockerfile
+renovate.json
+README.md

.editorconfig

@@ -0,0 +1,16 @@
+# see https://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.gitea/workflows/build_develop.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling

.gitea/workflows/build_latest.yaml

@@ -17,11 +17,11 @@ jobs:
       - name: Install Docker
         uses: https://github.com/papodaca/install-docker-action@v1
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: gitea.cheezers.org
           username: imcompiling
-          password: $${{ secrets.PASSWORD }}
+          password: ${{ secrets.PASSWORD }}
       - name: Build Docker Image
         run: docker build -t gitea.cheezers.org/imcompiling/off-cooldown-bot:latest .
       - name: Push Docker Image

.vscode/extensions.json

@@ -1,8 +1,9 @@
 {
   "recommendations": [
-    "ms-python.vscode-pylance",
+      "ms-python.vscode-pylance",
-    "ms-python.python",
+      "ms-python.python",
-    "ms-python.debugpy",
+      "ms-python.debugpy",
-    "charliermarsh.ruff"
+      "charliermarsh.ruff",
+      "editorconfig.editorconfig"
   ]
 }

.vscode/launch.json

@@ -5,11 +5,11 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Python: Module",
+        "name": "Python: Module",
-      "type": "debugpy",
+        "type": "debugpy",
-      "request": "launch",
+        "request": "launch",
-      "module": "main",
+        "module": "off_cooldown_bot.main",
-      "justMyCode": true
+        "justMyCode": true
     }
   ]
 }

.vscode/settings.json

@@ -4,8 +4,5 @@
         "reportArgumentType": "information",
         "reportAttributeAccessIssue": "warning"
     },
-    "cSpell.words": [
+    "cSpell.words": ["cakeday", "cakedays", "cooldown", "nextcord"]
-        "cakeday",
+}
-        "cakedays"
-    ]
-}

Dockerfile

@@ -3,14 +3,10 @@ FROM python:3.12.3-slim
 # install uv
 COPY --from=ghcr.io/astral-sh/uv:0.6.5 /uv /uvx /bin/
 
-WORKDIR /home
+COPY . /off_cooldown_bot
-
-COPY config.py config.py
-COPY main.py main.py
-COPY pyproject.toml pyproject.toml
-
-COPY cogs cogs/
 
+# Sync the project into a new environment, using the frozen lockfile
+WORKDIR /off_cooldown_bot
 RUN uv sync --frozen --no-dev
 
-CMD ["uv", "run", "./main.py"]
+CMD ["uv", "run", "./off_cooldown_bot/main.py"]

config.py

@@ -1,22 +0,0 @@
-"""
-File contains classes defining the Hydra configuraton structure.
-"""
-from dataclasses import dataclass
-
-
-@dataclass
-class Params:
-    """
-    Class defines the various configuration parameters.
-    """
-
-    discord_token: str
-
-
-@dataclass
-class BotConfig:
-    """
-    Class defines all configs required for Dakiny Bot.
-    """
-
-    params: Params

off_cooldown_bot/__init__.py

@@ -0,0 +1 @@
+"""Empty init file for off_cooldown_bot module."""

off_cooldown_bot/cogs/commands/__init__.py

@@ -2,7 +2,7 @@
 
 from nextcord.ext import commands
 
-from cogs.commands.birthday import BirthdayCog
+from .birthday import BirthdayCog
 
 
 # This function will be called when this extension is loaded.

off_cooldown_bot/cogs/commands/birthday.py

@@ -7,9 +7,9 @@ from nextcord.ext import commands
 from pytz import UTC
 from sqlmodel import Session, col, select
 
-from database.db import engine
+from off_cooldown_bot.database.db import engine
-from database.models import UserBirthday
+from off_cooldown_bot.database.models import UserBirthday
-from main import birthday_list
+from off_cooldown_bot.main import birthday_list
 
 
 class BirthdayCog(commands.Cog, name="Birthday Commands"):

off_cooldown_bot/cogs/loops/__init__.py

@@ -2,8 +2,8 @@
 
 from nextcord.ext import commands
 
-from cogs.loops.bot_presence import BotPresence
+from .bot_presence import BotPresence
-from cogs.loops.daily_loop import DailyLoop
+from .daily_loop import DailyLoop
 
 
 def setup(bot: commands.Bot) -> None:

off_cooldown_bot/cogs/loops/daily_loop.py

@@ -9,11 +9,11 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 from sqlmodel import col
 
-from database.db import engine
+from off_cooldown_bot.database.db import engine
-from database.models import UserBirthday
+from off_cooldown_bot.database.models import UserBirthday
-from logger import ocd_logger
+from off_cooldown_bot.logger import ocd_logger
-from main import birthday_list
+from off_cooldown_bot.main import birthday_list
-from settings import settings
+from off_cooldown_bot.settings import settings
 
 
 class DailyLoop(commands.Cog, name="Daily Loop"):

off_cooldown_bot/cogs/message_listener/__init__.py

@@ -3,7 +3,7 @@
 import nextcord
 from nextcord.ext import commands
 
-from main import birthday_list
+from off_cooldown_bot.main import birthday_list
 
 
 class SubmissionListener(commands.Cog, name="Message Listener"):

off_cooldown_bot/database/db.py

@@ -7,5 +7,4 @@ from . import models  # noqa: F401 - Need this import for creating the models.
 url = "sqlite:///database.db"
 engine = create_engine(url)
 
-# Don't need to create all when connected to prod.
 SQLModel.metadata.create_all(engine)

off_cooldown_bot/main.py

@@ -8,8 +8,8 @@ import pathlib
 import nextcord
 from nextcord.ext import commands
 
-from logger import ocd_logger
+from .logger import ocd_logger
-from settings import settings
+from .settings import settings
 
 nextcord_logger = logging.getLogger("nextcord")
 nextcord_logger.setLevel(logging.DEBUG)
@@ -30,7 +30,7 @@ def main() -> None:
     intents.message_content = True
 
     # To enable the guilds privileged intent:
-    # intents.guilds = True
+    # intents.guilds = True  # noqa: ERA001
 
     # To enable the members privileged intent:
     intents.members = True
@@ -47,7 +47,7 @@ def main() -> None:
         if bot.user is None:
             ocd_logger.critical("Discord connection failed.")
             return
-        ocd_logger.info(f"{bot.user.name} has connected to Discord!")
+        ocd_logger.info("%s has connected to Discord!", bot.user.name)
 
     # Run Discord bot
     bot.run(settings.params.discord_token)

off_cooldown_bot/settings.py

@@ -35,3 +35,7 @@ class Settings(YAMLWizard):
 
 
 settings = Settings.from_yaml_file(CONFIG_LOCATION)
+
+# I'm not expecting a list to be returned.
+if isinstance(settings, list):
+    settings = settings[0]

pyproject.toml

@@ -6,7 +6,6 @@ authors = [{ name = "imcompiling", email = "[email protected]" }]
 readme = "README.md"
 dependencies = [
     "nextcord>=2.6.0",
-    "python-dotenv>=1.0.1",
     "sqlmodel>=0.0.22",
     "dataclass-wizard[yaml]>=0.22.3,<1.0.0",
     "pytz>=2025.1",