Various changes/cleanups.

Remove the need for TYPE_CHECKING in most cases with a siple import of core.

Author: EvieePy

constants/_meta.py

@@ -22,9 +22,9 @@
 """
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, NoReturn, cast
+from typing import TYPE_CHECKING, Any, NoReturn, cast, Union
 
-from core import CONFIG
+import toml
 
 
 if TYPE_CHECKING:
@@ -33,13 +33,16 @@
     from types_.config import Database, Logging, Tokens
 
 
+_config = toml.load("config.toml")
+
+
 class ConstantsMeta(type):
     def __new__(mcs, name: str, bases: tuple[type, ...], attrs: dict[str, Any]) -> Self:
         if name == "CONSTANTS":
             return super().__new__(mcs, name, bases, attrs)
 
         try:
-            section = cast(Tokens | Database | Logging, CONFIG[name.upper()])
+            section = cast(Union["Tokens", "Database", "Logging"], _config[name.upper()])
         except KeyError:
             return super().__new__(mcs, name, bases, attrs)
 

core/__init__.py

@@ -22,7 +22,9 @@
 """
 __version__ = "0.0.1a"
 
-from . import errors as errors, utils as utils
+from . import utils as utils
+from .bot import Bot
 from .converters import *
 from .core import *
 from .context import *
+from .errors import *

bot.py renamed to core/bot.py

@@ -25,20 +25,17 @@
 import asyncio
 import json
 import pathlib
-from asyncio import Queue
 from collections import deque
 from typing import TYPE_CHECKING, Any
 
 import aiohttp
 import asyncpg
 import discord
-import mystbin
 from discord.ext import commands
 
-from core import CONFIG
-from core.context import Context
-from core.utils.logging import LogHandler
-from modules import EXTENSIONS
+from .core import CONFIG
+from .context import Context
+from .utils import LogHandler
 
 
 if TYPE_CHECKING:
@@ -85,6 +82,7 @@ async def start(self, token: str, *, reconnect: bool = True) -> None:
             await super().start(token=token, reconnect=reconnect)
         finally:
             path = pathlib.Path("logs/prev_events.log")
+
             with path.open("w+", encoding="utf-8") as f:
                 for event in self._previous_websocket_events:
                     try:
@@ -98,29 +96,3 @@ async def close(self) -> None:
         """Closes the Bot. It will also close the internal :class:`aiohttp.ClientSession`."""
         await self.session.close()
         await super().close()
-
-
-async def main() -> None:
-    async with Bot() as bot, aiohttp.ClientSession() as session, asyncpg.create_pool(
-        dsn=CONFIG["DATABASE"]["dsn"]
-    ) as pool, LogHandler(bot=bot) as handler:
-        bot.logging_queue = Queue()
-        bot.session = session
-        bot.pool = pool
-        bot.log_handler = handler
-
-        bot.mb_client = mystbin.Client(token=CONFIG["TOKENS"]["mystbin"], session=session)
-
-        await bot.load_extension("jishaku")
-        for extension in EXTENSIONS:
-            await bot.load_extension(extension.name)
-            bot.log_handler.log.info(
-                "Loaded %sextension: %s",
-                "module " if extension.ispkg else "",
-                extension.name,
-            )
-
-        await bot.start(CONFIG["TOKENS"]["bot"])
-
-
-asyncio.run(main())

core/config.py

@@ -9,22 +9,27 @@
 
 
 if TYPE_CHECKING:
-    from bot import Bot
+    from .bot import Bot
+
 
 __all__ = (
     "Context",
     "GuildContext",
     "Interaction",
 )
 
+
 Interaction: TypeAlias = discord.Interaction["Bot"]
 
 
 class Context(commands.Context["Bot"]):
+
     def author_is_mod(self) -> bool:
         member: discord.Member
+
         if self.guild is None:  # dms
             guild = self.bot.get_guild(GUILD_ID)
+
             if not guild:
                 return False
 

core/context.py

@@ -82,4 +82,4 @@ async def convert(self, ctx: Context, argument: str) -> Codeblock:  # type: igno
         if not code and not language:
             code[:] = previous_characters
 
-        return Codeblock("".join(language), "".join(code[len(language) : -backticks]))
+        return Codeblock("".join(language), "".join(code[len(language): -backticks]))

core/converters.py

@@ -27,6 +27,7 @@
 import toml
 from discord.ext import commands
 
+
 if TYPE_CHECKING:
     from types_.config import Config
 

core/core.py

@@ -21,3 +21,4 @@
 SOFTWARE.
 """
 from .formatters import *
+from .logging import LogHandler

core/utils/__init__.py

@@ -11,7 +11,7 @@
 if TYPE_CHECKING:
     from typing_extensions import Self
 
-    from bot import Bot
+    from core import Bot
 
 
 class QueueEmitHandler(logging.Handler):

core/utils/logging.py

@@ -30,7 +30,7 @@
 from discord.ext import commands
 from discord.utils import MISSING
 
-from core.context import Context
+from core import Context
 
 
 if TYPE_CHECKING: