some code quality fixes plus CI

Author: igorbenav

.github/workflows/linting.yml

@@ -21,7 +21,7 @@ jobs:
         # (backend's dev extra holds ruff itself).
         run: uv sync --all-packages --all-extras
 
-      - name: Ruff check (backend + cli)
+      - name: Ruff check (backend + cli + tests)
         # --no-sync prevents uv run's implicit re-sync from dropping member
         # extras (it defaults to no extras and would remove ruff).
-        run: uv run --no-sync ruff check backend/src cli/src
+        run: uv run --no-sync ruff check backend/src cli/src backend/tests

backend/pyproject.toml

@@ -129,7 +129,7 @@ line-length = 128
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "UP"]
-extend-select = ["UP006", "UP007", "UP035", "UP039"]
+extend-select = ["UP006", "UP007", "UP035", "UP039", "PLC0415"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["src"]

backend/src/infrastructure/auth/session/backends/memcached.py

@@ -14,7 +14,7 @@
 
 from ....config.settings import get_settings
 from ....logging import get_logger
-from ..storage import AbstractSessionStorage
+from ..base import AbstractSessionStorage
 
 T = TypeVar("T", bound=BaseModel)
 settings = get_settings()

backend/src/infrastructure/auth/session/backends/memory.py

@@ -7,7 +7,7 @@
 from pydantic import BaseModel
 
 from ....logging import get_logger
-from ..storage import AbstractSessionStorage
+from ..base import AbstractSessionStorage
 
 T = TypeVar("T", bound=BaseModel)
 logger = get_logger()

backend/src/infrastructure/auth/session/backends/redis.py

@@ -14,7 +14,7 @@
 
 from ....config.settings import get_settings
 from ....logging import get_logger
-from ..storage import AbstractSessionStorage
+from ..base import AbstractSessionStorage
 
 T = TypeVar("T", bound=BaseModel)
 settings = get_settings()

backend/src/infrastructure/auth/session/base.py

@@ -0,0 +1,137 @@
+"""Abstract base for session storage backends.
+
+Lives in its own module so that the concrete backend implementations
+under ``backends/`` can subclass it without participating in the
+``storage.py`` factory's import cycle. The factory (``storage.py``)
+imports both this base and the concrete backends; concrete backends
+only import this base.
+"""
+
+from abc import ABC, abstractmethod
+from typing import Generic, TypeVar
+from uuid import uuid4
+
+from pydantic import BaseModel
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class AbstractSessionStorage(Generic[T], ABC):
+    """Abstract base class for session storage implementations."""
+
+    def __init__(
+        self,
+        prefix: str = "session:",
+        expiration: int = 1800,
+    ):
+        """Initialize the session storage.
+
+        Args:
+            prefix: Prefix for all session keys
+            expiration: Default session expiration in seconds
+        """
+        self.prefix = prefix
+        self.expiration = expiration
+
+    def generate_session_id(self) -> str:
+        """Generate a unique session ID.
+
+        Returns:
+            A unique session ID string
+        """
+        return str(uuid4())
+
+    def get_key(self, session_id: str) -> str:
+        """Generate the full key for a session ID.
+
+        Args:
+            session_id: The session ID
+
+        Returns:
+            The full storage key
+        """
+        return f"{self.prefix}{session_id}"
+
+    @abstractmethod
+    async def create(self, data: T, session_id: str | None = None, expiration: int | None = None) -> str:
+        """Create a new session.
+
+        Args:
+            data: Session data (must be a Pydantic model)
+            session_id: Optional session ID. If not provided, one will be generated
+            expiration: Optional custom expiration in seconds
+
+        Returns:
+            The session ID
+        """
+        pass
+
+    @abstractmethod
+    async def get(self, session_id: str, model_class: type[T]) -> T | None:
+        """Get session data.
+
+        Args:
+            session_id: The session ID
+            model_class: The Pydantic model class to decode the data into
+
+        Returns:
+            The session data or None if session doesn't exist
+        """
+        pass
+
+    @abstractmethod
+    async def update(self, session_id: str, data: T, reset_expiration: bool = True, expiration: int | None = None) -> bool:
+        """Update session data.
+
+        Args:
+            session_id: The session ID
+            data: New session data
+            reset_expiration: Whether to reset the expiration
+            expiration: Optional custom expiration in seconds
+
+        Returns:
+            True if the session was updated, False if it didn't exist
+        """
+        pass
+
+    @abstractmethod
+    async def delete(self, session_id: str) -> bool:
+        """Delete a session.
+
+        Args:
+            session_id: The session ID
+
+        Returns:
+            True if the session was deleted, False if it didn't exist
+        """
+        pass
+
+    @abstractmethod
+    async def extend(self, session_id: str, expiration: int | None = None) -> bool:
+        """Extend the expiration of a session.
+
+        Args:
+            session_id: The session ID
+            expiration: Optional custom expiration in seconds
+
+        Returns:
+            True if the session was extended, False if it didn't exist
+        """
+        pass
+
+    @abstractmethod
+    async def exists(self, session_id: str) -> bool:
+        """Check if a session exists.
+
+        Args:
+            session_id: The session ID
+
+        Returns:
+            True if the session exists, False otherwise
+        """
+        pass
+
+    @abstractmethod
+    async def close(self) -> None:
+        """Close the storage connection."""
+        pass

backend/src/infrastructure/auth/session/storage.py

@@ -1,135 +1,26 @@
-from abc import ABC, abstractmethod
+"""Session storage factory + backwards-compatible re-export of the abstract base.
+
+The abstract base (``AbstractSessionStorage``) lives in ``base.py`` so
+that the concrete ``backends/`` implementations don't form a cycle with
+this module. Existing callers that import ``AbstractSessionStorage``
+from ``.storage`` keep working via the re-export below.
+"""
+
 from typing import Generic, TypeVar, cast
-from uuid import uuid4
 
 from pydantic import BaseModel
 
 from ...config import SessionBackend
 from ...logging import get_logger
+from .backends.memcached import MemcachedSessionStorage
+from .backends.memory import MemorySessionStorage
+from .backends.redis import RedisSessionStorage
+from .base import AbstractSessionStorage
 
 T = TypeVar("T", bound=BaseModel)
-logger = get_logger()
-
-
-class AbstractSessionStorage(Generic[T], ABC):
-    """Abstract base class for session storage implementations."""
-
-    def __init__(
-        self,
-        prefix: str = "session:",
-        expiration: int = 1800,
-    ):
-        """Initialize the session storage.
-
-        Args:
-            prefix: Prefix for all session keys
-            expiration: Default session expiration in seconds
-        """
-        self.prefix = prefix
-        self.expiration = expiration
-
-    def generate_session_id(self) -> str:
-        """Generate a unique session ID.
-
-        Returns:
-            A unique session ID string
-        """
-        return str(uuid4())
-
-    def get_key(self, session_id: str) -> str:
-        """Generate the full key for a session ID.
-
-        Args:
-            session_id: The session ID
+logger = get_logger(__name__)
 
-        Returns:
-            The full storage key
-        """
-        return f"{self.prefix}{session_id}"
-
-    @abstractmethod
-    async def create(self, data: T, session_id: str | None = None, expiration: int | None = None) -> str:
-        """Create a new session.
-
-        Args:
-            data: Session data (must be a Pydantic model)
-            session_id: Optional session ID. If not provided, one will be generated
-            expiration: Optional custom expiration in seconds
-
-        Returns:
-            The session ID
-        """
-        pass
-
-    @abstractmethod
-    async def get(self, session_id: str, model_class: type[T]) -> T | None:
-        """Get session data.
-
-        Args:
-            session_id: The session ID
-            model_class: The Pydantic model class to decode the data into
-
-        Returns:
-            The session data or None if session doesn't exist
-        """
-        pass
-
-    @abstractmethod
-    async def update(self, session_id: str, data: T, reset_expiration: bool = True, expiration: int | None = None) -> bool:
-        """Update session data.
-
-        Args:
-            session_id: The session ID
-            data: New session data
-            reset_expiration: Whether to reset the expiration
-            expiration: Optional custom expiration in seconds
-
-        Returns:
-            True if the session was updated, False if it didn't exist
-        """
-        pass
-
-    @abstractmethod
-    async def delete(self, session_id: str) -> bool:
-        """Delete a session.
-
-        Args:
-            session_id: The session ID
-
-        Returns:
-            True if the session was deleted, False if it didn't exist
-        """
-        pass
-
-    @abstractmethod
-    async def extend(self, session_id: str, expiration: int | None = None) -> bool:
-        """Extend the expiration of a session.
-
-        Args:
-            session_id: The session ID
-            expiration: Optional custom expiration in seconds
-
-        Returns:
-            True if the session was extended, False if it didn't exist
-        """
-        pass
-
-    @abstractmethod
-    async def exists(self, session_id: str) -> bool:
-        """Check if a session exists.
-
-        Args:
-            session_id: The session ID
-
-        Returns:
-            True if the session exists, False otherwise
-        """
-        pass
-
-    @abstractmethod
-    async def close(self) -> None:
-        """Close the storage connection."""
-        pass
+__all__ = ["AbstractSessionStorage", "SessionStorage", "get_session_storage"]
 
 
 class SessionStorage(AbstractSessionStorage[T], Generic[T]):
@@ -159,16 +50,10 @@ def get_session_storage(backend: str, model_type: type[BaseModel], **kwargs) ->
         An initialized storage backend
     """
     if backend == SessionBackend.REDIS.value:
-        from .backends.redis import RedisSessionStorage
-
         return RedisSessionStorage(**kwargs)
     elif backend == SessionBackend.MEMCACHED.value:
-        from .backends.memcached import MemcachedSessionStorage
-
         return MemcachedSessionStorage(**kwargs)
     elif backend == SessionBackend.MEMORY.value:
-        from .backends.memory import MemorySessionStorage
-
         return MemorySessionStorage(**kwargs)
     else:
         raise ValueError(f"Unknown backend: {backend}")

backend/src/infrastructure/logging/config.py

@@ -12,8 +12,11 @@
 """
 
 import contextvars
+import inspect
 import logging
 import logging.config
+import threading
+import uuid
 
 from ..config import LogFormat
 from ..config.settings import EnvironmentOption, get_settings
@@ -221,8 +224,6 @@ def add_correlation_id_filter() -> None:
     all log records automatically. Adds the filter to the root logger
     so all child loggers inherit the correlation ID functionality.
     """
-    import logging
-
     root_logger = logging.getLogger()
     correlation_filter = CorrelationIdFilter()
     root_logger.addFilter(correlation_filter)
@@ -268,8 +269,6 @@ def _get_correlation_id(self) -> str | None:
         Returns:
             Correlation ID string or None if not found
         """
-        import threading
-
         try:
             correlation_id = correlation_id_var.get()
             if correlation_id:
@@ -285,8 +284,6 @@ def _get_correlation_id(self) -> str | None:
             pass
 
         try:
-            import inspect
-
             frame = inspect.currentframe()
             while frame:
                 if "request" in frame.f_locals:
@@ -334,8 +331,6 @@ def generate_correlation_id() -> str:
     Returns:
         New UUID-based correlation ID
     """
-    import uuid
-
     return str(uuid.uuid4())