порядок в стурктуре проекта, isort, импорты

bot.py

@@ -9,15 +9,14 @@ storage = MemoryStorage()
 dp = Dispatcher(bot=bot, storage=storage)
 router = Router()
 
-from handlers import balance, keys, notifications, pay, profile, start
-from key_management import router as key_management_router
+from handlers import key_management, keys, notifications, pay, profile, start
+from handlers.key_management import router as key_management_router
 
 # Регистрация обработчиков
 dp.include_router(start.router)
 dp.include_router(profile.router)
 dp.include_router(keys.router)
-dp.include_router(balance.router)
-dp.include_router(key_management_router)
+dp.include_router(key_management.router)
 dp.include_router(pay.router)
 dp.include_router(notifications.router)
 

handlers/balance.py

@@ -1,10 +0,0 @@
-import aiosqlite
-from aiogram import Router, types
-
-router = Router()
-
-@router.callback_query(lambda c: c.data == 'view_balance')
-async def process_callback_view_balance(callback_query: types.CallbackQuery):
-    tg_id = callback_query.from_user.id
-    
-   

handlers/key_management.py

@@ -1,4 +1,3 @@
-import asyncio
 import re
 import uuid
 from datetime import datetime, timedelta

handlers/keys.py

@@ -11,19 +11,6 @@ from database import get_balance, update_balance
 
 router = Router()
 
-from datetime import datetime, timedelta
-
-import asyncpg
-from aiogram import Router, types
-
-from auth import login_with_credentials
-from bot import bot
-from client import delete_client, extend_client_key
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL
-from database import get_balance, update_balance
-
-router = Router()
-
 # Обработка запроса на просмотр ключей
 @router.callback_query(lambda c: c.data == 'view_keys')
 async def process_callback_view_keys(callback_query: types.CallbackQuery):

handlers/notifications.py

@@ -1,33 +1,19 @@
 from datetime import datetime, timedelta
 
 import asyncpg
-from aiogram import Bot, Router, types
-from aiogram.filters import Command
-from aiogram.fsm.context import FSMContext
+from aiogram import Bot, Router
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import (  # Импортируем необходимые классы
     InlineKeyboardButton, InlineKeyboardMarkup)
 
 from bot import bot
-from config import ADMIN_ID, DATABASE_URL
-from database import get_all_users
+from config import DATABASE_URL
 
 router = Router()
 
 class NotificationStates(StatesGroup):
     waiting_for_notification_text = State()
 
-from datetime import datetime, timedelta
-
-import asyncpg
-from aiogram import Bot, Router, types
-from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-
-from bot import bot
-from config import DATABASE_URL
-
-router = Router()
-
 async def notify_expiring_keys(bot: Bot):
     try:
         conn = await asyncpg.connect(DATABASE_URL)

handlers/pay.py

@@ -1,17 +1,18 @@
+import logging
+import uuid
+
 import asyncpg
 from aiogram import Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from yookassa import Configuration, Payment  # Импортируем ЮKассу
 from aiohttp import web
-import logging
-import uuid
+from yookassa import Configuration, Payment  # Импортируем ЮKассу
 
 from bot import bot
-from config import  YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID
-from database import (add_connection, check_connection_exists, get_balance,
-                      get_key_count, update_balance)
+from config import YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID
+from database import (add_connection, check_connection_exists, get_key_count,
+                      update_balance)
 from handlers.profile import process_callback_view_profile
 
 router = Router()

handlers/profile.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from aiogram import Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup

handlers/start.py

@@ -1,14 +1,14 @@
 import os
 
-from aiogram import Router, types
+from aiogram import Router
 from aiogram.filters import Command
-from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import (BufferedInputFile, CallbackQuery,
                            InlineKeyboardButton, InlineKeyboardMarkup, Message)
 
 from bot import bot
-from config import ADMIN_ID, CHANNEL_URL, SUPPORT_CHAT_URL  # Добавьте SUPPORT_CHAT_URL
+from config import (ADMIN_ID, CHANNEL_URL,  # Добавьте SUPPORT_CHAT_URL
+                    SUPPORT_CHAT_URL)
 
 router = Router()