csrd-utils 0.3.89__tar.gz → 0.3.90__tar.gz

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.89
+Version: 0.3.90
 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.89 → csrd_utils-0.3.90}/pyproject.toml

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

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/compose/scaffolder.py

@@ -22,6 +22,7 @@ from cookiecutter.main import cookiecutter
 
 from ..models import ComposeSpec, ServiceAugment, ServiceNode
 from .augments import AUGMENT_REGISTRY
+from .infra import detect_configured_db
 
 logger = logging.getLogger(__name__)
 
@@ -139,6 +140,46 @@ def _augment_template_vars(
         "port": str(service.port),
     }
 
+    # Database adapter variables — shared by db-config and jwt-auth-provider
+    if augment.name in ("db-config", "jwt-auth-provider"):
+        db = detect_configured_db({n.type for n in spec.infra})
+        if db == "postgres":
+            variables["db_adapter_import"] = "from csrd.repository import PGAdapter"
+            variables["db_adapter_class"] = "PGAdapter"
+            variables["db_adapter_constructor"] = (
+                "PGAdapter(\n"
+                "        host=settings.db_host,\n"
+                "        port=int(settings.db_port),\n"
+                "        user=settings.db_user,\n"
+                "        password=settings.db_password,\n"
+                "        database=settings.db_name,\n"
+                "    )"
+            )
+        elif db == "mariadb":
+            variables["db_adapter_import"] = "from csrd.repository import MariaAdapter"
+            variables["db_adapter_class"] = "MariaAdapter"
+            variables["db_adapter_constructor"] = (
+                "MariaAdapter(\n"
+                "        host=settings.db_host,\n"
+                "        port=int(settings.db_port),\n"
+                "        user=settings.db_user,\n"
+                "        password=settings.db_password,\n"
+                "        database=settings.db_name,\n"
+                "    )"
+            )
+        else:
+            variables["db_adapter_import"] = "from csrd.repository import SQLiteAdapter"
+            variables["db_adapter_class"] = "SQLiteAdapter"
+            variables["db_adapter_constructor"] = "SQLiteAdapter(db_path=settings.db_path)"
+
+        # SQL dialect variables for migrations
+        if db == "postgres":
+            variables["sql_auto_id"] = "SERIAL PRIMARY KEY"
+        elif db == "mariadb":
+            variables["sql_auto_id"] = "INTEGER PRIMARY KEY AUTO_INCREMENT"
+        else:
+            variables["sql_auto_id"] = "INTEGER PRIMARY KEY AUTOINCREMENT"
+
     # Dynamic: jwt-auth-consumer — resolve auth service
     if augment.name == "jwt-auth-consumer":
         auth_svc = next(

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/compose/service_renderers.py

@@ -5,10 +5,22 @@ They are deterministic outputs of the spec; user customization goes in
 separate scaffolded files (views, repositories, services, dependencies).
 """
 
+import re
+
 from ..models import ComposeSpec, ServiceNode
 from .augments import AUGMENT_REGISTRY
 from .infra import INFRA_REGISTRY, detect_configured_db
 
+# Pattern to extract default from docker-compose interpolation: ${VAR:-default}
+_COMPOSE_VAR_RE = re.compile(r"^\$\{[A-Z_]+:-(.+)\}$")
+
+
+def _plain_default(value: str) -> str:
+    """Strip docker-compose ``${VAR:-default}`` syntax to just ``default``."""
+    m = _COMPOSE_VAR_RE.match(value)
+    return m.group(1) if m else value
+
+
 # ---------------------------------------------------------------------------
 # Base packages always included in every service
 # ---------------------------------------------------------------------------
@@ -51,6 +63,19 @@ def render_requirements(svc: ServiceNode, spec: ComposeSpec) -> str:
         if name not in seen:
             seen[name] = pkg
 
+    # Add DB driver based on configured infra (needed by adapter at runtime)
+    _svc_augment_names = {a.name for a in svc.augments}
+    _ws_augment_names = {a.name for a in spec.workspace.augments}
+    _has_db_augment = bool(
+        {"db-config", "jwt-auth-provider"} & (_svc_augment_names | _ws_augment_names)
+    )
+    if _has_db_augment:
+        db = detect_configured_db({n.type for n in spec.infra})
+        if db == "postgres" and "psycopg" not in seen:
+            seen["psycopg"] = "psycopg[binary]"
+        elif db == "mariadb" and "pymysql" not in seen:
+            seen["pymysql"] = "pymysql"
+
     return "\n".join(sorted(seen.values())) + "\n"
 
 
@@ -89,7 +114,17 @@ def _augment_settings_fields(
             ws_fields["jwt_key_size"] = "2048"
             ws_fields["jwt_key_rotation_interval"] = "86400"
             ws_fields["jwt_key_retention_period"] = "90000"
-            ws_fields["db_path"] = f'"/app/data/{svc.name}.db"'
+
+            # Database settings depend on configured infra
+            db = detect_configured_db({n.type for n in spec.infra})
+            if db == "sqlite" or db is None:
+                ws_fields["db_path"] = f'"/app/data/{svc.name}.db"'
+            elif db is not None:
+                db_desc = INFRA_REGISTRY.get(db)
+                if db_desc is not None:
+                    for env_key, env_val in db_desc.service_env.items():
+                        field_name = env_key.lower()
+                        ws_fields[field_name] = f'"{_plain_default(env_val)}"'
 
         for field_name, default in ws_fields.items():
             fields[field_name] = default
@@ -144,7 +179,7 @@ def _augment_settings_fields(
                     # Map infra env vars to settings fields
                     for env_key, env_val in db_desc.service_env.items():
                         field_name = env_key.lower()
-                        augment_fields[field_name] = f'"{env_val}"'
+                        augment_fields[field_name] = f'"{_plain_default(env_val)}"'
 
         # Collision detection
         for field_name in augment_fields:
@@ -184,7 +219,14 @@ def render_settings(svc: ServiceNode, spec: ComposeSpec) -> str:
         lines.append("")
         lines.append("    # Augment-contributed fields")
         for field_name, default in sorted(augment_fields.items()):
-            lines.append(f"    {field_name}: str = {default}")
+            # Infer type from default: quoted → str, bare number → int
+            if default.startswith('"') or default.startswith("'"):
+                field_type = "str"
+            elif default.isdigit():
+                field_type = "int"
+            else:
+                field_type = "str"
+            lines.append(f"    {field_name}: {field_type} = {default}")
 
     lines.extend(
         [
@@ -248,18 +290,29 @@ def render_init(svc: ServiceNode, spec: ComposeSpec) -> str:
         "",
         "",
         "def build_app() -> FastAPI:",
-        "    app = compose_versioned_apps(",
-        "        version_mapping={UNVERSIONED: unversioned_app},",
-        "        config=VersionedAppComposeConfig(",
-        f'            title="{svc.name}",',
-        "            api=VersionedApiConfig(",
-        '                prefix="/",',
-        "                include_actuator_endpoints=settings.include_actuator_endpoints,",
-        "            ),",
-        "        ),",
-        "    )",
     ]
 
+    if is_auth_provider:
+        body.append("    unversioned_app.include_router(auth_router)")
+        body.append("    unversioned_app.include_router(users_router)")
+        body.append("    unversioned_app.include_router(jwks_router)")
+        body.append("")
+
+    body.extend(
+        [
+            "    app = compose_versioned_apps(",
+            "        version_mapping={UNVERSIONED: unversioned_app},",
+            "        config=VersionedAppComposeConfig(",
+            f'            title="{svc.name}",',
+            "            api=VersionedApiConfig(",
+            '                prefix="/",',
+            "                include_actuator_endpoints=settings.include_actuator_endpoints,",
+            "            ),",
+            "        ),",
+            "    )",
+        ]
+    )
+
     if "context-logging" in augment_names:
         body.append("")
         body.append("    app.add_middleware(RequestContextMiddleware)")
@@ -268,12 +321,6 @@ def render_init(svc: ServiceNode, spec: ComposeSpec) -> str:
         body.append("")
         body.append("    app.add_exception_handler(Exception, service_exception_handler)")
 
-    if is_auth_provider:
-        body.append("")
-        body.append("    app.include_router(auth_router)")
-        body.append("    app.include_router(users_router)")
-        body.append("    app.include_router(jwks_router)")
-
     body.extend(
         [
             "",

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/generate/handlers.py

@@ -17,6 +17,7 @@ from ..compose import (
 )
 from ..compose import add_infra as compose_add_infra
 from ..compose import add_service as compose_add_service
+from ..compose import add_workspace_augment as compose_add_workspace_augment
 from ..compose import apply as compose_apply
 from ..compose import remove_infra as compose_remove_infra
 from .helpers import (
@@ -82,6 +83,7 @@ def _finalize_workspace(
     infra_choices: list[str],
     services: list[ServiceNode],
     git_init: bool,
+    workspace_augments: list[str] | None = None,
 ) -> int:
     """Create workspace, add infra/services, render, and print result.
 
@@ -104,6 +106,12 @@ def _finalize_workspace(
         except ValueError as exc:
             print(f"WARNING: {exc}")
 
+    for aug_name in workspace_augments or []:
+        try:
+            compose_add_workspace_augment(output_dir, aug_name)
+        except ValueError as exc:
+            print(f"WARNING: {exc}")
+
     render_workspace(output_dir)
     print(f"Generated workspace at: {output_dir}")
     return 0
@@ -513,6 +521,7 @@ def create_workspace_from_preset(default_name: str = "my-workspace") -> int:
         infra_choices=cast(list[str], state.get("infra_choices", [])),
         services=[*preset.services, *extra],
         git_init=cast(bool, state.get("git_init", False)),
+        workspace_augments=preset.workspace_augments,
     )
 
 

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/templates/augments/db-config/dependencies/db.py

@@ -4,18 +4,18 @@ This file is scaffolded once and never overwritten. Customize the
 adapter type, DSN construction, or add connection pooling here.
 """
 
-from csrd.repository import SQLiteAdapter
+$db_adapter_import
 
 from ..settings import settings
 
 
-def create_adapter() -> SQLiteAdapter:
+def create_adapter() -> $db_adapter_class:
     """Create the database adapter for this service.
 
     Override this to switch adapter types (PGAdapter, MariaAdapter)
     or customize connection parameters.
     """
-    return SQLiteAdapter(db_path=settings.db_path)
+    return $db_adapter_constructor
 
 
 __all__ = ("create_adapter",)

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/templates/augments/jwt-auth-provider/dependencies/db.py

@@ -3,18 +3,18 @@
 This file is scaffolded once and never overwritten.
 """
 
-from csrd.repository import SQLiteAdapter
+$db_adapter_import
 
 from ..settings import settings
 
-_adapter: SQLiteAdapter | None = None
+_adapter: $db_adapter_class | None = None
 
 
-async def get_adapter() -> SQLiteAdapter:
+async def get_adapter() -> $db_adapter_class:
     """Get or create the database adapter (singleton per process)."""
     global _adapter
     if _adapter is None:
-        _adapter = SQLiteAdapter(db_path=settings.db_path)
+        _adapter = $db_adapter_constructor
         await _adapter.connect()
 
         # Apply migrations on first connect

{csrd_utils-0.3.89 → csrd_utils-0.3.90}/src/csrd_utils/v2/templates/augments/jwt-auth-provider/migrations.py

@@ -15,7 +15,7 @@ migrations: list[Migration] = [
 CREATE TABLE IF NOT EXISTS users (
     id TEXT PRIMARY KEY,
     username TEXT UNIQUE NOT NULL,
-    created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
 )""",
         down="DROP TABLE IF EXISTS users",
     ),
@@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS user_credentials (
         description="User roles table",
         up="""\
 CREATE TABLE IF NOT EXISTS user_roles (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    id $sql_auto_id,
     user_id TEXT NOT NULL REFERENCES users(id),
     role TEXT NOT NULL,
     UNIQUE(user_id, role)