Sort all imports

Client.py

@@ -1,11 +1,11 @@
 import os
 import platform
-from loguru import logger
+from typing import Optional
 
 import discord
 from discord.ext import bridge, commands
-from discord.ext.commands import TextChannelConverter, EmojiConverter
+from discord.ext.commands import EmojiConverter, TextChannelConverter
-from typing import Optional
+from loguru import logger
 
 from lib import metadata
 

config/parser.py

@@ -1,4 +1,5 @@
 import json
+
 import yaml
 from loguru import logger
 

db/database.py

@@ -1,8 +1,9 @@
-from lib.constants import CONST
-from loguru import logger
 import mysql.connector
+from loguru import logger
 from mysql.connector import pooling
 
+from lib.constants import CONST
+
 
 def create_connection_pool(name: str, size: int) -> pooling.MySQLConnectionPool:
     return pooling.MySQLConnectionPool(

handlers/error_handler.py

@@ -1,13 +1,13 @@
 import sys
 import traceback
-from loguru import logger
 
 from discord.ext import commands
 from discord.ext.commands import Cog
+from loguru import logger
 
-from lib.exceptions import LumiExceptions
-from lib.embed_builder import EmbedBuilder
 from lib.constants import CONST
+from lib.embed_builder import EmbedBuilder
+from lib.exceptions import LumiExceptions
 
 
 async def on_command_error(ctx, error):

handlers/event_handler.py

@@ -1,11 +1,10 @@
-from loguru import logger
-
 from discord.ext.commands import Cog
+from loguru import logger
 
 import lib.embeds.boost
 from lib.embeds.greet import Greet
-from services.config_service import GuildConfig
 from services.blacklist_service import BlacklistUserService
+from services.config_service import GuildConfig
 
 
 class EventHandler(Cog):

handlers/reaction_handler.py

@@ -2,8 +2,8 @@ from discord import Message
 from discord.ext.commands import Cog
 from loguru import logger
 
-from services.reactions_service import CustomReactionsService
 from services.blacklist_service import BlacklistUserService
+from services.reactions_service import CustomReactionsService
 
 
 class ReactionHandler:

handlers/xp_handler.py

@@ -6,13 +6,13 @@ from typing import Optional
 
 import discord
 from discord.ext import commands
-from Client import LumiBot
 
+from Client import LumiBot
 from config.parser import JsonCache
 from lib import formatter
-from services.config_service import GuildConfig
-from services.xp_service import XpService, XpRewardService
 from services.blacklist_service import BlacklistUserService
+from services.config_service import GuildConfig
+from services.xp_service import XpRewardService, XpService
 
 _strings = JsonCache.read_json("strings")
 _messages = JsonCache.read_json("levels")

lib/constants.py

@@ -1,8 +1,10 @@
 import os
-from config.parser import JsonCache
 from typing import Optional, Set
+
 from dotenv import load_dotenv
 
+from config.parser import JsonCache
+
 # Load environment variables from .env file
 load_dotenv()
 

lib/embed_builder.py

@@ -1,7 +1,9 @@
-import discord
-from lib.constants import CONST
 import datetime
 
+import discord
+
+from lib.constants import CONST
+
 
 class EmbedBuilder:
     @staticmethod

lib/embeds/error.py

@@ -1,7 +1,7 @@
 import discord
 
-from lib.constants import CONST
 from lib import formatter
+from lib.constants import CONST
 
 
 def clean_error_embed(ctx):

lib/embeds/triggers.py

@@ -1,8 +1,10 @@
-import discord
+import datetime
 from typing import Optional
+
+import discord
+
 from config.parser import JsonCache
 from lib import formatter
-import datetime
 
 resources = JsonCache.read_json("art")
 

modules/admin/__init__.py

@@ -1,9 +1,10 @@
-import discord
-from discord.ext import commands, bridge
-
-from modules.admin import award, sql, blacklist
 from typing import Optional
 
+import discord
+from discord.ext import bridge, commands
+
+from modules.admin import award, blacklist, sql
+
 
 class BotAdmin(commands.Cog, name="Bot Admin"):
     """

modules/admin/blacklist.py

@@ -1,7 +1,9 @@
-import discord
-from services.blacklist_service import BlacklistUserService
 from typing import Optional
+
+import discord
+
 from config.parser import JsonCache
+from services.blacklist_service import BlacklistUserService
 
 resources = JsonCache.read_json("art")
 exclaim_icon = resources["icons"]["exclaim"]

modules/birthdays/__init__.py

@@ -1,13 +1,13 @@
-from loguru import logger
 import asyncio
 import random
 
 import discord
 from discord.commands import SlashCommandGroup
 from discord.ext import commands, tasks
+from loguru import logger
 
+from lib import checks, time
 from lib.constants import CONST
-from lib import time, checks
 from modules.birthdays import birthday
 from services.birthday_service import Birthday
 from services.config_service import GuildConfig

modules/config/__init__.py

@@ -1,6 +1,6 @@
 import discord
 from discord.commands import SlashCommandGroup
-from discord.ext import commands, bridge
+from discord.ext import bridge, commands
 
 from config.parser import JsonCache
 from lib import formatter

modules/economy/__init__.py

@@ -1,8 +1,8 @@
 import discord
-from discord.ext import commands, bridge
+from discord.ext import bridge, commands
 
 from lib import checks
-from modules.economy import blackjack, slots, balance, give, daily
+from modules.economy import balance, blackjack, daily, give, slots
 
 
 class Economy(commands.Cog):

modules/economy/blackjack.py

@@ -1,15 +1,14 @@
-from loguru import logger
 import random
 from datetime import datetime
 
 import discord
 import pytz
 from discord.ext import commands
+from loguru import logger
 
 from config.parser import JsonCache
 from lib import interaction
-from lib.embeds.error import EconErrors
+from lib.embeds.error import EconErrors, GenericErrors
-from lib.embeds.error import GenericErrors
 from services.currency_service import Currency
 from services.stats_service import BlackJackStats
 

modules/economy/daily.py

@@ -1,10 +1,10 @@
 from datetime import datetime, timedelta
 
 import lib.time
+from lib.constants import CONST
 from lib.embed_builder import EmbedBuilder
 from services.currency_service import Currency
 from services.daily_service import Dailies
-from lib.constants import CONST
 
 
 async def cmd(ctx) -> None:

modules/help/__init__.py

@@ -1,6 +1,6 @@
 from discord.ext import commands
 
-from lib import formatter, embed_builder, constants
+from lib import constants, embed_builder, formatter
 
 
 class Help(commands.Cog):

modules/levels/__init__.py

@@ -1,7 +1,7 @@
-from discord.ext import commands, bridge
+from discord.ext import bridge, commands
 
 from lib import checks
-from modules.levels import level, leaderboard
+from modules.levels import leaderboard, level
 
 
 class Levels(commands.Cog):

modules/levels/leaderboard.py

@@ -1,12 +1,13 @@
-import discord
-from discord.ext import bridge
 from datetime import datetime
 
+import discord
+from discord.ext import bridge
+
+from lib.constants import CONST
 from lib.embed_builder import EmbedBuilder
 from services.currency_service import Currency
 from services.daily_service import Dailies
 from services.xp_service import XpService
-from lib.constants import CONST
 
 
 async def cmd(ctx: bridge.Context) -> None:

modules/levels/level.py

@@ -1,5 +1,6 @@
 from discord import Embed
 from discord.ext import bridge
+
 from lib.constants import CONST
 from lib.embed_builder import EmbedBuilder
 from services.xp_service import XpService

modules/misc/__init__.py

@@ -2,12 +2,12 @@ from datetime import datetime
 
 import discord
 from discord.commands import SlashCommandGroup
-from discord.ext import commands, bridge, tasks
+from discord.ext import bridge, commands, tasks
 
-from lib import checks
 from Client import LumiBot
+from lib import checks
 from modules.config import set_prefix
-from modules.misc import avatar, introduction, invite, backup, info, xkcd, ping
+from modules.misc import avatar, backup, info, introduction, invite, ping, xkcd
 
 
 class Misc(commands.Cog):

modules/misc/avatar.py

@@ -1,9 +1,9 @@
 from io import BytesIO
 from typing import Optional
 
+import httpx
 from discord import File, Member
 from discord.ext import bridge
-import httpx
 
 client: httpx.AsyncClient = httpx.AsyncClient()
 

modules/misc/backup.py

@@ -1,11 +1,12 @@
-from lib.constants import CONST
-from loguru import logger
 import subprocess
 from datetime import datetime
 from typing import List, Optional
 
 import dropbox
 from dropbox.files import FileMetadata
+from loguru import logger
+
+from lib.constants import CONST
 
 # Initialize Dropbox client if instance is "main"
 _dbx: Optional[dropbox.Dropbox] = None

modules/misc/introduction.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Optional, Dict
+from typing import Dict, Optional
 
 import discord
 from discord.ext import bridge
@@ -7,8 +7,8 @@ from discord.ext import bridge
 from lib.constants import CONST
 from lib.embed_builder import EmbedBuilder
 from lib.interactions.introduction import (
-    IntroductionStartButtons,
     IntroductionFinishButtons,
+    IntroductionStartButtons,
 )
 
 

modules/misc/invite.py

@@ -1,9 +1,9 @@
 from discord import ButtonStyle
-from discord.ui import View, Button
 from discord.ext import bridge
+from discord.ui import Button, View
 
-from lib.embed_builder import EmbedBuilder
 from lib.constants import CONST
+from lib.embed_builder import EmbedBuilder
 
 
 async def cmd(ctx: bridge.BridgeContext) -> None:

modules/misc/ping.py

@@ -1,8 +1,10 @@
-from discord.ext import bridge
-from lib.embed_builder import EmbedBuilder
-from lib.constants import CONST
 from datetime import datetime
 
+from discord.ext import bridge
+
+from lib.constants import CONST
+from lib.embed_builder import EmbedBuilder
+
 
 async def ping(self, ctx: bridge.BridgeContext) -> None:
     embed = EmbedBuilder.create_success_embed(

modules/misc/xkcd.py

@@ -1,9 +1,11 @@
-from services.xkcd_service import Client, HttpError
-from lib.embed_builder import EmbedBuilder
-from lib.constants import CONST
-from discord.ext import bridge
 from typing import Optional
 
+from discord.ext import bridge
+
+from lib.constants import CONST
+from lib.embed_builder import EmbedBuilder
+from services.xkcd_service import Client, HttpError
+
 _xkcd = Client()
 
 

modules/moderation/__init__.py

@@ -1,5 +1,5 @@
 import discord
-from discord.ext import commands, bridge
+from discord.ext import bridge, commands
 
 from modules.moderation import ban
 

modules/triggers/__init__.py

@@ -1,6 +1,6 @@
+import discord
 from discord.commands import SlashCommandGroup
 from discord.ext import commands
-import discord
 
 from Client import LumiBot
 from modules.triggers.add import add_reaction

modules/triggers/add.py

@@ -1,7 +1,9 @@
-from discord.ext import bridge
 from typing import Optional
-from services.reactions_service import CustomReactionsService
+
+from discord.ext import bridge
+
 from lib.embeds.triggers import create_creation_embed, create_failure_embed
+from services.reactions_service import CustomReactionsService
 
 
 async def add_reaction(

modules/triggers/delete.py

@@ -1,10 +1,11 @@
 from discord.ext import bridge
-from services.reactions_service import CustomReactionsService
+
 from lib.embeds.triggers import (
     create_deletion_embed,
     create_failure_embed,
     create_not_found_embed,
 )
+from services.reactions_service import CustomReactionsService
 
 
 async def delete_reaction(ctx: bridge.Context, reaction_id: int) -> None:

modules/triggers/list.py

@@ -1,9 +1,11 @@
+import datetime
+
 import discord
 from discord.ext import bridge, pages
-from services.reactions_service import CustomReactionsService
+
-from lib.embeds.triggers import create_no_triggers_embed
 from config.parser import JsonCache
-import datetime
+from lib.embeds.triggers import create_no_triggers_embed
+from services.reactions_service import CustomReactionsService
 
 resources = JsonCache.read_json("art")
 

services/blacklist_service.py

@@ -1,5 +1,6 @@
+from typing import List, Optional, Tuple
+
 from db import database
-from typing import List, Tuple, Optional
 
 
 class BlacklistUserService:

services/daily_service.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import List, Tuple, Optional
+from typing import List, Optional, Tuple
 
 import pytz
 

services/item_service.py

@@ -1,4 +1,5 @@
 import sqlite3
+
 from loguru import logger
 
 from db import database

services/reactions_service.py

@@ -1,5 +1,6 @@
-from typing import Optional, Dict, Any, List
 from datetime import datetime
+from typing import Any, Dict, List, Optional
+
 from db import database
 
 

services/xp_service.py

@@ -1,10 +1,10 @@
-from lib.constants import CONST
 import time
 from typing import Callable, Dict, List, Optional, Tuple
 
 from discord.ext import commands
 
 from db import database
+from lib.constants import CONST
 
 
 class XpService: