Fix imports

Dockerfile

@@ -17,4 +17,4 @@ RUN poetry config virtualenvs.create false
 RUN poetry install -n --only main
 
 COPY . ./
-CMD ["python3.11", "-O", "main.py"]
+CMD ["python3.11", "-O", "-m", "src"]

docker-compose.yml

@@ -21,7 +21,7 @@ services:
         dockerfile: Dockerfile
         args:
           postgres_version: ${POSTGRES_VERSION:-14}
-    command: ["python3.11", "-O", "main.py"]
+    command: ["python3.11", "-O", "-m", "src"]
     depends_on:
       - sned-db
     restart: always

src/main.py → src/__main__.py

@@ -2,19 +2,21 @@
 
 import logging
 import os
+import pathlib
 import platform
 import re
 
-from models import SnedBot
+from src.models import SnedBot
 
 DOTENV_REGEX = re.compile(r"^(?P<identifier>[A-Za-z_]+[A-Za-z0-9_]*)=(?P<value>[^#]+)(#.*)?$")
+BASE_DIR = str(pathlib.Path(os.path.abspath(__file__)).parents[1])
 
 if int(platform.python_version_tuple()[1]) < 10:
     logging.fatal("Python version must be 3.10 or greater! Exiting...")
     exit(1)
 
 try:
-    with open(".env") as env:
+    with open(os.path.join(BASE_DIR, ".env")) as env:
         for line in env.readlines():
             match = DOTENV_REGEX.match(line)
             if not match:
@@ -25,7 +27,7 @@
     logging.info(".env file not found, using secrets from the environment instead.")
 
 try:
-    from config import Config
+    from .config import Config
 except ImportError:
     logging.fatal(
         "Failed loading configuration. Please make sure 'config.py' exists in the root directory of the project and contains valid data."

src/db/migrations/7.py

@@ -7,10 +7,11 @@
 
 import hikari
 import lightbulb
-from models import JournalEntry, JournalEntryType
+
+from src.models import JournalEntry, JournalEntryType
 
 if t.TYPE_CHECKING:
-    from models.db import Database
+    from src.models.db import Database
 
 NOTE_REGEX = re.compile(
     r"<t:(?P<timestamp>\d+):\w>: (?P<emoji>.+) \*\*(?P<verb>.+) (?:by|for) (?P<username>.+):\*\* (?P<content>.*)"
@@ -72,9 +73,9 @@ async def _migrate_notes(db: Database) -> None:
     records = await db.fetch("SELECT * FROM users")
 
     for record in records:
-        notes: list[str] = record.get("notes")
-        user_id: int = record.get("user_id")
-        guild_id: int = record.get("guild_id")
+        notes: list[str] = record["notes"]
+        user_id: int = record["user_id"]
+        guild_id: int = record["guild_id"]
         if not notes:
             continue
         for note in notes:

src/etc/settings_static.py

@@ -1,6 +1,7 @@
 import hikari
 import miru
-from models.mod_actions import ModerationFlags
+
+from src.models.mod_actions import ModerationFlags
 
 # Static values for the settings extension
 

src/extensions/annoverse.py

@@ -1,12 +1,12 @@
-import etc.const as const
 import hikari
 import lightbulb
-from models.bot import SnedBot
-from models.context import SnedContext
-from models.plugin import SnedPlugin
-from utils import helpers
 
-from config import Config
+import src.etc.const as const
+from src.config import Config
+from src.models.bot import SnedBot
+from src.models.context import SnedContext
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
 
 annoverse = SnedPlugin("Annoverse")
 annoverse.default_enabled_guilds = Config().DEBUG_GUILDS or (372128553031958529,)

src/extensions/automod.py

@@ -8,14 +8,15 @@
 import hikari
 import kosu
 import lightbulb
-import utils
-from etc import const
-from etc.settings_static import default_automod_policies, notices
-from models.bot import SnedBot
-from models.events import AutoModMessageFlagEvent
-from models.plugin import SnedPlugin
-from utils import helpers
-from utils.ratelimiter import MemberBucket
+
+import src.utils as utils
+from src.etc import const
+from src.etc.settings_static import default_automod_policies, notices
+from src.models.bot import SnedBot
+from src.models.events import AutoModMessageFlagEvent
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
+from src.utils.ratelimiter import MemberBucket
 
 INVITE_REGEX = re.compile(r"(?:https?://)?discord(?:app)?\.(?:com/invite|gg)/[a-zA-Z0-9]+/?")
 """Used to detect and handle Discord invites."""

src/extensions/command_handler.py

@@ -8,22 +8,23 @@
 
 import hikari
 import lightbulb
-from etc import const
-from etc.perms_str import get_perm_str
-from models.bot import SnedBot
-from models.context import SnedPrefixContext, SnedSlashContext
-from models.errors import (
+
+from src.etc import const
+from src.etc.perms_str import get_perm_str
+from src.models.bot import SnedBot
+from src.models.context import SnedPrefixContext, SnedSlashContext
+from src.models.errors import (
     BotRoleHierarchyError,
     InteractionTimeOutError,
     MemberExpectedError,
     RoleHierarchyError,
     UserBlacklistedError,
 )
-from models.plugin import SnedPlugin
-from utils import helpers
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
 
 if TYPE_CHECKING:
-    from models import SnedContext
+    from src.models import SnedContext
 
 logger = logging.getLogger(__name__)
 

src/extensions/dev.py

@@ -10,12 +10,13 @@
 import hikari
 import lightbulb
 import miru
-from etc import const
 from miru.ext import nav
-from models import AuthorOnlyNavigator, SnedPrefixContext
-from models.bot import SnedBot
-from models.plugin import SnedPlugin
-from models.views import AuthorOnlyView
+
+from src.etc import const
+from src.models import AuthorOnlyNavigator, SnedPrefixContext
+from src.models.bot import SnedBot
+from src.models.plugin import SnedPlugin
+from src.models.views import AuthorOnlyView
 
 logger = logging.getLogger(__name__)
 

src/extensions/fallingfrontier.py

@@ -1,12 +1,12 @@
 import hikari
 import lightbulb
 import miru
-from etc import const
-from models.bot import SnedBot
-from models.context import SnedSlashContext
-from models.plugin import SnedPlugin
 
-from config import Config
+from src.config import Config
+from src.etc import const
+from src.models.bot import SnedBot
+from src.models.context import SnedSlashContext
+from src.models.plugin import SnedPlugin
 
 TESTER_STAGING_ROLE = 971843694896513074
 TESTER_STAGING_CHANNEL = 971844463884382259

src/extensions/fandom.py

@@ -1,12 +1,12 @@
 import hikari
 import lightbulb
 import yarl
-from etc import const
-from models.bot import SnedBot
-from models.context import SnedSlashContext
-from models.plugin import SnedPlugin
 
-from config import Config
+from src.config import Config
+from src.etc import const
+from src.models.bot import SnedBot
+from src.models.context import SnedSlashContext
+from src.models.plugin import SnedPlugin
 
 fandom = SnedPlugin("Fandom")
 

src/extensions/fun.py

@@ -13,20 +13,21 @@
 import Levenshtein as lev  # noqa: N813
 import lightbulb
 import miru
-from etc import const
 from miru.ext import nav
-from models import SnedBot, SnedSlashContext
-from models.checks import bot_has_permissions
-from models.context import SnedContext, SnedUserContext
-from models.plugin import SnedPlugin
-from models.views import AuthorOnlyNavigator, AuthorOnlyView
 from PIL import Image, ImageDraw, ImageFont
-from utils import GlobalBucket, RateLimiter, helpers
-from utils.dictionaryapi import DictionaryClient, DictionaryEntry, DictionaryError, UrbanEntry
-from utils.ratelimiter import UserBucket
-from utils.rpn import InvalidExpressionError, Solver
 
-from config import Config
+from src.etc import const
+from src.models import SnedBot, SnedSlashContext
+from src.models.checks import bot_has_permissions
+from src.models.context import SnedContext, SnedUserContext
+from src.models.plugin import SnedPlugin
+from src.models.views import AuthorOnlyNavigator, AuthorOnlyView
+from src.utils import GlobalBucket, RateLimiter, helpers
+from src.utils.dictionaryapi import DictionaryClient, DictionaryEntry, DictionaryError, UrbanEntry
+from src.utils.ratelimiter import UserBucket
+from src.utils.rpn import InvalidExpressionError, Solver
+
+from ..config import Config
 
 if TYPE_CHECKING:
     from fractions import Fraction

src/extensions/help.py

@@ -2,14 +2,15 @@
 
 import typing as t
 
-import etc.const as const
 import hikari
 import lightbulb
-from models.plugin import SnedPlugin
+
+import src.etc.const as const
+from src.models.plugin import SnedPlugin
 
 if t.TYPE_CHECKING:
-    from models import SnedBot
-    from models.context import SnedSlashContext
+    from src.models import SnedBot
+    from src.models.context import SnedSlashContext
 
 
 help = SnedPlugin("Help")

src/extensions/misc.py

@@ -7,13 +7,14 @@
 import miru
 import psutil
 import pytz
-from etc import const
-from models import SnedBot
-from models.checks import bot_has_permissions
-from models.context import SnedMessageContext, SnedSlashContext
-from models.plugin import SnedPlugin
-from utils import helpers
-from utils.scheduler import ConversionMode
+
+from src.etc import const
+from src.models import SnedBot
+from src.models.checks import bot_has_permissions
+from src.models.context import SnedMessageContext, SnedSlashContext
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
+from src.utils.scheduler import ConversionMode
 
 logger = logging.getLogger(__name__)
 

src/extensions/moderation.py

@@ -5,18 +5,19 @@
 import hikari
 import lightbulb
 import miru
-import models
-from etc import const
-from models import errors
-from models.bot import SnedBot
-from models.checks import bot_has_permissions, is_above_target, is_invoker_above_target
-from models.context import SnedSlashContext, SnedUserContext
-from models.db_user import DatabaseUser
-from models.events import MassBanEvent
-from models.journal import JournalEntry, JournalEntryType
-from models.mod_actions import ModerationFlags
-from models.plugin import SnedPlugin
-from utils import helpers
+
+import src.models as models
+from src.etc import const
+from src.models import errors
+from src.models.bot import SnedBot
+from src.models.checks import bot_has_permissions, is_above_target, is_invoker_above_target
+from src.models.context import SnedSlashContext, SnedUserContext
+from src.models.db_user import DatabaseUser
+from src.models.events import MassBanEvent
+from src.models.journal import JournalEntry, JournalEntryType
+from src.models.mod_actions import ModerationFlags
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
 
 logger = logging.getLogger(__name__)
 

src/extensions/reminders.py

@@ -6,12 +6,13 @@
 import hikari
 import lightbulb
 import miru
-from etc import const
-from models import SnedBot, SnedSlashContext, Timer, events
-from models.plugin import SnedPlugin
-from models.timer import TimerEvent
-from models.views import AuthorOnlyNavigator
-from utils import helpers
+
+from src.etc import const
+from src.models import SnedBot, SnedSlashContext, Timer, events
+from src.models.plugin import SnedPlugin
+from src.models.timer import TimerEvent
+from src.models.views import AuthorOnlyNavigator
+from src.utils import helpers
 
 reminders = SnedPlugin(name="Reminders")
 

src/extensions/reports.py

@@ -3,12 +3,13 @@
 import hikari
 import lightbulb
 import miru
-from etc import const
-from models import SnedSlashContext
-from models.bot import SnedBot
-from models.context import SnedApplicationContext, SnedContext, SnedMessageContext, SnedUserContext
-from models.plugin import SnedPlugin
-from utils import helpers
+
+from src.etc import const
+from src.models import SnedSlashContext
+from src.models.bot import SnedBot
+from src.models.context import SnedApplicationContext, SnedContext, SnedMessageContext, SnedUserContext
+from src.models.plugin import SnedPlugin
+from src.utils import helpers
 
 logger = logging.getLogger(__name__)
 

src/extensions/role_buttons.py

@@ -4,13 +4,14 @@
 import hikari
 import lightbulb
 import miru
-import models
-from etc import const
-from models import SnedBot, SnedSlashContext
-from models.plugin import SnedPlugin
-from models.rolebutton import RoleButton, RoleButtonMode
-from utils import helpers
-from utils.ratelimiter import MemberBucket, RateLimiter
+
+import src.models as models
+from src.etc import const
+from src.models import SnedBot, SnedSlashContext
+from src.models.plugin import SnedPlugin
+from src.models.rolebutton import RoleButton, RoleButtonMode
+from src.utils import helpers
+from src.utils.ratelimiter import MemberBucket, RateLimiter
 
 logger = logging.getLogger(__name__)