Move utils.py to the utils folder

handlers/admin/admin_user_editor.py

@@ -12,7 +12,7 @@ from config import TOTAL_GB
 from utils.database import get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry
 from filters.admin import IsAdminFilter
 from handlers.keys.key_utils import delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster
-from handlers.utils import sanitize_key_name
+from utils.utils import sanitize_key_name
 from logger import logger
 
 router = Router()

handlers/keys/key_management.py

@@ -22,7 +22,7 @@ from config import (
 from utils.database import get_balance, get_trial, store_key, update_balance
 from handlers.keys.key_utils import create_key_on_cluster
 from handlers.texts import DISCOUNTS, KEY, key_message_success
-from handlers.utils import generate_random_email, get_least_loaded_cluster
+from utils.utils import generate_random_email, get_least_loaded_cluster
 from logger import logger
 
 router = Router()

handlers/keys/keys.py

@@ -25,7 +25,7 @@ from handlers.texts import (
     SUCCESS_RENEWAL_MSG,
     key_message,
 )
-from handlers.utils import get_least_loaded_cluster, handle_error
+from utils.utils import get_least_loaded_cluster, handle_error
 from logger import logger
 
 locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8")

handlers/keys/trial_key.py

@@ -9,7 +9,7 @@ from utils.client import add_client
 from config import ADMIN_PASSWORD, ADMIN_USERNAME, PUBLIC_LINK, TOTAL_GB, TRIAL_TIME
 from utils.database import get_servers_from_db, store_key, use_trial
 from handlers.texts import INSTRUCTIONS
-from handlers.utils import generate_random_email, get_least_loaded_cluster
+from utils.utils import generate_random_email, get_least_loaded_cluster
 
 
 async def create_trial_key(tg_id: int, session: Any):

utils/utils.py

@@ -6,7 +6,7 @@ import asyncpg
 
 from bot import bot
 from config import DATABASE_URL
-from utils.database import get_servers_from_db
+from database import get_servers_from_db
 from logger import logger