Restructure the file system

.github/workflows/ci.yml

@@ -43,7 +43,6 @@ jobs:
       run: |
         uv run isort --check-only $(git rev-parse --show-toplevel)/ --profile black
     - name: Running pytest
-      working-directory: techsupport_bot
       run: |
         PYTHONPATH=. uv run pytest tests/ -p no:warnings
 

.gitignore

@@ -9,4 +9,4 @@ __pycache__
 .coverage
 .hypothesis
 .idea/
-techsupport_bot/configuration/guild_configs
+configuration/guild_configs

Dockerfile

@@ -24,7 +24,7 @@ RUN uv sync --frozen --no-dev
 COPY . .
 
 # Move into bot directory
-WORKDIR /var/TechSupportBot/techsupport_bot
+WORKDIR /var/TechSupportBot
 
 # Run bot
 CMD ["uv", "run", "--", "python3", "-u", "main.py"]

Makefile

@@ -1,6 +1,5 @@
 image = rtechsupport/techsupport-bot
 full-image = $(image):prod
-main_dir = techsupport_bot
 
 ifeq ($(shell docker-compose -v > /dev/null 2>&1; echo $$?), 0)
 	DOCKER_COMPOSE_CMD := docker-compose
@@ -24,7 +23,7 @@ lint:
 	pylint $(shell git ls-files '*.py')
 
 test:
-	PYTHONPATH=./techsupport_bot pytest techsupport_bot/tests/ -p no:warnings
+	PYTHONPATH=./ pytest ./tests/ -p no:warnings
 
 build:
 	make establish_config

techsupport_bot/bot.py → bot.py

@@ -11,20 +11,21 @@
 import threading
 from typing import Self
 
-import botlogging
-import configuration
 import discord
 import expiringdict
 import gino
-import ircrelay
 import munch
-import ui
 import yaml
-from botlogging import LogContext, LogLevel
-from core import auxiliary, custom_errors, databases, http
 from discord import app_commands
 from discord.ext import commands
 
+import botlogging
+import configuration
+import ircrelay
+import ui
+from botlogging import LogContext, LogLevel
+from core import auxiliary, custom_errors, databases, http
+
 loop = asyncio.new_event_loop()
 asyncio.set_event_loop(loop)
 

techsupport_bot/botlogging/logger.py → botlogging/logger.py

@@ -7,9 +7,10 @@
 import traceback
 from typing import TYPE_CHECKING, Self
 
+import discord
+
 import botlogging.embed as embed_lib
 import configuration
-import discord
 
 from .common import LogContext, LogLevel
 

techsupport_bot/commands/animal.py → commands/animal.py

@@ -4,9 +4,10 @@
 
 from typing import TYPE_CHECKING, Self
 
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/application.py → commands/application.py

@@ -7,11 +7,12 @@
 from typing import TYPE_CHECKING, Self
 
 import aiocron
-import configuration
 import discord
+from discord import app_commands
+
+import configuration
 import ui
 from core import auxiliary, cogs
-from discord import app_commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/backup.py → commands/backup.py

@@ -9,9 +9,10 @@
 
 import discord
 import yaml
-from core import auxiliary, cogs
 from discord import app_commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/botinfo.py → commands/botinfo.py

@@ -14,9 +14,10 @@
 
 import discord
 import git
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/burn.py → commands/burn.py

@@ -10,9 +10,10 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/chatgpt.py → commands/chatgpt.py

@@ -14,13 +14,14 @@
 
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
 import expiringdict
+from discord.ext import commands
+
+import configuration
 import ui
 from botlogging import LogContext, LogLevel
 from core import auxiliary, cogs
-from discord.ext import commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/commandcontrol.py → commands/commandcontrol.py

@@ -12,9 +12,10 @@
 
 from typing import TYPE_CHECKING, Self
 
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/conch.py → commands/conch.py

@@ -10,9 +10,10 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/config.py → commands/config.py

@@ -7,12 +7,13 @@
 import json
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
 import munch
+from discord import app_commands
+
+import configuration
 import ui
 from core import auxiliary, cogs
-from discord import app_commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/correct.py → commands/correct.py

@@ -9,9 +9,10 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/debug.py → commands/debug.py

@@ -9,9 +9,10 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
+from discord import app_commands
+
 import ui
 from core import auxiliary, cogs
-from discord import app_commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/dictionary.py → commands/dictionary.py

@@ -5,9 +5,10 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-from core import auxiliary, cogs
 from discord import app_commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/duck.py → commands/duck.py

@@ -9,13 +9,14 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
+from discord import Color as embed_colors
+from discord.ext import commands
+
+import configuration
 import ui
 from botlogging import LogContext, LogLevel
 from core import auxiliary, cogs, moderation
-from discord import Color as embed_colors
-from discord.ext import commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/dumpdbg.py → commands/dumpdbg.py

@@ -5,11 +5,12 @@
 import json
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
+from discord.ext import commands
+
+import configuration
 from botlogging import LogContext, LogLevel
 from core import auxiliary, cogs
-from discord.ext import commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/echo.py → commands/echo.py

@@ -12,9 +12,10 @@
 
 from typing import TYPE_CHECKING, Self
 
+from discord.ext import commands
+
 import configuration
 from core import auxiliary, cogs
-from discord.ext import commands
 from functions import logger as function_logger
 
 if TYPE_CHECKING:

techsupport_bot/commands/embed.py → commands/embed.py

@@ -14,12 +14,13 @@
 
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
 import munch
-from core import auxiliary, cogs
 from discord.ext import commands
 
+import configuration
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/emoji.py → commands/emoji.py

@@ -12,9 +12,10 @@
 import discord
 import emoji
 import inflect
-from core import auxiliary, cogs
 from discord.ext import commands
 
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/extension.py → commands/extension.py

@@ -15,11 +15,12 @@
 from typing import TYPE_CHECKING, Self
 
 import discord
-import ui
-from core import auxiliary, cogs
 from discord import app_commands
 from discord.ext import commands
 
+import ui
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/factoids.py → commands/factoids.py

@@ -24,17 +24,18 @@
 from typing import TYPE_CHECKING, Self
 
 import aiocron
-import configuration
 import discord
 import expiringdict
 import munch
-import ui
 import yaml
 from aiohttp.client_exceptions import InvalidURL
-from botlogging import LogContext, LogLevel
-from core import auxiliary, cogs, custom_errors
 from discord import app_commands
 from discord.ext import commands
+
+import configuration
+import ui
+from botlogging import LogContext, LogLevel
+from core import auxiliary, cogs, custom_errors
 from functions import logger as function_logger
 
 if TYPE_CHECKING:

techsupport_bot/commands/forum.py → commands/forum.py

@@ -8,13 +8,14 @@
 import re
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
-import ui
-from core import auxiliary, cogs
 from discord import app_commands
 from discord.ext import commands
 
+import configuration
+import ui
+from core import auxiliary, cogs
+
 if TYPE_CHECKING:
     import bot
 

techsupport_bot/commands/gate.py → commands/gate.py

@@ -4,11 +4,12 @@
 
 from typing import TYPE_CHECKING, Self
 
-import configuration
 import discord
+from discord.ext import commands
+
+import configuration
 from botlogging import LogContext, LogLevel
 from core import auxiliary, cogs
-from discord.ext import commands
 
 if TYPE_CHECKING:
     import bot

techsupport_bot/commands/giphy.py → commands/giphy.py

@@ -4,9 +4,10 @@
 
 from typing import TYPE_CHECKING, Self
 
+from discord.ext import commands
+
 import ui
 from core import auxiliary, cogs
-from discord.ext import commands
 
 if TYPE_CHECKING:
     import bot