Fixed imports

app/database.py

@@ -1,9 +1,8 @@
 import os
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
-from dotenv import load_dotenv
 
+from dotenv import load_dotenv
 from models.game_models import Base as GameBase
-
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
 load_dotenv()
 

app/game_promo_manager.py

@@ -1,18 +1,33 @@
 import asyncio
 import json
-import aiohttp
+import logging.handlers
 import os
-import time
 import random
+import time
 import uuid
-import logging.handlers
-import coloredlogs
 from urllib.parse import urlparse
+
+import aiohttp
+import coloredlogs
 from database import get_session
-from models.game_models import (ChainCube2048, TrainMiner, MergeAway,
-                                TwerkRace3D, Polysphere, MowAndTrim, CafeDash, Zoopolis,
-                                GangsWars, FluffCrusade, TileTrio, StoneAge, Bouncemasters, HideBall, PinOutMaster,
-                                CountMasters)
+from models.game_models import (
+    Bouncemasters,
+    CafeDash,
+    ChainCube2048,
+    CountMasters,
+    FluffCrusade,
+    GangsWars,
+    HideBall,
+    MergeAway,
+    MowAndTrim,
+    PinOutMaster,
+    Polysphere,
+    StoneAge,
+    TileTrio,
+    TrainMiner,
+    TwerkRace3D,
+    Zoopolis,
+)
 
 # Configuring logging
 log_directory = "logs"

app/main.py

@@ -1,7 +1,8 @@
 import asyncio
+
+from database import init_db
 from game_promo_manager import gen
 from games import games
-from database import init_db
 
 
 async def run_all_games():

app/models/game_models.py

@@ -1,7 +1,8 @@
-from sqlalchemy import Column, Integer, Text, DateTime, Index
-from sqlalchemy.ext.declarative import declarative_base
 from datetime import datetime
 
+from sqlalchemy import Column, DateTime, Index, Integer, Text
+from sqlalchemy.ext.declarative import declarative_base
+
 Base = declarative_base()
 
 

bot/config.py

@@ -1,5 +1,6 @@
-import os
 import logging
+import os
+
 from aiogram import Bot, Dispatcher
 from aiogram.client.bot import DefaultBotProperties
 from aiogram.fsm.storage.redis import RedisStorage

bot/database/database.py

@@ -1,14 +1,15 @@
 import logging
 import os
-from sqlalchemy import update, text, func
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
-from sqlalchemy.future import select
-from sqlalchemy.exc import IntegrityError
-from dotenv import load_dotenv
 from datetime import datetime, timezone
 
-from .models import Base, User, UserLog
+from dotenv import load_dotenv
 from redis_client import create_redis_client
+from sqlalchemy import func, text, update
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.future import select
+
+from .models import Base, User, UserLog
 
 load_dotenv()
 redis_client = create_redis_client()

bot/database/models.py

@@ -1,7 +1,8 @@
-from sqlalchemy import Column, Integer, BigInteger, String, Boolean, DateTime, Date, Text
-from sqlalchemy.ext.declarative import declarative_base
 from datetime import datetime
 
+from sqlalchemy import BigInteger, Boolean, Column, Date, DateTime, Integer, String, Text
+from sqlalchemy.ext.declarative import declarative_base
+
 Base = declarative_base()
 
 

bot/filters/admin_filter.py

@@ -1,8 +1,9 @@
+import asyncio
+
 from aiogram.filters import BaseFilter
 from aiogram.types import Message
-from database.database import get_user_role_and_ban_info, get_session
 from config import bot
-import asyncio
+from database.database import get_session, get_user_role_and_ban_info
 from handlers.handlers import send_menu_handler
 from utils import get_translation
 

bot/handlers/__init__.py

@@ -1,8 +1,8 @@
 from .admin_handlers import register_admin_handlers
+from .commands import register_commands_handler
 from .handlers import register_all_handlers
 from .message_handler import register_message_handler
 from .payment_handlers import register_payment_handlers
-from .commands import register_commands_handler
 
 
 def register_handlers(dp):

bot/handlers/admin_handlers.py

@@ -1,18 +1,30 @@
 import asyncio
 import logging
-from aiogram import types, F, Router
+
+from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.types import InlineKeyboardMarkup, Message
-from config import bot, BOT_ID, GROUP_CHAT_ID
 from common.static_data import GAMES
-from database.database import (get_session, log_user_action, get_admin_chat_ids, get_keys_count_for_games,
-                               get_users_list_admin_panel, get_user_details, get_subscribed_users)
-from keyboards.inline import (get_admin_panel_keyboard, get_main_in_admin, get_detail_info_in_admin,
-                              notification_menu, confirmation_button_notification)
+from config import BOT_ID, GROUP_CHAT_ID, bot
+from database.database import (
+    get_admin_chat_ids,
+    get_keys_count_for_games,
+    get_session,
+    get_subscribed_users,
+    get_user_details,
+    get_users_list_admin_panel,
+    log_user_action,
+)
+from keyboards.inline import (
+    confirmation_button_notification,
+    get_admin_panel_keyboard,
+    get_detail_info_in_admin,
+    get_main_in_admin,
+    notification_menu,
+)
 from keyboards.referral_links_kb import referral_links_keyboard
-from utils import get_translation
 from states.form import Form, FormSendToUser
-from utils import load_image
+from utils import get_translation, load_image
 
 router = Router()
 

bot/handlers/commands.py

@@ -1,15 +1,12 @@
-from aiogram.types import Message
-
 from aiogram import Router
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
-
+from aiogram.types import Message
+from config import BOT_ID, bot
 from database.database import get_session
 from filters.admin_filter import AdminFilter
-
-from config import BOT_ID, bot
 from handlers.admin_handlers import handle_admin_command_handler
-from handlers.handlers import welcome_command_handler, change_language_logic_handler, set_user_commands
+from handlers.handlers import change_language_logic_handler, set_user_commands, welcome_command_handler
 
 router = Router()
 

bot/handlers/handlers.py

@@ -1,25 +1,36 @@
 import asyncio
 import logging
-from aiogram import types, F, Router
+
+from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
-from config import bot, BOT_ID
 from common.static_data import GAMES, STATUS_LIMITS, SUPPORTED_LANGUAGES
+from config import BOT_ID, bot
 from database.database import (
-    get_session, get_or_create_user, update_user_language, log_user_action,
-    get_user_language, get_oldest_keys, update_keys_generated,
-    delete_keys, get_user_status_info,
-    check_user_limits, check_user_safety_limits,
-    get_keys_count_main_menu, get_user_stats, update_safety_keys_generated,
-    delete_safety_keys, get_safety_keys
+    check_user_limits,
+    check_user_safety_limits,
+    delete_keys,
+    delete_safety_keys,
+    get_keys_count_main_menu,
+    get_oldest_keys,
+    get_or_create_user,
+    get_safety_keys,
+    get_session,
+    get_user_language,
+    get_user_stats,
+    get_user_status_info,
+    log_user_action,
+    update_keys_generated,
+    update_safety_keys_generated,
+    update_user_language,
 )
 from handlers.command_setup import set_user_commands
 from keyboards.back_to_main_kb import get_back_to_main_menu_button
 from keyboards.donate_kb import get_donation_keyboard
+from keyboards.inline import create_language_keyboard, get_action_buttons, get_settings_menu, instruction_prem_button
 from keyboards.referral_links_kb import referral_links_keyboard
-from keyboards.inline import get_action_buttons, get_settings_menu, create_language_keyboard, instruction_prem_button
-from utils import get_translation, get_available_languages, load_image
-from utils.helpers import get_remaining_time
 from states.form import Form
+from utils import get_available_languages, get_translation, load_image
+from utils.helpers import get_remaining_time
 from utils.services import generate_user_stats
 
 router = Router()

bot/handlers/message_handler.py

@@ -1,10 +1,10 @@
 import logging
-from aiogram import types, F, Router
-from aiogram.exceptions import TelegramBadRequest
-from config import bot, BOT_ID, GROUP_CHAT_ID
-from database.database import get_session, log_user_action, is_admin
 
-from handlers.admin_handlers import message_user_mapping, forward_message_to_admins
+from aiogram import F, Router, types
+from aiogram.exceptions import TelegramBadRequest
+from config import BOT_ID, GROUP_CHAT_ID, bot
+from database.database import get_session, is_admin, log_user_action
+from handlers.admin_handlers import forward_message_to_admins, message_user_mapping
 
 router = Router()
 

bot/handlers/payment_handlers.py

@@ -1,16 +1,13 @@
 import asyncio
 import logging
 
-from aiogram import types, F, Router
-from aiogram.fsm.context import FSMContext
+from aiogram import F, Router, types
 from aiogram.exceptions import TelegramBadRequest
-
+from aiogram.fsm.context import FSMContext
 from config import BOT_ID
-from handlers.handlers import send_menu_handler, info_handler
+from handlers.handlers import info_handler, send_menu_handler
 from keyboards.back_to_main_kb import get_back_to_main_menu_button
-
-from keyboards.donate_kb import get_payment_keyboard, get_cancel_donation_keyboard
-
+from keyboards.donate_kb import get_cancel_donation_keyboard, get_payment_keyboard
 from states.form import DonationState
 from utils import get_translation
 

bot/keyboards/back_to_main_kb.py

@@ -1,6 +1,5 @@
-from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiogram.types import InlineKeyboardButton
-
+from aiogram.utils.keyboard import InlineKeyboardBuilder
 from utils import get_translation
 
 

bot/keyboards/donate_kb.py

@@ -1,6 +1,5 @@
 from aiogram import types
 from aiogram.utils.keyboard import InlineKeyboardBuilder
-
 from keyboards.back_to_main_kb import get_back_to_main_menu_button
 from utils import get_translation
 

bot/keyboards/inline.py

@@ -1,7 +1,7 @@
-from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
-
 from utils import get_translation
+
 from .back_to_main_kb import get_back_to_main_menu_button
 
 

bot/keyboards/referral_links_kb.py

@@ -1,5 +1,6 @@
-from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from common.referals import REFERRAL_LINKS
+
 from .back_to_main_kb import get_back_to_main_menu_button
 
 

bot/main.py

@@ -1,10 +1,11 @@
 import asyncio
 import logging
+
 from config import bot, setup_dispatcher
-from database.database import init_db, close_db
-from redis_client import create_redis_client, close_redis_client
+from database.database import close_db, init_db
 from handlers import register_handlers
 from middlewares.ban_check_middleware import BanCheckMiddleware
+from redis_client import close_redis_client, create_redis_client
 
 
 async def main():

bot/middlewares/ban_check_middleware.py

@@ -1,6 +1,6 @@
 from aiogram import BaseMiddleware, types
 from aiogram.types import Update
-from database.database import get_user_status_info, get_session
+from database.database import get_session, get_user_status_info
 from handlers.handlers import banned_user_handler
 
 

bot/redis_client.py

@@ -1,7 +1,7 @@
+import logging
 import os
 
 import redis.asyncio as redis
-import logging
 from dotenv import load_dotenv
 
 load_dotenv()

bot/states/form.py

@@ -1,4 +1,4 @@
-from aiogram.fsm.state import StatesGroup, State
+from aiogram.fsm.state import State, StatesGroup
 
 
 class Form(StatesGroup):

bot/translations/translation_manager.py

@@ -1,6 +1,6 @@
-import os
 import json
 import logging
+import os
 
 
 class TranslationManager:

bot/utils/__init__.py

@@ -1,2 +1,2 @@
-from .utils import get_translation, get_available_languages  # noqa: F401
 from .helpers import load_image  # noqa: F401
+from .utils import get_available_languages, get_translation  # noqa: F401