isort and black

backup.py

@@ -1,9 +1,9 @@
-from loguru import logger
 import os
 import subprocess
 from datetime import datetime
 
 from aiogram.types import BufferedInputFile
+from loguru import logger
 
 from config import ADMIN_ID, BACK_DIR, DB_NAME, DB_PASSWORD, DB_USER
 

client.py

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

handlers/admin/admin.py

@@ -1,9 +1,9 @@
-from loguru import logger
 from datetime import datetime
 
 import asyncpg
-from aiogram import Router, types, F
+from aiogram import F, Router, types
 from aiogram.filters import Command
+from loguru import logger
 
 from auth import login_with_credentials
 from client import extend_client_key_admin

handlers/admin/admin_panel.py

@@ -2,7 +2,7 @@ import subprocess
 from datetime import datetime
 
 import asyncpg
-from aiogram import Router, types, F
+from aiogram import F, Router, types
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup

handlers/admin/user_editor.py

@@ -1,5 +1,4 @@
 import asyncio
-from loguru import logger
 from datetime import datetime
 
 import asyncpg
@@ -7,6 +6,7 @@ from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup
+from loguru import logger
 
 from auth import login_with_credentials
 from bot import bot

handlers/commands.py

@@ -1,11 +1,10 @@
-from loguru import logger
-
 import asyncpg
 from aiogram import F, Router, types
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import Message
+from loguru import logger
 
 from bot import bot
 from config import ADMIN_ID, DATABASE_URL

handlers/keys/key_management.py

@@ -1,5 +1,4 @@
 import asyncio
-from loguru import logger
 import uuid
 from datetime import datetime, timedelta
 
@@ -13,6 +12,7 @@ from aiogram.types import (
     InlineKeyboardMarkup,
     Message,
 )
+from loguru import logger
 
 from auth import login_with_credentials
 from bot import bot, dp

handlers/keys/keys.py

@@ -1,12 +1,12 @@
 import asyncio
 import locale
-from loguru import logger
 import os
 from datetime import datetime, timedelta
 
 import asyncpg
-from aiogram import Router, types, F
+from aiogram import F, Router, types
 from aiogram.types import BufferedInputFile
+from loguru import logger
 
 from auth import login_with_credentials
 from bot import bot
@@ -41,7 +41,6 @@ locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8")
 router = Router()
 
 
-
 @router.callback_query(F.data == "view_keys")
 async def process_callback_view_keys(callback_query: types.CallbackQuery):
     tg_id = callback_query.from_user.id

handlers/keys/subscriptions.py

@@ -1,8 +1,8 @@
 import base64
-from loguru import logger
 
 import aiohttp
 from aiohttp import web
+from loguru import logger
 
 from config import SERVERS
 

handlers/keys/trial_key.py

@@ -1,9 +1,9 @@
 import asyncio
-from loguru import logger
 import uuid
 from datetime import datetime, timedelta
 
 import asyncpg
+from loguru import logger
 
 from auth import login_with_credentials
 from client import add_client

handlers/notifications.py

@@ -1,10 +1,10 @@
 import asyncio
-from loguru import logger
 from datetime import datetime, timedelta
 
 import asyncpg
 from aiogram import Bot, Router, types
 from aiogram.fsm.state import State, StatesGroup
+from loguru import logger
 
 from auth import login_with_credentials
 from client import delete_client, extend_client_key

handlers/payment/freekassa_pay.py

@@ -1,14 +1,14 @@
 import hashlib
-from loguru import logger
 import time
 import uuid
 
 import requests
-from aiogram import Router, types, F
+from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiohttp import web
+from loguru import logger
 
 from bot import bot
 from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID

handlers/payment/yookassa_pay.py

@@ -1,11 +1,11 @@
-from loguru import logger
 import uuid
 
-from aiogram import Router, types, F
+from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiohttp import web
+from loguru import logger
 from yookassa import Configuration, Payment
 
 from bot import bot

handlers/profile.py

@@ -1,10 +1,10 @@
-from loguru import logger
 import os
 
-from aiogram import Router, types,F
+from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import BufferedInputFile, InlineKeyboardButton, InlineKeyboardMarkup
+from loguru import logger
 
 from bot import bot
 from config import PAYMENT_METHOD
@@ -25,7 +25,6 @@ class ReplenishBalanceState(StatesGroup):
 router = Router()
 
 
-
 async def process_callback_view_profile(
     callback_query: types.CallbackQuery, state: FSMContext
 ):

handlers/start.py

@@ -1,8 +1,7 @@
-from loguru import logger
 import os
 
 import asyncpg
-from aiogram import Router,F
+from aiogram import F, Router
 from aiogram.filters import Command
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import (
@@ -12,6 +11,7 @@ from aiogram.types import (
     InlineKeyboardMarkup,
     Message,
 )
+from loguru import logger
 
 from bot import bot
 from config import APP_URL, CHANNEL_URL, DATABASE_URL, SUPPORT_CHAT_URL
@@ -19,7 +19,6 @@ from database import add_connection, add_referral, check_connection_exists, get_
 from handlers.keys.trial_key import create_trial_key
 from handlers.texts import ABOUT_VPN, INSTRUCTIONS_TRIAL, WELCOME_TEXT
 
-
 router = Router()
 
 

main.py

@@ -1,9 +1,9 @@
 import asyncio
-from loguru import logger
 import signal
 
 from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application
 from aiohttp import web
+from loguru import logger
 
 from backup import backup_database
 from bot import bot, dp, router