bump dependencies; use [project.scripts] instead of __main__.py

Author: regunakyle

Dockerfile

@@ -26,4 +26,4 @@ chmod -R 777 ./
 
 USER nonroot
 
-CMD ["/app/.venv/bin/python", "-m", "my_discord_bot"]
+CMD ["/app/.venv/bin/my-discord-bot"]

README.md

@@ -14,7 +14,7 @@ This Discord bot is developed with Python 3.11. Use the same Python version to e
 
 3. Create a virtual python environment, activate it, then install dependencies with `pip install -e .`.
 
-4. Run `python -m my_discord_bot` in your console to start up the bot.
+4. Run `my-discord-bot` in your console to start up the bot.
 
 5. To use the music player, you need to run a [Lavalink](https://github.com/freyacodes/Lavalink) instance alongside the bot. Set `LAVALINK_URL` and `LAVALINK_PASSWORD` in `.env`.
 

compose.yaml

@@ -34,7 +34,7 @@ services:
       LAVALINK_SERVER_PASSWORD: youshallnotpass
       LAVALINK_SERVER_SOURCES_YOUTUBE: "false"
       # See https://github.com/lavalink-devs/youtube-source for the latest version of the plugin
-      LAVALINK_PLUGINS_0_DEPENDENCY: dev.lavalink.youtube:youtube-plugin:1.11.4
+      LAVALINK_PLUGINS_0_DEPENDENCY: dev.lavalink.youtube:youtube-plugin:1.13.2
       PLUGINS_YOUTUBE_ENABLED: "true"
       PLUGINS_YOUTUBE_CLIENTS_0: MUSIC
       PLUGINS_YOUTUBE_CLIENTS_1: WEB

pyproject.toml

@@ -17,12 +17,15 @@ dependencies = [
     "wavelink==3.*",
 ]
 
+[project.scripts]
+my-discord-bot = "my_discord_bot:main"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
 [dependency-groups]
 dev = ["ipykernel", "ruff"]
 
 [tool.pyright]
 reportCallInDefaultInitializer = true
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"

src/my_discord_bot/__init__.py

@@ -1,4 +1,87 @@
-from . import cogs, models
+import asyncio
+import logging
+import os
+from logging.handlers import TimedRotatingFileHandler
+from pathlib import Path
+
+import discord
+from alembic import command
+from alembic.config import Config
+from dotenv import load_dotenv
+from sqlalchemy import event
+from sqlalchemy.engine.interfaces import DBAPIConnection
+from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
+from sqlalchemy.pool import ConnectionPoolEntry
+
 from .bot import DiscordBot
 
-__all__ = ["DiscordBot", "models", "cogs"]
+# Initialization
+Path("./volume/logs").mkdir(parents=True, exist_ok=True)
+Path("./volume/gallery-dl").mkdir(parents=True, exist_ok=True)
+
+# Logger
+logger = logging.getLogger()
+logger.setLevel("INFO")
+logger.addHandler(logging.StreamHandler())
+# Time Rotating File Handler
+logHandler = TimedRotatingFileHandler(
+    Path("./volume/logs/discord.log"), when="D", backupCount=10, encoding="utf-8"
+)
+logHandler.setFormatter(
+    logging.Formatter(
+        "%(asctime)s %(levelname)-8s %(name)-15s %(message)s",
+        datefmt="%H:%M:%S",
+    )
+)
+logger.addHandler(logHandler)
+
+
+# Load .env and basic sanity checking
+load_dotenv(dotenv_path="./.env")
+for env in ["DISCORD_TOKEN", "PREFIX"]:
+    if not os.getenv(env):
+        errMsg = f"{env} is not set in both .env and the OS environment. Exiting..."
+        logger.error(errMsg)
+        raise Exception(errMsg)
+
+logging.info("Running migrations...")
+alembic_cfg = Config("./alembic.ini")
+alembic_cfg.attributes["no_alembic_loggers"] = True
+command.upgrade(alembic_cfg, "head")
+
+
+async def main() -> None:
+    """Entrypoint of the bot."""
+
+    logging.info("\nSetting up the bot...")
+
+    # Database initialization
+    engine = create_async_engine("sqlite+aiosqlite:///volume/db.sqlite3", echo=True)
+
+    @event.listens_for(engine.sync_engine, "connect")
+    def set_sqlite_pragma(
+        dbapi_connection: DBAPIConnection, connection_record: ConnectionPoolEntry
+    ) -> None:
+        """If using SQLite, enable foreign key constraints."""
+        cursor = dbapi_connection.cursor()
+        cursor.execute("PRAGMA foreign_keys=ON")
+        cursor.close()
+
+    async_session = async_sessionmaker(engine, expire_on_commit=False)
+
+    intents = discord.Intents.default()
+    intents.members = True
+    intents.message_content = True
+
+    activity = discord.Game(name="/help")
+
+    description = "Discord bot my own use. \nCreated with [discord.py](https://github.com/Rapptz/discord.py)."
+
+    bot = DiscordBot(
+        os.getenv("PREFIX", ">>"), intents, activity, description, async_session
+    )
+
+    await bot.start(os.getenv("DISCORD_TOKEN", ""))
+
+
+asyncio.run(main())

src/my_discord_bot/__main__.py

@@ -474,7 +474,7 @@ async def connect_music(
         self,
         ia: discord.Interaction,
     ) -> None:
-        """(OWNER ONLY) Use this if the music player is not working.
+        """(OWNER ONLY) Use this to reconnect to a Lavalink node.
 
         Do NOT use this when the bot is playing music."""