Refactor database access: Replace async_db with AsyncDatabase instance across multiple cogs and scripts for improved consistency and maintainability.

Author: siqnole

botEvents/onReady.py

@@ -1,134 +1,135 @@
-from bronxbot import *
-from cogInfo import CogLoader
-
-@bot.event
-async def on_ready():
-    """Called when the bot is ready"""
-    logging.info(f"Bot ready as {bot.user.name} ({bot.user.id})")
-    
-    # Load all cogs using CogLoader
-    try:
-        logging.info("Loading cogs...")
-        success_count, error_count = await CogLoader.load_all_cogs(bot)
-        logging.info(f"Loaded {success_count} cogs with {error_count} errors")
-    except Exception as e:
-        logging.error(f"Error during cog loading: {e}")
-        traceback.print_exc()
-    
-    # Start the stats update loop after cogs are loaded
-    if not hasattr(bot, 'update_stats'):
-        logging.error("update_stats task not found")
-        return
-    if not bot.update_stats.is_running():
-        bot.update_stats.start()
-        logging.info("Started stats update loop")
-
-    # Start command usage tracker auto-save
-    try:
-        usage_tracker.start_auto_save()
-        logging.info("Started command usage tracker auto-save")
-    except Exception as e:
-        logging.error(f"Failed to start command usage tracker: {e}")
-
-    # Initialize scalability manager
-    try:
-        bot.scalability_manager = await initialize_scalability(bot)
-        logging.info("Scalability manager initialized successfully")
-    except Exception as e:
-        logging.warning(f"Scalability manager initialization failed: {e}")
-        bot.scalability_manager = None
-
-    # Load additional cogs manually
-    try:
-        # Load TOS handler
-        await bot.load_extension('utils.tos_handler')
-        logging.info("TOS handler loaded successfully")
-        
-        # Load Setup wizard
-        await bot.load_extension('cogs.setup.SetupWizard') 
-        logging.info("Setup wizard loaded successfully")
-    except Exception as e:
-        logging.error(f"Failed to load additional cogs: {e}")
-
-    # Initialize database and clean up corrupted inventory data
-    try:
-        from utils.db import async_db
-        await async_db.ensure_connected()
-        logging.info("Database connection established")
-        
-        # Run inventory cleanup on startup to remove corrupted data
-        cleaned_count = await async_db.cleanup_corrupted_inventory()
-        if cleaned_count > 0:
-            logging.info(f"Cleaned up {cleaned_count} corrupted inventory items on startup")
-        else:
-            logging.info("No corrupted inventory items found during startup cleanup")
-    except ImportError:
-        logging.warning("Database module not available, skipping database initialization")
-    except Exception as e:
-        logging.error(f"Failed to initialize database or cleanup inventory: {e}")
-
-    guild_cache_start = time.time()
-    # Build guild cache
-    for guild in bot.guilds:
-        await guild.chunk()
-    bot.boot_metrics['guild_cache_time'] = time.time() - guild_cache_start
-    
-    # Update presence
-    await bot.change_presence(
-        activity=discord.Activity(
-            type=discord.ActivityType.playing,
-            name=f"with {len(bot.guilds)} servers | .help"
-        )
-    )
-    
-    if bot.restart_channel and bot.restart_message:
-        try:
-            channel = await bot.fetch_channel(bot.restart_channel)
-            message = await channel.fetch_message(bot.restart_message)
-            
-            bot.boot_metrics['total_boot_time'] = time.time() - bot.boot_metrics['start_time']
-            bot.boot_metrics['ready_time'] = time.time() - bot.start_time
-            bot.boot_metrics['total_cog_load_time'] = sum(bot.cog_load_times.values())
-            
-            boot_info = (
-                f"✅ Boot completed in `{bot.boot_metrics['total_boot_time']:.2f}s`\n\n"
-                f"**Boot Metrics:**\n"
-                f"• Config Load: `{bot.boot_metrics['config_load_time']:.2f}s`\n"
-                f"• Guild Cache: `{bot.boot_metrics['guild_cache_time']:.2f}s`\n"
-                f"• Total Cog Load: `{bot.boot_metrics['total_cog_load_time']:.2f}s`\n"
-                f"• Ready Time: `{bot.boot_metrics['ready_time']:.2f}s`\n\n"
-                f"**Individual Cog Load Times:**\n" + 
-                "\n".join([f"• `{cog.split('.')[-1]}: {time:.2f}s`" 
-                          for cog, time in sorted(bot.cog_load_times.items())])
-            )
-            
-            embed = discord.Embed(
-                description=boot_info,
-                color=discord.Color.green()
-            )
-            await message.edit(embed=embed)
-        except Exception as e:
-            print(f"Failed to update restart message: {e}")
-
-    """success, errors = await CogLoader.load_all_cogs(bot)
-    status_msg = (
-        f"[?] Logged in as {bot.user.name} (ID: {bot.user.id})\n"
-        f"[!] Shards: {bot.shard_count}, Latency: {round(bot.latency * 1000, 2)}ms\n"
-        f"[+] Cogs: {success} loaded, {errors} errors"
-    )
-    print(status_msg)"""
-    
-    activity = discord.Activity(
-        type=discord.ActivityType.playing,
-        name=f"with {len(bot.guilds)} servers | .help"
-    )
-    await bot.change_presence(activity=activity)
-    
-    # Start additional stats tracker
-    if not additional_stats_update.is_running():
-        additional_stats_update.start()
-        logging.info("Started additional stats update loop")
-    
-    if not reset_daily_stats.is_running():
-        reset_daily_stats.start()
+from bronxbot import *
+from cogInfo import CogLoader
+
+@bot.event
+async def on_ready():
+    """Called when the bot is ready"""
+    logging.info(f"Bot ready as {bot.user.name} ({bot.user.id})")
+    
+    # Load all cogs using CogLoader
+    try:
+        logging.info("Loading cogs...")
+        success_count, error_count = await CogLoader.load_all_cogs(bot)
+        logging.info(f"Loaded {success_count} cogs with {error_count} errors")
+    except Exception as e:
+        logging.error(f"Error during cog loading: {e}")
+        traceback.print_exc()
+    
+    # Start the stats update loop after cogs are loaded
+    if not hasattr(bot, 'update_stats'):
+        logging.error("update_stats task not found")
+        return
+    if not bot.update_stats.is_running():
+        bot.update_stats.start()
+        logging.info("Started stats update loop")
+
+    # Start command usage tracker auto-save
+    try:
+        usage_tracker.start_auto_save()
+        logging.info("Started command usage tracker auto-save")
+    except Exception as e:
+        logging.error(f"Failed to start command usage tracker: {e}")
+
+    # Initialize scalability manager
+    try:
+        bot.scalability_manager = await initialize_scalability(bot)
+        logging.info("Scalability manager initialized successfully")
+    except Exception as e:
+        logging.warning(f"Scalability manager initialization failed: {e}")
+        bot.scalability_manager = None
+
+    # Load additional cogs manually
+    try:
+        # Load TOS handler
+        await bot.load_extension('utils.tos_handler')
+        logging.info("TOS handler loaded successfully")
+        
+        # Load Setup wizard
+        await bot.load_extension('cogs.setup.SetupWizard') 
+        logging.info("Setup wizard loaded successfully")
+    except Exception as e:
+        logging.error(f"Failed to load additional cogs: {e}")
+
+    # Initialize database and clean up corrupted inventory data
+    try:
+        from utils.db import AsyncDatabase
+        db = AsyncDatabase.get_instance()
+        await db.ensure_connected()
+        logging.info("Database connection established")
+        
+        # Run inventory cleanup on startup to remove corrupted data
+        cleaned_count = await db.cleanup_corrupted_inventory()
+        if cleaned_count > 0:
+            logging.info(f"Cleaned up {cleaned_count} corrupted inventory items on startup")
+        else:
+            logging.info("No corrupted inventory items found during startup cleanup")
+    except ImportError:
+        logging.warning("Database module not available, skipping database initialization")
+    except Exception as e:
+        logging.error(f"Failed to initialize database or cleanup inventory: {e}")
+
+    guild_cache_start = time.time()
+    # Build guild cache
+    for guild in bot.guilds:
+        await guild.chunk()
+    bot.boot_metrics['guild_cache_time'] = time.time() - guild_cache_start
+    
+    # Update presence
+    await bot.change_presence(
+        activity=discord.Activity(
+            type=discord.ActivityType.playing,
+            name=f"with {len(bot.guilds)} servers | .help"
+        )
+    )
+    
+    if bot.restart_channel and bot.restart_message:
+        try:
+            channel = await bot.fetch_channel(bot.restart_channel)
+            message = await channel.fetch_message(bot.restart_message)
+            
+            bot.boot_metrics['total_boot_time'] = time.time() - bot.boot_metrics['start_time']
+            bot.boot_metrics['ready_time'] = time.time() - bot.start_time
+            bot.boot_metrics['total_cog_load_time'] = sum(bot.cog_load_times.values())
+            
+            boot_info = (
+                f"✅ Boot completed in `{bot.boot_metrics['total_boot_time']:.2f}s`\n\n"
+                f"**Boot Metrics:**\n"
+                f"• Config Load: `{bot.boot_metrics['config_load_time']:.2f}s`\n"
+                f"• Guild Cache: `{bot.boot_metrics['guild_cache_time']:.2f}s`\n"
+                f"• Total Cog Load: `{bot.boot_metrics['total_cog_load_time']:.2f}s`\n"
+                f"• Ready Time: `{bot.boot_metrics['ready_time']:.2f}s`\n\n"
+                f"**Individual Cog Load Times:**\n" + 
+                "\n".join([f"• `{cog.split('.')[-1]}: {time:.2f}s`" 
+                          for cog, time in sorted(bot.cog_load_times.items())])
+            )
+            
+            embed = discord.Embed(
+                description=boot_info,
+                color=discord.Color.green()
+            )
+            await message.edit(embed=embed)
+        except Exception as e:
+            print(f"Failed to update restart message: {e}")
+
+    """success, errors = await CogLoader.load_all_cogs(bot)
+    status_msg = (
+        f"[?] Logged in as {bot.user.name} (ID: {bot.user.id})\n"
+        f"[!] Shards: {bot.shard_count}, Latency: {round(bot.latency * 1000, 2)}ms\n"
+        f"[+] Cogs: {success} loaded, {errors} errors"
+    )
+    print(status_msg)"""
+    
+    activity = discord.Activity(
+        type=discord.ActivityType.playing,
+        name=f"with {len(bot.guilds)} servers | .help"
+    )
+    await bot.change_presence(activity=activity)
+    
+    # Start additional stats tracker
+    if not additional_stats_update.is_running():
+        additional_stats_update.start()
+        logging.info("Started additional stats update loop")
+    
+    if not reset_daily_stats.is_running():
+        reset_daily_stats.start()
         logging.info("Started daily stats reset loop")

bronxbot.py

@@ -131,9 +131,10 @@ async def close(self):
 
         # Close database connections (only if db module exists)
         try:
-            from utils.db import async_db
-            if hasattr(async_db, '_client') and async_db._client:
-                async_db._client.close()
+            from utils.db import AsyncDatabase
+            db = AsyncDatabase.get_instance()
+            if hasattr(db, '_client') and db._client:
+                db._client.close()
                 logging.info("Closed database connections")
         except ImportError:
             logging.debug("Database module not available, skipping cleanup")

cogs/Moderation.py

@@ -7,9 +7,12 @@
 import datetime
 import asyncio
 from cogs.logging.logger import CogLogger
-from utils.db import db
+from utils.db import AsyncDatabase
 from utils.error_handler import ErrorHandler
 
+# Initialize database instance
+db = AsyncDatabase.get_instance()
+
 # this is super wip
 class Moderation(commands.Cog, ErrorHandler):
     def __init__(self, bot):

cogs/Reminders.py

@@ -4,7 +4,8 @@
 import re
 from typing import Optional, List, Dict, Any
 import asyncio
-from utils.db import async_db as db
+from utils.db import AsyncDatabase
+db = AsyncDatabase.get_instance()
 from utils.error_handler import ErrorHandler
 from cogs.logging.logger import CogLogger
 

cogs/ServerSettings.py

@@ -1,9 +1,12 @@
 import discord
 from discord.ext import commands
-from utils.db import db
+from utils.db import AsyncDatabase
 from cogs.logging.logger import CogLogger
 from utils.error_handler import ErrorHandler
 
+# Initialize database instance
+db = AsyncDatabase.get_instance()
+
 logger = CogLogger('ServerSettings')
 
 # DEPRECATED: This file has been replaced by the modular settings system

cogs/admin/Admin.py

@@ -1,7 +1,8 @@
 import discord
 from discord.ext import commands
 from cogs.logging.logger import CogLogger
-from utils.db import async_db as db
+from utils.db import AsyncDatabase
+db = AsyncDatabase.get_instance()
 import discord
 import json
 import datetime

cogs/admin/Performance.py

@@ -5,7 +5,8 @@
 import datetime
 import psutil
 import asyncio
-from utils.db import async_db
+from utils.db import AsyncDatabase
+db = AsyncDatabase.get_instance()
 from utils.command_tracker import usage_tracker
 from cogs.logging.logger import CogLogger
 
@@ -63,7 +64,7 @@ async def health_check(self, ctx):
 
         # Database health
         try:
-            db_health = await async_db.health_check()
+            db_health = await db.health_check()
 
             status_emoji = "✅" if db_health["connection"] else "❌"
             status_color = discord.Color.green() if db_health["connection"] else discord.Color.red()
@@ -167,7 +168,7 @@ async def optimize_database(self, ctx):
         message = await ctx.reply(embed=embed)
 
         try:
-            result = await async_db.optimize_database()
+            result = await db.optimize_database()
 
             if result["success"]:
                 embed.color = discord.Color.green()