refactor: Simplify definition of dependencies

Author: chrisburr

diracx-db/src/diracx/db/sql/utils/base.py

@@ -165,6 +165,12 @@ async def post_create(cls, conn: AsyncConnection) -> None:
 
     @classmethod
     def transaction(cls) -> Self:
+        """Dependency injection sentinel: overridden at startup to yield a DB inside a transaction."""
+        raise NotImplementedError("This should never be called")
+
+    @classmethod
+    def no_transaction(cls) -> Self:
+        """Dependency injection sentinel: overridden at startup to yield a DB without a transaction."""
         raise NotImplementedError("This should never be called")
 
     @property

diracx-logic/src/diracx/logic/auth/token.py

@@ -193,7 +193,7 @@ async def get_oidc_token_info_from_refresh_flow(
             # Revoke all the user tokens from the subject
             await auth_db.revoke_user_refresh_tokens(sub)
 
-            # Commit here, otherwise the revokation operation will not be taken into account
+            # Commit here, otherwise the revocation operation will not be taken into account
             # as we return an error to the user
             await auth_db.conn.commit()
 

diracx-logic/src/diracx/logic/jobs/sandboxes.py

@@ -210,7 +210,7 @@ async def clean_sandboxes(
     3. Deletes from DB
 
     Args:
-        sandbox_metadata_db: Database connection (not yet entered).
+        sandbox_metadata_db: Database connection (not in a transaction).
         settings: Sandbox store settings with S3 client.
 
     Returns:

diracx-routers/src/diracx/routers/access_policies.py

@@ -31,7 +31,8 @@
     AccessTokenPayload,
     RefreshTokenPayload,
 )
-from diracx.routers.dependencies import DevelopmentSettings
+from diracx.core.settings import DevelopmentSettings
+from diracx.routers.dependencies import auto_inject
 from diracx.routers.utils.users import AuthorizedUserInfo, verify_dirac_access_token
 
 if "annotations" in globals():
@@ -107,6 +108,7 @@ def enrich_tokens(
         return {}, {}
 
 
+@auto_inject
 def check_permissions(
     policy: Callable,
     policy_name: str,

diracx-routers/src/diracx/routers/auth/authorize_code_flow.py

@@ -16,19 +16,17 @@
 )
 
 from diracx.core.exceptions import AuthorizationError, IAMClientError, IAMServerError
+from diracx.core.settings import AuthSettings
+from diracx.db.sql import AuthDB
 from diracx.logic.auth.authorize_code_flow import (
     complete_authorization_flow as complete_authorization_flow_bl,
 )
 from diracx.logic.auth.authorize_code_flow import (
     initiate_authorization_flow as initiate_authorization_flow_bl,
 )
+from diracx.routers.dependencies import Config
 
-from ..dependencies import (
-    AuthDB,
-    AuthSettings,
-    AvailableSecurityProperties,
-    Config,
-)
+from ..dependencies import AvailableSecurityProperties
 from ..fastapi_classes import DiracxRouter
 
 logger = logging.getLogger(__name__)

diracx-routers/src/diracx/routers/auth/device_flow.py

@@ -18,20 +18,18 @@
 
 from diracx.core.exceptions import IAMClientError, IAMServerError
 from diracx.core.models.auth import InitiateDeviceFlowResponse
+from diracx.core.settings import AuthSettings
+from diracx.db.sql import AuthDB
 from diracx.logic.auth.device_flow import do_device_flow as do_device_flow_bl
 from diracx.logic.auth.device_flow import (
     finish_device_flow as finish_device_flow_bl,
 )
 from diracx.logic.auth.device_flow import (
     initiate_device_flow as initiate_device_flow_bl,
 )
+from diracx.routers.dependencies import Config
 
-from ..dependencies import (
-    AuthDB,
-    AuthSettings,
-    AvailableSecurityProperties,
-    Config,
-)
+from ..dependencies import AvailableSecurityProperties
 from ..fastapi_classes import DiracxRouter
 
 logger = logging.getLogger(__name__)

diracx-routers/src/diracx/routers/auth/management.py

@@ -16,6 +16,8 @@
 
 from diracx.core.exceptions import InvalidCredentialsError, TokenNotFoundError
 from diracx.core.properties import PROXY_MANAGEMENT, SecurityProperty
+from diracx.core.settings import AuthSettings
+from diracx.db.sql import AuthDB
 from diracx.logic.auth.management import (
     get_refresh_tokens as get_refresh_tokens_bl,
 )
@@ -26,7 +28,6 @@
     revoke_refresh_token_by_refresh_token as revoke_refresh_token_by_refresh_token_bl,
 )
 
-from ..dependencies import AuthDB, AuthSettings
 from ..fastapi_classes import DiracxRouter
 from ..utils.users import AuthorizedUserInfo, verify_dirac_access_token
 

diracx-routers/src/diracx/routers/auth/token.py

@@ -20,14 +20,17 @@
     RefreshTokenPayload,
     TokenResponse,
 )
+from diracx.core.settings import AuthSettings
+from diracx.db.sql import AuthDB
 from diracx.logic.auth.token import create_token
 from diracx.logic.auth.token import get_oidc_token as get_oidc_token_bl
 from diracx.logic.auth.token import (
     perform_legacy_exchange as perform_legacy_exchange_bl,
 )
 from diracx.routers.access_policies import BaseAccessPolicy
+from diracx.routers.dependencies import Config
 
-from ..dependencies import AuthDB, AuthSettings, AvailableSecurityProperties, Config
+from ..dependencies import AvailableSecurityProperties
 from ..fastapi_classes import DiracxRouter
 
 router = DiracxRouter(require_auth=False)

diracx-routers/src/diracx/routers/auth/well_known.py

@@ -3,6 +3,7 @@
 from fastapi import Request
 
 from diracx.core.models.auth import Metadata, OpenIDConfiguration
+from diracx.core.settings import AuthSettings
 from diracx.logic.auth.well_known import (
     get_installation_metadata as get_installation_metadata_bl,
 )
@@ -12,8 +13,8 @@
 from diracx.logic.auth.well_known import (
     get_openid_configuration as get_openid_configuration_bl,
 )
+from diracx.routers.dependencies import Config
 
-from ..dependencies import AuthSettings, Config
 from ..fastapi_classes import DiracxRouter
 
 router = DiracxRouter(require_auth=False, path_root="")

diracx-routers/src/diracx/routers/configuration.py

@@ -11,8 +11,9 @@
     status,
 )
 
+from diracx.routers.dependencies import Config
+
 from .access_policies import open_access
-from .dependencies import Config
 from .fastapi_classes import DiracxRouter
 
 logger = logging.getLogger(__name__)