csrd-utils 0.3.100__tar.gz → 0.3.102__tar.gz

{csrd_utils-0.3.100 → csrd_utils-0.3.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.100
+Version: 0.3.102
 Summary: CLI utilities for csrd service generation and feature augmentation
 Project-URL: Repository, https://github.com/csrd-api/fastapi-common
 Project-URL: Documentation, https://github.com/csrd-api/fastapi-common/tree/main/packages/utils

{csrd_utils-0.3.100 → csrd_utils-0.3.102}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.3.100"
+version = "0.3.102"
 description = "CLI utilities for csrd service generation and feature augmentation"
 license = { text = "MIT" }
 requires-python = ">=3.12"

{csrd_utils-0.3.100 → csrd_utils-0.3.102}/src/csrd_utils/v2/compose/service_renderers.py

@@ -270,6 +270,11 @@ def render_init(svc: ServiceNode, spec: ComposeSpec) -> str:
         if desc is not None:
             descriptors.append((augment.name, desc))
 
+    # Check whether this service has db-config (needs migration startup)
+    has_db = any(name == "db-config" for name, _ in descriptors) or any(
+        name == "jwt-auth-provider" for name, _ in descriptors
+    )
+
     # Collect imports
     imports = [
         "from fastapi import FastAPI",
@@ -285,6 +290,13 @@ def render_init(svc: ServiceNode, spec: ComposeSpec) -> str:
         "from .views import app as unversioned_app",
     ]
 
+    # Migration startup imports
+    if has_db:
+        imports.append("")
+        imports.append("from csrd.migration import MigrationRunner")
+        imports.append("from .dependencies.db import create_adapter")
+        imports.append("from .migrations import migrations")
+
     # Router imports (from descriptors)
     router_aliases: list[str] = []
     for _name, desc in descriptors:
@@ -358,6 +370,23 @@ def render_init(svc: ServiceNode, spec: ComposeSpec) -> str:
         body.append("")
         body.append(f"    app.add_exception_handler({exc_cls}, {handler})")
 
+    # Wire migration startup
+    if has_db:
+        body.append("")
+        body.append('    @app.on_event("startup")')
+        body.append("    async def _run_migrations() -> None:")
+        body.append("        adapter = create_adapter(settings)")
+        body.append("        await adapter.connect()")
+        body.append("        runner = MigrationRunner()")
+        body.append("        await runner.apply_all(adapter, migrations)")
+        body.append("        app.state.db_adapter = adapter")
+        body.append("")
+        body.append('    @app.on_event("shutdown")')
+        body.append("    async def _close_db() -> None:")
+        body.append('        adapter = getattr(app.state, "db_adapter", None)')
+        body.append("        if adapter is not None:")
+        body.append("            await adapter.close()")
+
     body.extend(
         [
             "",

{csrd_utils-0.3.100 → csrd_utils-0.3.102}/src/csrd_utils/v2/templates/augments/db-config/dependencies/db.py.template

@@ -13,15 +13,16 @@ $db_adapter_import
 from . import Settings
 
 
-def _create_adapter(settings: Settings) -> $db_adapter_class:
+def create_adapter(settings: Settings) -> $db_adapter_class:
     """Create the database adapter for this service.
 
-    Override this to switch adapter types (PGAdapter, MariaAdapter)
-    or customize connection parameters.
+    Used by the startup lifespan (connect + migrate) and by the
+    per-request ``Adapter`` dependency.  Override this to switch
+    adapter types or customize connection parameters.
     """
     return $db_adapter_constructor
 
 
-Adapter = Annotated[$db_adapter_class, Depends(_create_adapter)]
+Adapter = Annotated[$db_adapter_class, Depends(create_adapter)]
 
-__all__ = ("Adapter",)
+__all__ = ("Adapter", "create_adapter")

{csrd_utils-0.3.100 → csrd_utils-0.3.102}/src/csrd_utils/v2/templates/augments/jwt-auth-consumer/dependencies/auth.py.template

@@ -7,7 +7,13 @@ This file is scaffolded once and never overwritten. You can customize
 the claims mapper, algorithms, or add role guards here.
 """
 
+from typing import Annotated
+
+from fastapi import Depends, Security
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+
 from csrd.auth import JWKSKeyProvider, create_jwt_bearer, require_authorities
+from csrd.models.claims import UserClaims
 
 from ..settings import settings
 
@@ -18,12 +24,24 @@ from ..settings import settings
 # dependencies (Security / Depends) must be stable objects. The
 # settings singleton is appropriate here — auth config is fixed
 # for the lifetime of the process.
-auth_dep = create_jwt_bearer(
+_jwt_bearer = create_jwt_bearer(
     key=JWKSKeyProvider(url=settings.auth_jwks_url),
     algorithms=[settings.jwt_algorithm],
     issuer=settings.jwt_issuer,
     audience=settings.jwt_audience,
 )
 
+# HTTPBearer scheme makes Swagger UI show the "Authorize" button.
+_http_bearer_scheme = HTTPBearer()
+
+
+async def auth_dep(
+    credentials: Annotated[HTTPAuthorizationCredentials, Security(_http_bearer_scheme)],
+    claims: Annotated[UserClaims, Depends(_jwt_bearer)],
+) -> UserClaims:
+    """Composite auth dependency: validates the bearer scheme for OpenAPI + verifies the JWT."""
+    return claims
+
+
 # Re-export for convenience
 __all__ = ("auth_dep", "require_authorities")