feat: some major improvements (#19)

- Add elapsed time logging on every slash command (Close GH-15)
- Switch to modern logging
- Improve music extension
- Updates `delete_button` to `DeleteButton`
- Replace `GoogleTrans` with one of its better working fork
- Rewrite error handler
- Fix image generator in greeter extension
- Add Extension manager commands
- Close GH-15

Author: KnownBlackHat

.pre-commit-config.yaml

@@ -6,11 +6,11 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.4.2
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     -   id: isort
         exclude: '^(env)'

docker-compose.yaml

@@ -7,36 +7,52 @@ services:
 
   lavalink:
     <<: *restart_policy
-    image: ghcr.io/freyacodes/lavalink:latest
+    image: ghcr.io/lavalink-devs/lavalink:4a2b99f-alpine
     container_name: lavalink
+
     environment:
         - _JAVA_OPTIONS=-Xmx6G
         - SERVER_PORT=2333
         - LAVALINK_SERVER_PASSWORD=youshallnotpass
+
     networks:
         - lavalink
+
     expose:
         - 2333
+
     ports:
         - 2333:2333
 
+    volumes:
+      - ./lavalink_application.yml:/opt/Lavalink/application.yml
+
 
   mr-robot:
     <<: *restart_policy
     image: ghcr.io/mr-robot-discord-bot/mr-robot:latest
     container_name: mr-robot
+    build:
+      context: .
+      dockerfile: Dockerfile
     tty: true
+
     environment:
-      - BOT_TOKEN=YOUR BOT TOKEN
+      - BOT_TOKEN=PUT YOUR BOT TOKEN
       - ON_JOIN_WEBHOOK=WEBHOOK_URL
       - AI_API_KEY=GEMNI AI API KEY
       - GIT_TOKEN=GIT_API_TOKEN
       - GIT_DB_REPO=OWNER/REPO
       - NSFW_API=NSFW API
+
     networks:
-        - lavalink
+      - lavalink
+
     depends_on:
-        - lavalink
+      - lavalink
+
+    volumes:
+      - .:/app
 
 
 networks:

lavalink_application.yml

@@ -0,0 +1,14 @@
+plugins:
+  youtube:
+    enabled: true
+    allowSearch: true
+    allowDirectVideoIds: true
+    allowDirectPlaylistIds: true
+
+lavalink:
+  plugins:
+    - dependency: "dev.lavalink.youtube:youtube-plugin:1.3.0"
+      snapshot: false
+  server:
+    sources:
+      youtube: false

logging_config.json

@@ -0,0 +1,56 @@
+{
+    "version": 1,
+
+    "disable_exsisting_loggers": false,
+
+    "formatters": {
+        "simple": {"format": "%(levelname)s: %(message)s"},
+        "expanded": {
+            "format": "%(levelname)s - %(name)s - %(filename)s - %(module)s - %(funcName)s - %(message)s"
+        },
+        "detailed": {
+            "format": "[%(levelname)s|%(module)s|%(funcName)s|L%(lineno)d] %(asctime)s: %(message)s",
+            "datefmt": "%Y-%m-%dT%H:%M:%S%z"
+        }
+    },
+
+    "handlers": {
+        "stdout": {
+            "class": "logging.StreamHandler",
+            "formatter": "simple",
+            "stream": "ext://sys.stdout"
+        },
+        "stderr": {
+            "class": "logging.StreamHandler",
+            "level": "WARNING",
+            "formatter": "expanded",
+            "stream": "ext://sys.stderr"
+        },
+        "debugfile": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "DEBUG",
+            "formatter": "detailed",
+            "filename": "logs/debug.log",
+            "maxBytes": 200000000,
+            "backupCount": 3
+        },
+        "errorfile": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "WARNING",
+            "formatter": "detailed",
+            "filename": "logs/error.log",
+            "maxBytes": 200000000,
+            "backupCount": 2
+        },
+        "queue_handler": {
+            "class": "logging.handlers.QueueHandler",
+            "handlers": ["stdout", "stderr", "errorfile", "debugfile"],
+            "respect_handler_level": true
+        }
+
+    },
+
+    "loggers": {
+        "root": {"level": "DEBUG", "handlers": ["queue_handler"]}
+    }
+}

mr_robot/__main__.py

@@ -1,5 +1,9 @@
 import asyncio
-import logging
+import atexit
+import json
+import logging.config
+import logging.handlers
+import os
 import signal
 import sys
 
@@ -11,37 +15,29 @@
 from mr_robot.bot import MrRobot
 from mr_robot.constants import Client
 
-# from mr_robot.utils.helpers import proxy_generator
-
-proxy_mode = False
-PROXY = None
-
-file_handler = logging.FileHandler(Client.log_file_name, mode="w")
-console_handler = logging.StreamHandler()
-
-file_handler.setLevel(logging.DEBUG)
-console_handler.setLevel(logging.INFO)
-logging.basicConfig(
-    level=logging.NOTSET,
-    format="%(levelname)s - %(name)s - %(filename)s - %(module)s - %(funcName)s - %(message)s",
-    handlers=[console_handler, file_handler],
-)
-
-logging.getLogger("httpx").setLevel(logging.WARNING)
-logging.getLogger("httpcore").setLevel(logging.WARNING)
-logging.getLogger("disnake").setLevel(logging.INFO)
-logging.getLogger("aiosqlite").setLevel(logging.INFO)
-logger = logging.getLogger(__name__)
+load_dotenv()
 
 
-load_dotenv()
+def setup_logging() -> None:
+    with open(Client.logging_config_file, "r") as file:
+        config = json.load(file)
+    try:
+        os.mkdir("logs")
+    except FileExistsError:
+        ...
+    logging.config.dictConfig(config)
+    queue_handler = logging.getHandlerByName("queue_handler")
+    if queue_handler is not None:
+        queue_handler.listener.start()  # type: ignore[reportAttributeAccessIssue]
+        atexit.register(queue_handler.listener.stop)  # type: ignore[reportAttributeAccessIssue]
 
 
 async def main():
-    global PROXY
+    setup_logging()
+    logger = logging.getLogger(Client.name)
+    logger.info("Logger Initialized!")
     async with httpx.AsyncClient(timeout=httpx.Timeout(None)) as session:
         client = MrRobot(
-            proxy=PROXY,
             intents=disnake.Intents.all(),
             session=session,
             db=await aiosqlite.connect(Client.db_name),
@@ -68,11 +64,6 @@ async def main():
             await future
         except asyncio.CancelledError:
             logger.info("Received signal to terminate bot and event loop")
-            # logger.warning(
-            #     "Unable to connect to Discord falling back to proxy mode", exc_info=True
-            # )
-            # proxy_mode = True
-            # PROXY = proxy_generator() if proxy_mode else None
         finally:
             if not client.is_closed():
                 await client.close()

mr_robot/bot.py

@@ -6,10 +6,11 @@
 import httpx
 import mafic
 from aiocache import cached
+from aiosqlite import Connection
 from disnake.ext import commands
 
 from mr_robot.constants import Client
-from mr_robot.utils.extensions import EXTENSIONS, walk_extensions
+from mr_robot.utils.extensions import walk_extensions
 from mr_robot.utils.git_api import Git
 
 logger = logging.getLogger(__name__)
@@ -18,7 +19,7 @@
 class MrRobot(commands.AutoShardedInteractionBot):
     """Mr Robot Bot"""
 
-    def __init__(self, session: httpx.AsyncClient, db, db_name, **kwargs):
+    def __init__(self, session: httpx.AsyncClient, db: Connection, db_name, **kwargs):
         super().__init__(**kwargs)
         self.pool = mafic.NodePool(self)
         self.loop.create_task(self.add_nodes())
@@ -73,8 +74,7 @@ async def add_nodes(self):
 
     def load_bot_extensions(self) -> None:
         """Loads extensions released by walk_extensions()"""
-        EXTENSIONS.update(walk_extensions())
-        logger.info("Extension loading successful!")
         for ext in walk_extensions():
             logger.info(f"{ext} extension loaded!!")
             self.load_extension(ext)
+        logger.info("Extension loading successful!")

mr_robot/constants.py

@@ -2,15 +2,37 @@
 
 
 class Client:
+    """Client Constants"""
+
     name = "Mr Robot"
     token = getenv("BOT_TOKEN")
     log_file_name = "mr-robot.log"
     db_name = "mr-robot.db"
     github_db_repo = getenv("GIT_DB_REPO")
     github_token = getenv("GIT_TOKEN")
     github_bot_repo = "https://github.com/Mr-Robot-Discord-Bot/Mr-Robot/"
-    support_server = "SUPPORT SERVER"
+    support_server = "55TQeTvU6f"
     version = getenv("VERSION")
     nsfw_api = getenv("NSFW_API")
     gemini_api_key = getenv("AI_API_KEY")
     on_join_webook = getenv("ON_JOIN_WEBHOOK")
+    debug_mode = False
+    debug_guilds = [1241678951307542538]
+    logging_config_file = "logging_config.json"
+
+
+class ButtonCustomId:
+    """Button Custom Ids"""
+
+    delete = "message_delete:"
+
+
+class Colors:
+    """Colours"""
+
+    red = 0xFF0000
+    green = 0x00FF00
+    blue = 0x0000FF
+    black = 0x000000
+    orange = 0xFFA500
+    yellow = 0xFFFF00

mr_robot/exts/ai.py

@@ -1,12 +1,13 @@
 import logging
 
+import disnake
 import google.generativeai as genai
 from disnake.ext import commands
 from google.generativeai.types import BlockedPromptException
 
 from mr_robot.bot import MrRobot
 from mr_robot.constants import Client
-from mr_robot.utils.helpers import delete_button
+from mr_robot.utils.messages import DeleteButton
 
 logger = logging.getLogger(__name__)
 
@@ -49,10 +50,14 @@ def __init__(self, client: MrRobot):
     @commands.slash_command(name="ai", dm_permission=False)
     async def ai(self, _):
         """Interact with ai"""
+        if not Client.gemini_api_key:
+            raise ValueError("Ai api key is not being initialised")
         ...
 
     @ai.sub_command(name="chat")
-    async def slash_ai_generate_text(self, interaction, query: str):
+    async def slash_ai_generate_text(
+        self, interaction: disnake.GuildCommandInteraction, query: str
+    ):
         """
         Talk to Mr Robot AI system
 
@@ -64,7 +69,9 @@ async def slash_ai_generate_text(self, interaction, query: str):
         try:
             await self.conv.send_message_async(query)
             if self.conv.last:
-                await interaction.send(self.conv.last.text, components=[delete_button])
+                await interaction.send(
+                    self.conv.last.text, components=[DeleteButton(interaction.author)]
+                )
             else:
                 await interaction.send("Ai module didn't responded")
         except BlockedPromptException: