formatting

This commit is contained in:
Vladless
2025-07-29 19:45:13 +03:00
parent 2556d3842b
commit 5f69a36077
22 changed files with 186 additions and 202 deletions
+1 -8
View File
@@ -4,14 +4,7 @@ from sqlalchemy.orm import declarative_base
from config import DATABASE_URL
engine = create_async_engine(
DATABASE_URL,
echo=False,
future=True,
pool_size=20,
max_overflow=30,
pool_timeout=15
)
engine = create_async_engine(DATABASE_URL, echo=False, future=True, pool_size=20, max_overflow=30, pool_timeout=15)
async_session_maker = async_sessionmaker(bind=engine, expire_on_commit=False, class_=AsyncSession)
+4 -7
View File
@@ -8,8 +8,8 @@ from itertools import cycle
from sqlalchemy import select
from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.ext.asyncio import AsyncSession
from config import USE_COUNTRY_SELECTION
from config import USE_COUNTRY_SELECTION
from database.models import Key, Server, User
@@ -18,14 +18,11 @@ async def import_keys_from_3xui_db(db_path: str, session: AsyncSession) -> tuple
skipped = 0
if USE_COUNTRY_SELECTION:
result = await session.execute(
select(Server.name)
.where(Server.enabled == True, Server.panel_type == "3x-ui")
)
result = await session.execute(select(Server.name).where(Server.enabled is True, Server.panel_type == "3x-ui"))
else:
result = await session.execute(
select(Server.cluster_name)
.where(Server.enabled == True, Server.panel_type == "3x-ui", Server.cluster_name.isnot(None))
.where(Server.enabled is True, Server.panel_type == "3x-ui", Server.cluster_name.isnot(None))
.distinct()
)
@@ -121,4 +118,4 @@ async def import_keys_from_3xui_db(db_path: str, session: AsyncSession) -> tuple
continue
await session.commit()
return imported, skipped
return imported, skipped