csrd-utils 0.3.91__tar.gz → 0.3.93__tar.gz

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/PKG-INFO

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

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

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/AGENTS.md

@@ -123,12 +123,12 @@ User edits to scaffolded files are never overwritten on re-render.
   .gitignore                     ← rendered from spec
   .csrd-workspace                ← marker file
   Dockerfile.<service-name>      ← one per service, at root
-  src/<service-name>/            ← service source (kebab-case dir)
+  src/<service_snake>/           ← service source (snake_case dir)
   tests/unit/<service_snake>/    ← unit tests (snake_case dir)
   tests/acceptance/<service_snake>/  ← acceptance stubs (snake_case dir)
 ```
 
-- Service source dirs use **kebab-case** (matching `service.name`).
+- Service source dirs use **snake_case** (valid Python package names).
 - Test dirs use **snake_case** (valid Python package names).
 - Dockerfiles use kebab-case service name for the suffix, snake_case for the Python module reference in CMD.
 
@@ -345,5 +345,5 @@ When asked to "audit the menus or compose system", verify each of the following:
 20. `operations.py` functions load → mutate → save spec — no rendering.
 21. Workspace finalization uses `_finalize_workspace` — no duplicated create/add/render sequences in handlers.
 22. `detect_configured_db` is defined once in `infra.py` — not duplicated.
-23. Test dirs use snake_case, source dirs use kebab-case, Dockerfiles use kebab-case suffix.
+23. Test dirs use snake_case, source dirs use snake_case, Dockerfiles use kebab-case suffix.
 24. No shim modules or alias re-export files exist (pre-1.0 refactor policy).

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/compose/renderer.py

@@ -258,7 +258,7 @@ def _render_env_example(spec: ComposeSpec) -> str:
 
         lines.append("# JWT Authentication")
         lines.append("JWT_ISSUER=csrd-auth")
-        lines.append("JWT_AUDIENCE=csrd-services")
+        lines.append(f"JWT_AUDIENCE={spec.workspace.name}")
         lines.append("JWT_TTL_SECONDS=3600")
 
         if signing == "shared-secret":
@@ -310,7 +310,7 @@ def _render_gitignore() -> str:
 def _render_pyproject(spec: ComposeSpec) -> str:
     """Build a workspace-level ``pyproject.toml`` with pytest config."""
 
-    service_src_paths = [f"src/{svc.name}" for svc in spec.services]
+    service_src_paths = [f"src/{svc.name.replace('-', '_')}" for svc in spec.services]
 
     lines = [
         "[project]",
@@ -384,7 +384,7 @@ def render_workspace(output_dir: Path, *, git_init: bool = False) -> Path:
     # These are deterministic outputs of the spec — like docker-compose.yml.
     # User customization goes in scaffolded files (views, repositories, etc).
     for svc in spec.services:
-        svc_dir = output_dir / "src" / svc.name
+        svc_dir = output_dir / "src" / svc.name.replace("-", "_")
         if not svc_dir.exists():
             continue
         svc_dir.mkdir(parents=True, exist_ok=True)

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/compose/scaffolder.py

@@ -3,7 +3,7 @@
 Workspace layout contract::
 
     <ws-root>/
-      src/<service-name>/              ← service source (views, settings, __init__)
+      src/<service_name_snake>/        ← service source (views, settings, __init__)
       tests/unit/<service_name_snake>/ ← unit tests (snake_case)
       tests/acceptance/<service_name_snake>/  ← acceptance test stub
       Dockerfile.<service-name>        ← per-service Dockerfile
@@ -33,15 +33,14 @@ _AUGMENT_TEMPLATE_DIR = Path(__file__).resolve().parent.parent / "templates" / "
 def scaffold_service(service: ServiceNode, workspace_root: Path) -> None:
     """Scaffold a single service into the workspace layout.
 
-    Skips silently if ``src/<service.name>/`` already exists (idempotent).
+    Skips silently if ``src/<service_name_snake>/`` already exists (idempotent).
     """
 
-    src_dest = workspace_root / "src" / service.name
+    service_name_snake = service.name.replace("-", "_")
+    src_dest = workspace_root / "src" / service_name_snake
     if src_dest.exists():
         return
 
-    service_name_snake = service.name.replace("-", "_")
-
     with tempfile.TemporaryDirectory() as tmp:
         tmp_path = Path(tmp)
 
@@ -235,7 +234,7 @@ def scaffold_augment(
         )
         return
 
-    svc_dest = workspace_root / "src" / service.name
+    svc_dest = workspace_root / "src" / service.name.replace("-", "_")
     if not svc_dest.exists():
         return
 

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/compose/service_renderers.py

@@ -109,7 +109,7 @@ def _augment_settings_fields(
         if ws_aug.name == "jwt-auth-provider":
             ws_fields["jwt_algorithm"] = '"RS256"'
             ws_fields["jwt_issuer"] = '"csrd-auth"'
-            ws_fields["jwt_audience"] = '"csrd-services"'
+            ws_fields["jwt_audience"] = f'"{spec.workspace.name}"'
             ws_fields["jwt_ttl_seconds"] = "3600"
             ws_fields["jwt_key_size"] = "2048"
             ws_fields["jwt_key_rotation_interval"] = "86400"
@@ -152,7 +152,7 @@ def _augment_settings_fields(
                 )
             augment_fields["jwt_algorithm"] = '"RS256"'
             augment_fields["jwt_issuer"] = '"csrd-auth"'
-            augment_fields["jwt_audience"] = '"csrd-services"'
+            augment_fields["jwt_audience"] = f'"{spec.workspace.name}"'
 
         # Dynamic: delegate-config
         if augment.name == "delegate-config":

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/templates/augments/jwt-auth-provider/views/auth_view.py

@@ -17,20 +17,52 @@ from ..settings import settings
 router = APIRouter(tags=["auth"])
 
 
+# ---------------------------------------------------------------------------
+# Request / response models
+# ---------------------------------------------------------------------------
+
+
 class TokenRequest(BaseModel):
     username: str
     password: str
 
 
 class TokenResponse(BaseModel):
+    """JWT token issuance response."""
+
     access_token: str
     token_type: str = "bearer"
+    expires_in: int
 
 
 class VerifyRequest(BaseModel):
     token: str
 
 
+class VerifyClaims(BaseModel):
+    """JWT claim fields returned by the verify endpoint."""
+
+    sub: str
+    user_name: str
+    authorities: list[str]
+    iat: int
+    exp: int
+    iss: str
+    aud: str
+
+
+class VerifyResponse(BaseModel):
+    """Token verification response."""
+
+    active: bool
+    claims: VerifyClaims
+
+
+# ---------------------------------------------------------------------------
+# Endpoints
+# ---------------------------------------------------------------------------
+
+
 @router.post("/api/token", response_model=TokenResponse)
 async def issue_token(body: TokenRequest) -> TokenResponse:
     """Validate credentials and issue a JWT access token."""
@@ -75,11 +107,11 @@ async def issue_token(body: TokenRequest) -> TokenResponse:
         headers={"kid": kid},
     )
 
-    return TokenResponse(access_token=token)
+    return TokenResponse(access_token=token, expires_in=settings.jwt_ttl_seconds)
 
 
-@router.post("/api/verify")
-async def verify_token(body: VerifyRequest) -> dict:
+@router.post("/api/verify", response_model=VerifyResponse)
+async def verify_token(body: VerifyRequest) -> VerifyResponse:
     """Verify a JWT and return its claims."""
     adapter = await get_adapter()
 
@@ -106,16 +138,16 @@ async def verify_token(body: VerifyRequest) -> dict:
 
         public_key = RSAAlgorithm.from_jwk(jwk_data)
 
-        payload = pyjwt.decode(
+        claims = pyjwt.decode(
             body.token,
             public_key,
             algorithms=[settings.jwt_algorithm],
             issuer=settings.jwt_issuer,
             audience=settings.jwt_audience,
         )
-        return {"active": True, "claims": payload}
+        return VerifyResponse(active=True, claims=VerifyClaims(**claims))
 
     except pyjwt.ExpiredSignatureError:
-        raise HTTPException(status_code=401, detail="Token has expired")
+        raise HTTPException(status_code=401, detail="Token has expired") from None
     except pyjwt.InvalidTokenError as exc:
-        raise HTTPException(status_code=401, detail=f"Invalid token: {exc}")
+        raise HTTPException(status_code=401, detail=f"Invalid token: {exc}") from None

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/templates/augments/jwt-auth-provider/views/jwks_view.py

@@ -4,15 +4,24 @@ Consumers use ``JWKSKeyProvider`` to auto-discover keys from this endpoint.
 This file is scaffolded once and never overwritten.
 """
 
+from typing import Any
+
 from fastapi import APIRouter
+from pydantic import BaseModel
 
 from ..dependencies.db import get_adapter
 
 router = APIRouter(tags=["jwks"])
 
 
-@router.get("/.well-known/jwks.json")
-async def jwks() -> dict:
+class JWKSResponse(BaseModel):
+    """JSON Web Key Set response (RFC 7517)."""
+
+    keys: list[dict[str, Any]]
+
+
+@router.get("/.well-known/jwks.json", response_model=JWKSResponse)
+async def jwks() -> JWKSResponse:
     """Return public keys for all active signing keys in JWK format.
 
     Consumers cache this response and refresh automatically when
@@ -24,4 +33,5 @@ async def jwks() -> dict:
 
     key_ring = KeyRingManager(adapter=adapter)
     await key_ring.initialize()
-    return await key_ring.jwks_dict()
+    jwks_data = await key_ring.jwks_dict()
+    return JWKSResponse(keys=jwks_data["keys"])

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/templates/augments/jwt-auth-provider/views/users_view.py

@@ -12,17 +12,41 @@ from ..repositories.user_repository import UserRepository
 router = APIRouter(tags=["users"])
 
 
+# ---------------------------------------------------------------------------
+# Request / response models
+# ---------------------------------------------------------------------------
+
+
 class SignupRequest(BaseModel):
     username: str
     password: str
 
 
+class UserResponse(BaseModel):
+    """Basic user info returned after signup or lookup."""
+
+    id: str
+    username: str
+
+
+class UserRolesResponse(BaseModel):
+    """User with their assigned roles/authorities."""
+
+    user_id: str
+    roles: list[str]
+
+
 class RoleRequest(BaseModel):
     role: str
 
 
-@router.post("/api/signup", status_code=201)
-async def signup(body: SignupRequest) -> dict:
+# ---------------------------------------------------------------------------
+# Endpoints
+# ---------------------------------------------------------------------------
+
+
+@router.post("/api/signup", status_code=201, response_model=UserResponse)
+async def signup(body: SignupRequest) -> UserResponse:
     """Create a new user account."""
     adapter = await get_adapter()
     repo = UserRepository(adapter)
@@ -32,11 +56,11 @@ async def signup(body: SignupRequest) -> dict:
         raise HTTPException(status_code=409, detail="Username already taken")
 
     user = await repo.create_user(body.username, body.password)
-    return {"id": user["id"], "username": user["username"]}
+    return UserResponse(id=user["id"], username=user["username"])
 
 
-@router.get("/api/users/{user_id}")
-async def get_user(user_id: str) -> dict:
+@router.get("/api/users/{user_id}", response_model=UserResponse)
+async def get_user(user_id: str) -> UserResponse:
     """Get user info by ID."""
     adapter = await get_adapter()
     repo = UserRepository(adapter)
@@ -45,11 +69,11 @@ async def get_user(user_id: str) -> dict:
     if user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
-    return dict(user)
+    return UserResponse(id=user["id"], username=user["username"])
 
 
-@router.get("/api/users/{user_id}/roles")
-async def get_user_roles(user_id: str) -> dict:
+@router.get("/api/users/{user_id}/roles", response_model=UserRolesResponse)
+async def get_user_roles(user_id: str) -> UserRolesResponse:
     """List a user's authorities/roles."""
     adapter = await get_adapter()
     repo = UserRepository(adapter)
@@ -59,11 +83,11 @@ async def get_user_roles(user_id: str) -> dict:
         raise HTTPException(status_code=404, detail="User not found")
 
     roles = await repo.get_roles(user_id)
-    return {"user_id": user_id, "roles": roles}
+    return UserRolesResponse(user_id=user_id, roles=roles)
 
 
-@router.post("/api/users/{user_id}/roles", status_code=201)
-async def add_user_role(user_id: str, body: RoleRequest) -> dict:
+@router.post("/api/users/{user_id}/roles", status_code=201, response_model=UserRolesResponse)
+async def add_user_role(user_id: str, body: RoleRequest) -> UserRolesResponse:
     """Assign a role/authority to a user."""
     adapter = await get_adapter()
     repo = UserRepository(adapter)
@@ -74,4 +98,4 @@ async def add_user_role(user_id: str, body: RoleRequest) -> dict:
 
     await repo.add_role(user_id, body.role)
     roles = await repo.get_roles(user_id)
-    return {"user_id": user_id, "roles": roles}
+    return UserRolesResponse(user_id=user_id, roles=roles)

{csrd_utils-0.3.91 → csrd_utils-0.3.93}/src/csrd_utils/v2/templates/service/{{cookiecutter.__service_name_snake}}/Dockerfile

@@ -2,10 +2,10 @@ FROM python:3.12-slim
 
 WORKDIR /app
 
-COPY ./src/{{cookiecutter.service_name}}/requirements.txt /app/requirements.txt
+COPY ./src/{{cookiecutter.__service_name_snake}}/requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir -r /app/requirements.txt
 
-COPY ./src/{{cookiecutter.service_name}} /app/{{cookiecutter.__service_name_snake}}
+COPY ./src/{{cookiecutter.__service_name_snake}} /app/{{cookiecutter.__service_name_snake}}
 
 ENV PORT={{ cookiecutter.port }}
 

csrd_utils-0.3.93/src/csrd_utils/v2/templates/service/{{cookiecutter.__service_name_snake}}/views/health_view.py

@@ -0,0 +1,16 @@
+from fastapi import APIRouter
+from pydantic import BaseModel
+
+router = APIRouter(tags=["Health"])
+
+
+class HealthResponse(BaseModel):
+    """Health check response."""
+
+    status: str
+    service: str
+
+
+@router.get("/health", response_model=HealthResponse)
+def health() -> HealthResponse:
+    return HealthResponse(status="ok", service="{{ cookiecutter.service_name }}")

csrd_utils-0.3.91/src/csrd_utils/v2/templates/service/{{cookiecutter.__service_name_snake}}/views/health_view.py

@@ -1,8 +0,0 @@
-from fastapi import APIRouter
-
-router = APIRouter(tags=["Health"])
-
-
-@router.get("/health")
-def health() -> dict[str, str]:
-    return {"status": "ok", "service": "{{ cookiecutter.service_name }}"}