circular-fix

auth/middleware.py

@@ -5,7 +5,7 @@
 import json
 import time
 from collections.abc import Awaitable, MutableMapping
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 
 from graphql import GraphQLResolveInfo
 from sqlalchemy.orm import exc
@@ -18,6 +18,7 @@ from auth.credentials import AuthCredentials
 from auth.orm import Author
 from auth.tokens.storage import TokenStorage as TokenManager
 from services.db import local_session
+from services.redis import redis as redis_adapter
 from settings import (
     ADMIN_EMAILS as ADMIN_EMAILS_LIST,
 )
@@ -41,9 +42,9 @@ class AuthenticatedUser:
         self,
         user_id: str,
         username: str = "",
-        roles: Optional[list] = None,
-        permissions: Optional[dict] = None,
-        token: Optional[str] = None,
+        roles: list | None = None,
+        permissions: dict | None = None,
+        token: str | None = None,
     ) -> None:
         self.user_id = user_id
         self.username = username
@@ -254,8 +255,6 @@ class AuthMiddleware:
 
             # Проверяем, есть ли активные сессии в Redis
             try:
-                from services.redis import redis as redis_adapter
-
                 # Получаем все активные сессии
                 session_keys = await redis_adapter.keys("session:*")
                 logger.debug(f"[middleware] Найдено активных сессий в Redis: {len(session_keys)}")
@@ -457,7 +456,7 @@ class AuthMiddleware:
             if isinstance(result, JSONResponse):
                 try:
                     body_content = result.body
-                    if isinstance(body_content, (bytes, memoryview)):
+                    if isinstance(body_content, bytes | memoryview):
                         body_text = bytes(body_content).decode("utf-8")
                         result_data = json.loads(body_text)
                     else: