csrd-utils 0.3.62__tar.gz → 0.3.63__tar.gz

{csrd_utils-0.3.62 → csrd_utils-0.3.63}/PKG-INFO

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

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

{csrd_utils-0.3.62 → csrd_utils-0.3.63}/src/csrd_utils/__main__.py

@@ -496,6 +496,10 @@ def _generate_services_from_cluster_spec(
                         "identity-service",
                     )
                     extra["identity_service_url"] = f"http://{identity_name}:{identity_port}"
+                elif role == "app":
+                    auth_port = next((port_map[n] for n in port_map if "auth" in n), 8081)
+                    auth_name = next((n for n in port_map if "auth" in n), "auth-service")
+                    extra["auth_service_url"] = f"http://{auth_name}:{auth_port}"
                 result = generate_platform_service(
                     name=name,
                     output_dir=workspace_root,

{csrd_utils-0.3.62 → csrd_utils-0.3.63}/src/csrd_utils/cluster.py

@@ -30,7 +30,13 @@ DEFAULT_PORT_START = 8091
 PRESETS: dict[str, list[ServiceSpec]] = {
     "none": [],
     "authenticated-cluster": [
-        {"name": "app-service", "type": "delegate", "port": 8080, "requires": ["auth-service"]},
+        {
+            "name": "app-service",
+            "type": "platform",
+            "role": "app",
+            "port": 8080,
+            "requires": ["auth-service"],
+        },
         {"name": "auth-service", "type": "platform", "role": "auth", "port": 8081, "requires": []},
         {
             "name": "identity-service",

{csrd_utils-0.3.62 → csrd_utils-0.3.63}/src/csrd_utils/generator.py

@@ -254,6 +254,7 @@ def generate_service(
 
 #: Maps role names to the cookiecutter template directory names bundled under templates/.
 _PLATFORM_ROLE_TEMPLATES: dict[str, str] = {
+    "app": "platform-app-service",
     "auth": "platform-auth-service",
     "identity": "platform-identity-service",
 }

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/cookiecutter.json

@@ -0,0 +1,6 @@
+{
+  "service_name": "app-service",
+  "port": "8080",
+  "auth_service_url": "http://auth-service:8081",
+  "__service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}"
+}

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -0,0 +1,26 @@
+# {{ cookiecutter.service_name }}
+
+Platform app service with auth-guarded item endpoints.
+
+## Endpoints
+
+- `GET /health` - liveness probe
+- `POST /api/items` - create item (bearer required)
+- `GET /api/items` - list items (bearer required)
+- `GET /api/items/{entity_id}` - get item (bearer required)
+- `PUT /api/items/{entity_id}` - update item (bearer required)
+- `PUT /api/items/{entity_id}/upsert` - upsert item (bearer required)
+- `DELETE /api/items/{entity_id}` - delete item (bearer required)
+
+## Configuration
+
+| Variable | Default | Description |
+|---|---|---|
+| `AUTH_SERVICE_URL` | `{{ cookiecutter.auth_service_url }}` | Auth service verify endpoint base URL |
+
+## Run
+
+```bash
+pip install -r requirements.txt
+uvicorn {{ cookiecutter.__service_name_snake }}:build_app --factory --port {{ cookiecutter.port }}
+```

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

@@ -0,0 +1,3 @@
+from .auth_service import VerifiedTokenDep
+
+__all__ = ("VerifiedTokenDep",)

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/auth_service.py

@@ -0,0 +1,55 @@
+from typing import Annotated
+
+import httpx
+from fastapi import HTTPException, Security
+from fastapi.requests import Request
+
+from csrd.auth import CallbackAuthenticator, create_bearer_dependency
+from csrd.models.claims import UserClaims
+from csrd.versioning import find_token
+
+from ..settings import settings
+
+
+def _map_claims(payload: dict[str, object]) -> UserClaims:
+    claims = payload.get("claims") if isinstance(payload.get("claims"), dict) else payload
+    if not isinstance(claims, dict):
+        raise HTTPException(status_code=502, detail="invalid auth response")
+
+    authorities = claims.get("authorities") or claims.get("roles") or []
+    if isinstance(authorities, str):
+        authorities = authorities.split()
+
+    sub = str(claims.get("sub", ""))
+    user_name = str(claims.get("user_name") or sub)
+
+    return UserClaims(sub=sub, user_name=user_name, authorities=list(authorities))
+
+
+async def _remote_verify(_: Request, token: str) -> UserClaims:
+    try:
+        async with httpx.AsyncClient(timeout=5.0) as client:
+            response = await client.post(
+                f"{settings.auth_service_url}/api/verify",
+                json={"token": token},
+            )
+    except httpx.ConnectError as exc:
+        raise HTTPException(status_code=503, detail="auth service unavailable") from exc
+
+    if response.status_code != 200:
+        raise HTTPException(status_code=401, detail="invalid token")
+
+    payload = response.json()
+    if not isinstance(payload, dict):
+        raise HTTPException(status_code=502, detail="invalid auth response")
+    return _map_claims(payload)
+
+
+_authenticator = CallbackAuthenticator(callback=_remote_verify)
+
+VerifiedTokenDep = Annotated[
+    UserClaims,
+    Security(create_bearer_dependency(_authenticator, token_finder=find_token)),
+]
+
+__all__ = ("VerifiedTokenDep",)

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/requirements.txt

@@ -0,0 +1,6 @@
+fastapi>=0.115,<1
+uvicorn[standard]>=0.30,<1
+pydantic-settings>=2.6,<3
+httpx>=0.27,<1
+csrd-auth>=0.1.0,<1
+csrd-versioning>=0.1.0,<1

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/settings.py

@@ -0,0 +1,12 @@
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8", extra="ignore")
+
+    app_name: str = "{{ cookiecutter.service_name }}"
+    port: int = {{ cookiecutter.port }}
+    auth_service_url: str = "{{ cookiecutter.auth_service_url }}"
+
+
+settings = Settings()

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/views/unversioned/__init__.py

@@ -0,0 +1,10 @@
+from fastapi import FastAPI
+
+from . import health_view, items_view
+
+unversioned_app = FastAPI(title="{{ cookiecutter.service_name }}")
+
+unversioned_app.include_router(health_view.router)
+unversioned_app.include_router(items_view.router)
+
+__all__ = ("unversioned_app",)

csrd_utils-0.3.63/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/views/unversioned/items_view.py

@@ -0,0 +1,100 @@
+import uuid
+from datetime import UTC, datetime
+
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel
+
+from ...dependencies import VerifiedTokenDep
+
+router = APIRouter(prefix="/api", tags=["Items Endpoints"])
+
+_ITEMS: dict[str, dict[str, str]] = {}
+
+
+class CreateItemRequest(BaseModel):
+    name: str
+
+
+class UpdateItemRequest(BaseModel):
+    name: str
+
+
+class ItemResponse(BaseModel):
+    id: str
+    name: str
+    created_at: str
+
+
+class ItemListResponse(BaseModel):
+    items: list[ItemResponse]
+
+
+class ItemUpdateResponse(BaseModel):
+    id: str
+    name: str
+    updated: bool
+
+
+class ItemUpsertResponse(BaseModel):
+    id: str
+    name: str
+    rows_affected: int
+
+
+class ItemDeleteResponse(BaseModel):
+    id: str
+    deleted: bool
+
+
+@router.post("/items", response_model=ItemResponse)
+async def create_item(payload: CreateItemRequest, _verified: VerifiedTokenDep) -> ItemResponse:
+    item_id = str(uuid.uuid4())
+    created_at = datetime.now(UTC).isoformat()
+    item = {"id": item_id, "name": payload.name, "created_at": created_at}
+    _ITEMS[item_id] = item
+    return item
+
+
+@router.get("/items", response_model=ItemListResponse)
+async def list_items(_verified: VerifiedTokenDep) -> ItemListResponse:
+    return {"items": list(_ITEMS.values())}
+
+
+@router.get("/items/{entity_id}", response_model=ItemResponse)
+async def get_item(entity_id: str, _verified: VerifiedTokenDep) -> ItemResponse:
+    item = _ITEMS.get(entity_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail="item not found")
+    return item
+
+
+@router.put("/items/{entity_id}", response_model=ItemUpdateResponse)
+async def update_item(
+    entity_id: str, payload: UpdateItemRequest, _verified: VerifiedTokenDep
+) -> ItemUpdateResponse:
+    item = _ITEMS.get(entity_id)
+    if item is None:
+        raise HTTPException(status_code=404, detail="item not found")
+    item["name"] = payload.name
+    return {"id": entity_id, "name": payload.name, "updated": True}
+
+
+@router.put("/items/{entity_id}/upsert", response_model=ItemUpsertResponse)
+async def upsert_item(
+    entity_id: str, payload: UpdateItemRequest, _verified: VerifiedTokenDep
+) -> ItemUpsertResponse:
+    existing = _ITEMS.get(entity_id)
+    if existing is None:
+        created_at = datetime.now(UTC).isoformat()
+        _ITEMS[entity_id] = {"id": entity_id, "name": payload.name, "created_at": created_at}
+    else:
+        existing["name"] = payload.name
+    return {"id": entity_id, "name": payload.name, "rows_affected": 1}
+
+
+@router.delete("/items/{entity_id}", response_model=ItemDeleteResponse)
+async def delete_item(entity_id: str, _verified: VerifiedTokenDep) -> ItemDeleteResponse:
+    rows = 1 if _ITEMS.pop(entity_id, None) is not None else 0
+    if rows == 0:
+        raise HTTPException(status_code=404, detail="item not found")
+    return {"id": entity_id, "deleted": True}

csrd_utils-0.3.63/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/.dockerignore

@@ -0,0 +1,7 @@
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.venv/
+.env
+.git

csrd_utils-0.3.63/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.12-slim
+
+WORKDIR /app
+
+COPY . /app
+RUN pip install --no-cache-dir -r /app/requirements.txt
+
+ENV PORT={{ cookiecutter.port }}
+
+CMD uvicorn {{cookiecutter.__service_name_snake}}:build_app --factory --host 0.0.0.0 --port ${PORT}

csrd_utils-0.3.63/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/__init__.py

@@ -0,0 +1,23 @@
+from fastapi import FastAPI
+
+from csrd.versioning import (
+    UNVERSIONED,
+    VersionedApiConfig,
+    VersionedAppComposeConfig,
+    compose_versioned_apps,
+)
+
+from .views import unversioned_app
+
+
+def build_app() -> FastAPI:
+    return compose_versioned_apps(
+        version_mapping={UNVERSIONED: unversioned_app},
+        config=VersionedAppComposeConfig(
+            title="{{ cookiecutter.service_name }}",
+            api=VersionedApiConfig(prefix="/", include_actuator_endpoints=False),
+        ),
+    )
+
+
+__all__ = ("build_app",)

csrd_utils-0.3.63/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/views/__init__.py

@@ -0,0 +1,3 @@
+from .unversioned import unversioned_app
+
+__all__ = ("unversioned_app",)

csrd_utils-0.3.63/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/views/unversioned/health_view.py

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