fix: format

Author: M03ED

app/jobs/node_checker.py

@@ -37,7 +37,9 @@ async def verify_node_backend_health(node: PasarGuardNode, node_name: str) -> tu
             logger.debug(f"[{node_name}] Node health is HEALTHY")
         return Health.HEALTHY, None, None
     except NodeAPIError as e:
-        logger.error(f"[{node_name}] Health check failed, setting health to BROKEN | Error: NodeAPIError(code={e.code}) - {e.detail}")
+        logger.error(
+            f"[{node_name}] Health check failed, setting health to BROKEN | Error: NodeAPIError(code={e.code}) - {e.detail}"
+        )
         try:
             await node.set_health(Health.BROKEN)
             return Health.BROKEN, e.code, e.detail
@@ -104,13 +106,13 @@ async def process_node_health_check(db_node: Node, node: PasarGuardNode):
     # Skip nodes that are already healthy and connected
     if health == Health.HEALTHY and db_node.status == NodeStatus.connected:
         return
-    
+
     # Handle hard reset requirement
     if node.requires_hard_reset():
         async with GetDB() as db:
             await node_operator.connect_single_node(db, db_node.id)
         return
-    
+
     if health is Health.INVALID:
         logger.warning(f"[{db_node.name}] Node health is INVALID, ignoring...")
         return
@@ -125,9 +127,7 @@ async def process_node_health_check(db_node: Node, node: PasarGuardNode):
     if health == Health.BROKEN:
         # Record actual error in database
         async with GetDB() as db:
-            await NodeOperation._update_single_node_status(
-                db, db_node.id, NodeStatus.error, message=error_message
-            )
+            await NodeOperation._update_single_node_status(db, db_node.id, NodeStatus.error, message=error_message)
         # Only reconnect for non-timeout errors (code > -1)
         if error_code is not None and error_code > -1:
             async with GetDB() as db:

app/node/user.py

@@ -1,5 +1,5 @@
 from PasarGuardNodeBridge import create_proxy, create_user
-from sqlalchemy import Text, and_, cast, func, select
+from sqlalchemy import and_, func, select
 
 from app.db import AsyncSession
 from app.db.models import Group, ProxyInbound, User, UserStatus, inbounds_groups_association, users_groups_association
@@ -31,12 +31,9 @@ async def core_users(db: AsyncSession):
     # Use dialect-specific aggregation and grouping
     if dialect == "postgresql":
         inbound_agg = func.string_agg(ProxyInbound.tag.distinct(), ",").label("inbound_tags")
-        # PostgreSQL can't GROUP BY JSON directly, cast to text
-        proxy_settings_group = cast(User.proxy_settings, Text)
     else:
         # MySQL and SQLite use group_concat
         inbound_agg = func.group_concat(ProxyInbound.tag.distinct()).label("inbound_tags")
-        proxy_settings_group = User.proxy_settings
 
     stmt = (
         select(
@@ -56,7 +53,7 @@ async def core_users(db: AsyncSession):
         .outerjoin(inbounds_groups_association, Group.id == inbounds_groups_association.c.group_id)
         .outerjoin(ProxyInbound, inbounds_groups_association.c.inbound_id == ProxyInbound.id)
         .where(User.status.in_([UserStatus.active, UserStatus.on_hold]))
-        .group_by(User.id, User.username, proxy_settings_group)
+        .group_by(User.id)
     )
 
     results = (await db.execute(stmt)).all()

app/operation/subscription.py

@@ -105,7 +105,7 @@ def create_info_response_headers(user: UsersResponseWithInbounds, sub_settings:
             "announce": encode_title(sub_settings.announce),
             "announce-url": sub_settings.announce_url,
         }
-        
+
         # Only include headers that have values
         return {k: v for k, v in headers.items() if v}
 
@@ -193,10 +193,10 @@ async def user_subscription_info(
         sub_settings: SubSettings = await subscription_settings()
         db_user = await self.get_validated_sub(db, token=token)
         user = await self.validated_user(db_user)
-        
+
         response_headers = self.create_info_response_headers(user, sub_settings)
         user_response = SubscriptionUserResponse.model_validate(db_user.__dict__)
-        
+
         return user_response, response_headers
 
     async def user_subscription_apps(self, db: AsyncSession, token: str, request_url: str) -> list[Application]:

app/routers/subscription.py

@@ -34,14 +34,12 @@ async def user_subscription(
 
 
 @router.get("/{token}/info", response_model=SubscriptionUserResponse)
-async def user_subscription_info(
-    request: Request, token: str, db: AsyncSession = Depends(get_db)
-):
+async def user_subscription_info(request: Request, token: str, db: AsyncSession = Depends(get_db)):
     """Retrieves detailed information about the user's subscription."""
     user_data, response_headers = await subscription_operator.user_subscription_info(
         db, token=token, request_url=str(request.url)
     )
-    return JSONResponse(content=user_data.model_dump(mode='json'), headers=response_headers)
+    return JSONResponse(content=user_data.model_dump(mode="json"), headers=response_headers)
 
 
 @router.get("/{token}/apps", response_model=list[Application])