perf: reduce backend request latency

Author: x0sina

app/db/crud/admin.py

@@ -17,10 +17,12 @@
 from app.models.stats import Period, UserUsageStat, UserUsageStatsList
 
 
-async def load_admin_attrs(admin: Admin):
+async def load_admin_attrs(admin: Admin, load_users: bool = True, load_usage_logs: bool = True):
     try:
-        await admin.awaitable_attrs.users
-        await admin.awaitable_attrs.usage_logs
+        if load_users:
+            await admin.awaitable_attrs.users
+        if load_usage_logs:
+            await admin.awaitable_attrs.usage_logs
     except AttributeError:
         pass
 
@@ -49,7 +51,13 @@ async def load_admin_attrs(admin: Admin):
 )
 
 
-async def get_admin(db: AsyncSession, username: str) -> Admin:
+async def get_admin(
+    db: AsyncSession,
+    username: str,
+    *,
+    load_users: bool = True,
+    load_usage_logs: bool = True,
+) -> Admin:
     """
     Retrieves an admin by username.
 
@@ -62,7 +70,7 @@ async def get_admin(db: AsyncSession, username: str) -> Admin:
     """
     admin = (await db.execute(select(Admin).where(Admin.username == username))).unique().scalar_one_or_none()
     if admin:
-        await load_admin_attrs(admin)
+        await load_admin_attrs(admin, load_users=load_users, load_usage_logs=load_usage_logs)
     return admin
 
 
@@ -138,7 +146,13 @@ async def remove_admin(db: AsyncSession, dbadmin: Admin) -> None:
     await db.commit()
 
 
-async def get_admin_by_id(db: AsyncSession, id: int) -> Admin:
+async def get_admin_by_id(
+    db: AsyncSession,
+    id: int,
+    *,
+    load_users: bool = True,
+    load_usage_logs: bool = True,
+) -> Admin:
     """
     Retrieves an admin by their ID.
 
@@ -151,11 +165,17 @@ async def get_admin_by_id(db: AsyncSession, id: int) -> Admin:
     """
     admin = (await db.execute(select(Admin).where(Admin.id == id))).first()
     if admin:
-        await load_admin_attrs(admin)
+        await load_admin_attrs(admin, load_users=load_users, load_usage_logs=load_usage_logs)
     return admin
 
 
-async def get_admin_by_telegram_id(db: AsyncSession, telegram_id: int) -> Admin:
+async def get_admin_by_telegram_id(
+    db: AsyncSession,
+    telegram_id: int,
+    *,
+    load_users: bool = True,
+    load_usage_logs: bool = True,
+) -> Admin:
     """
     Retrieves an admin by their Telegram ID.
 
@@ -168,11 +188,17 @@ async def get_admin_by_telegram_id(db: AsyncSession, telegram_id: int) -> Admin:
     """
     admin = (await db.execute(select(Admin).where(Admin.telegram_id == telegram_id))).scalar_one_or_none()
     if admin:
-        await load_admin_attrs(admin)
+        await load_admin_attrs(admin, load_users=load_users, load_usage_logs=load_usage_logs)
     return admin
 
 
-async def get_admin_by_discord_id(db: AsyncSession, discord_id: int) -> Admin:
+async def get_admin_by_discord_id(
+    db: AsyncSession,
+    discord_id: int,
+    *,
+    load_users: bool = True,
+    load_usage_logs: bool = True,
+) -> Admin:
     """
     Retrieves an admin by their Discord ID.
 
@@ -185,7 +211,7 @@ async def get_admin_by_discord_id(db: AsyncSession, discord_id: int) -> Admin:
     """
     admin = (await db.execute(select(Admin).where(Admin.discord_id == discord_id))).first()
     if admin:
-        await load_admin_attrs(admin)
+        await load_admin_attrs(admin, load_users=load_users, load_usage_logs=load_usage_logs)
     return admin
 
 

app/db/crud/user.py

@@ -5,7 +5,7 @@
 
 from sqlalchemy import and_, case, delete, desc, func, literal, literal_column, not_, or_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import joinedload
+from sqlalchemy.orm import joinedload, selectinload
 from sqlalchemy.sql.functions import coalesce
 
 from app.db.compiles_types import DateDiff
@@ -179,7 +179,12 @@ async def get_users(
     Returns:
         List of users or tuple with (users, count) if return_with_count is True.
     """
-    stmt = select(User)
+    stmt = select(User).options(
+        selectinload(User.admin),
+        selectinload(User.next_plan),
+        selectinload(User.usage_logs),
+        selectinload(User.groups),
+    )
 
     filters = []
     if usernames:
@@ -227,9 +232,6 @@ async def get_users(
     result = await db.execute(stmt)
     users = list(result.unique().scalars().all())
 
-    for user in users:
-        await load_user_attrs(user)
-
     if return_with_count:
         return users, total
     return users

app/operation/system.py

@@ -25,7 +25,7 @@ async def get_system_stats(db: AsyncSession, admin: AdminDetails, admin_username
 
         admin_param = None
         if admin.is_sudo and admin_username:
-            admin_param = await get_admin(db, admin_username)
+            admin_param = await get_admin(db, admin_username, load_users=False, load_usage_logs=False)
         elif not admin.is_sudo:
             admin_param = admin
 

app/operation/user.py

@@ -215,7 +215,7 @@ async def create_user(self, db: AsyncSession, new_user: UserCreate, admin: Admin
             await self.get_validated_user_template(db, new_user.next_plan.user_template_id)
 
         all_groups = await self.validate_all_groups(db, new_user)
-        db_admin = await get_admin(db, admin.username)
+        db_admin = await get_admin(db, admin.username, load_users=False, load_usage_logs=False)
 
         try:
             db_user = await create_user(db, new_user, all_groups, db_admin)
@@ -451,7 +451,9 @@ async def get_users_simple(
                     await self.raise_error(message=f'"{opt}" is not a valid sort option', code=400)
 
         # Authorization: non-sudo admins see only their users
-        admin_filter = None if admin.is_sudo else await get_admin(db, admin.username)
+        admin_filter = (
+            None if admin.is_sudo else await get_admin(db, admin.username, load_users=False, load_usage_logs=False)
+        )
 
         # Call CRUD function
         rows, total = await get_users_simple(
@@ -694,7 +696,7 @@ def builder(username: str):
         if users_to_create:
             groups = await self.validate_all_groups(db, users_to_create[0])
 
-        db_admin = await get_admin(db, admin.username)
+        db_admin = await get_admin(db, admin.username, load_users=False, load_usage_logs=False)
         subscription_urls = await self._persist_bulk_users(db, admin, db_admin, users_to_create, groups)
 
         return BulkUsersCreateResponse(subscription_urls=subscription_urls, created=len(subscription_urls))

app/routers/authentication.py

@@ -20,15 +20,29 @@ async def get_admin(db: AsyncSession, token: str) -> AdminDetails | None:
     if not payload:
         return
 
-    db_admin = await get_admin_by_username(db, payload["username"])
+    db_admin = await get_admin_by_username(db, payload["username"], load_users=False, load_usage_logs=False)
     if db_admin:
         if db_admin.password_reset_at:
             if not payload.get("created_at"):
                 return
             if db_admin.password_reset_at.astimezone(tz.utc) > payload.get("created_at"):
                 return
 
-        return AdminDetails.model_validate(db_admin)
+        return AdminDetails(
+            id=db_admin.id,
+            username=db_admin.username,
+            is_sudo=db_admin.is_sudo,
+            used_traffic=db_admin.used_traffic,
+            is_disabled=db_admin.is_disabled,
+            telegram_id=db_admin.telegram_id,
+            discord_webhook=db_admin.discord_webhook,
+            sub_domain=db_admin.sub_domain,
+            profile_title=db_admin.profile_title,
+            support_url=db_admin.support_url,
+            notification_enable=db_admin.notification_enable,
+            discord_id=db_admin.discord_id,
+            sub_template=db_admin.sub_template,
+        )
 
     elif payload["username"] in SUDOERS and payload["is_sudo"] is True:
         return AdminDetails(username=payload["username"], is_sudo=True)
@@ -61,7 +75,7 @@ async def check_sudo_admin(admin: AdminDetails = Depends(get_current)):
 async def validate_admin(db: AsyncSession, username: str, password: str) -> AdminValidationResult | None:
     """Validate admin credentials with environment variables or database."""
 
-    db_admin = await get_admin_by_username(db, username)
+    db_admin = await get_admin_by_username(db, username, load_users=False, load_usage_logs=False)
     if db_admin and await verify_password(password, db_admin.hashed_password):
         return AdminValidationResult(
             username=db_admin.username, is_sudo=db_admin.is_sudo, is_disabled=db_admin.is_disabled
@@ -93,7 +107,7 @@ async def validate_mini_app_admin(db: AsyncSession, token: str) -> AdminValidati
             headers={"WWW-Authenticate": "Bearer"},
         )
 
-    db_admin = await get_admin_by_telegram_id(db, data.user.id)
+    db_admin = await get_admin_by_telegram_id(db, data.user.id, load_users=False, load_usage_logs=False)
     if db_admin:
         return AdminValidationResult(
             username=db_admin.username, is_sudo=db_admin.is_sudo, is_disabled=db_admin.is_disabled