csrd-utils 0.3.73__tar.gz → 0.3.75__tar.gz

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/PKG-INFO

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

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

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/__main__.py

@@ -485,6 +485,8 @@ def _generate_services_from_cluster_spec(
                 role = str(service.get("role", "custom")).strip()
                 # Build extra_context for platform templates that have additional variables
                 extra: dict[str, str] = {}
+                if role in {"app", "auth", "identity"}:
+                    extra["db_path"] = "./platform.db"
                 if role == "auth":
                     # Resolve the identity-service URL from the port map if present
                     identity_port = next(

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/cluster.py

@@ -35,15 +35,21 @@ PRESETS: dict[str, list[ServiceSpec]] = {
             "type": "platform",
             "role": "app",
             "port": 8080,
-            "requires": ["auth-service"],
+            "requires": ["auth-service", "postgres"],
+        },
+        {
+            "name": "auth-service",
+            "type": "platform",
+            "role": "auth",
+            "port": 8081,
+            "requires": ["postgres"],
         },
-        {"name": "auth-service", "type": "platform", "role": "auth", "port": 8081, "requires": []},
         {
             "name": "identity-service",
             "type": "platform",
             "role": "identity",
             "port": 8082,
-            "requires": ["auth-service"],
+            "requires": ["auth-service", "postgres"],
         },
     ],
     # "minimal-cluster": [
@@ -257,7 +263,7 @@ def _service_environment(service: ServiceSpec, services: list[ServiceSpec]) -> d
     if service["type"] == "db":
         db = service.get("database")
         if db == "sqlite":
-            env["DB_PATH"] = "./service.db"
+            env["DB_PATH"] = "/data/service.db"
         elif db == "maria":
             env["DB_HOST"] = "mariadb"
             env["DB_PORT"] = "3306"
@@ -292,6 +298,14 @@ def _service_environment(service: ServiceSpec, services: list[ServiceSpec]) -> d
     if auth_service and name != auth_service["name"]:
         env["AUTH_SERVICE_URL"] = f"http://{auth_service['name']}:{auth_service['port']}"
 
+    role = str(service.get("role", "")).strip()
+    if service["type"] == "platform" and role in {"app", "auth", "identity"}:
+        env["DB_HOST"] = "postgres"
+        env["DB_PORT"] = "5432"
+        env["DB_USER"] = "${DB_USER:-service_user}"
+        env["DB_PASSWORD"] = "${DB_PASSWORD:-change_me}"
+        env["DB_NAME"] = "${DB_NAME:-service_db}"
+
     return env
 
 
@@ -299,6 +313,7 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
     services = spec["services"]
     infra = _infer_infra(services)
     compose: dict[str, Any] = {"services": {}}
+    compose_volumes: dict[str, dict[str, str]] = {}
 
     for service in services:
         name = str(service["name"])
@@ -341,6 +356,18 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
             "ports": [f"{service['port']}:{service['port']}"],
             "environment": _service_environment(service, services),
         }
+
+        role = str(service.get("role", "")).strip()
+        volume_name: str | None = None
+        if service["type"] == "db" and service.get("database") == "sqlite":
+            volume_name = f"{name}-data"
+        elif service["type"] == "platform" and role in {"app", "auth", "identity"}:
+            volume_name = None
+
+        if volume_name is not None:
+            app_service["volumes"] = [f"{volume_name}:/data"]
+            compose_volumes[volume_name] = {}
+
         if depends_on:
             app_service["depends_on"] = depends_on
         compose["services"][name] = app_service
@@ -408,6 +435,9 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
             },
         }
 
+    if compose_volumes:
+        compose["volumes"] = compose_volumes
+
     return compose
 
 

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/cookiecutter.json

@@ -1,6 +1,7 @@
 {
   "service_name": "app-service",
   "port": "8080",
+  "db_path": "./platform.db",
   "auth_service_url": "http://auth-service:8081",
   "identity_service_url": "http://identity-service:8082",
   "__service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}"

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -2,6 +2,9 @@
 
 Platform app service with auth-guarded item endpoints.
 
+Items are persisted in SQLite so this service can share the same DB file
+as platform auth and identity services.
+
 ## Endpoints
 
 - `GET /health` - liveness probe
@@ -18,6 +21,7 @@ Platform app service with auth-guarded item endpoints.
 
 | Variable | Default | Description |
 |---|---|---|
+| `DB_PATH` | `{{ cookiecutter.db_path }}` | Shared SQLite database file path |
 | `AUTH_SERVICE_URL` | `{{ cookiecutter.auth_service_url }}` | Auth service verify endpoint base URL |
 | `IDENTITY_SERVICE_URL` | `{{ cookiecutter.identity_service_url }}` | Identity service base URL for signup passthrough |
 

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

@@ -1,9 +1,12 @@
 from .auth_passthrough import AuthDelegateDep, IdentityDelegateDep
 from .auth_service import VerifiedTokenDep, router_auth
+from .item_repository import ItemRepositoryDep, item_repository_factory
 
 __all__ = (
 	"AuthDelegateDep",
 	"IdentityDelegateDep",
+	"ItemRepositoryDep",
 	"VerifiedTokenDep",
+	"item_repository_factory",
 	"router_auth",
 )

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/item_repository.py

@@ -0,0 +1,25 @@
+from collections.abc import AsyncIterator
+from typing import Annotated
+
+from fastapi import Depends
+
+from csrd.repository import SQLiteAdapter
+
+from ..repositories import ItemRepository
+from ..settings import settings
+
+
+async def item_repository_factory() -> AsyncIterator[ItemRepository]:
+    adapter = SQLiteAdapter(settings.db_path)
+    await adapter.connect()
+    repo = ItemRepository(adapter)
+    await repo._init_schema()
+    try:
+        yield repo
+    finally:
+        await adapter.close()
+
+
+ItemRepositoryDep = Annotated[ItemRepository, Depends(item_repository_factory)]
+
+__all__ = ("ItemRepositoryDep", "item_repository_factory")

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/models/__init__.py

@@ -0,0 +1,22 @@
+from .auth_service import LoginRequest, SignupRequest
+from .items import (
+    CreateItemRequest,
+    ItemDeleteResponse,
+    ItemListResponse,
+    ItemResponse,
+    ItemUpdateResponse,
+    ItemUpsertResponse,
+    UpdateItemRequest,
+)
+
+__all__ = (
+    "CreateItemRequest",
+    "ItemDeleteResponse",
+    "ItemListResponse",
+    "ItemResponse",
+    "ItemUpdateResponse",
+    "ItemUpsertResponse",
+    "LoginRequest",
+    "SignupRequest",
+    "UpdateItemRequest",
+)

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/models/auth_service.py

@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+
+
+class SignupRequest(BaseModel):
+    username: str
+    password: str
+
+
+class LoginRequest(BaseModel):
+    username: str
+    password: str

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/models/items.py

@@ -0,0 +1,36 @@
+from pydantic import BaseModel
+
+
+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

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/repositories/__init__.py

@@ -0,0 +1,3 @@
+from .item_repository import ItemRepository
+
+__all__ = ("ItemRepository",)

csrd_utils-0.3.75/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/repositories/item_repository.py

@@ -0,0 +1,71 @@
+import uuid
+from datetime import UTC, datetime
+
+from csrd.repository import BaseRepository, DBProtocol
+
+
+_CREATE_ITEMS_TABLE_SQL = """
+CREATE TABLE IF NOT EXISTS items (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    created_at TEXT NOT NULL
+)
+"""
+
+
+class ItemRepository(BaseRepository):
+    def __init__(self, adapter: DBProtocol) -> None:
+        super().__init__(adapter)
+
+    async def _init_schema(self) -> None:
+        await self.execute(_CREATE_ITEMS_TABLE_SQL)
+
+    async def create_item(self, name: str) -> dict[str, str]:
+        item_id = str(uuid.uuid4())
+        created_at = datetime.now(UTC).isoformat()
+        await self._init_schema()
+        await self.insert("items", {"id": item_id, "name": name, "created_at": created_at})
+        return {"id": item_id, "name": name, "created_at": created_at}
+
+    async def list_items(self) -> list[dict[str, str]]:
+        await self._init_schema()
+        rows = await self.fetch_all("SELECT id, name, created_at FROM items ORDER BY created_at DESC")
+        return [
+            {
+                "id": str(row.get("id", "")),
+                "name": str(row.get("name", "")),
+                "created_at": str(row.get("created_at", "")),
+            }
+            for row in rows
+        ]
+
+    async def get_item(self, item_id: str) -> dict[str, str] | None:
+        await self._init_schema()
+        row = await self.fetch_one(
+            "SELECT id, name, created_at FROM items WHERE id = :id",
+            {"id": item_id},
+        )
+        if row is None:
+            return None
+        return {
+            "id": str(row.get("id", "")),
+            "name": str(row.get("name", "")),
+            "created_at": str(row.get("created_at", "")),
+        }
+
+    async def update_item(self, item_id: str, name: str) -> int:
+        await self._init_schema()
+        return await super().update("items", {"name": name}, {"id": item_id})
+
+    async def delete_item(self, item_id: str) -> int:
+        await self._init_schema()
+        return await super().delete("items", {"id": item_id})
+
+    async def upsert_item(self, item_id: str, name: str) -> int:
+        await self._init_schema()
+        created_at = datetime.now(UTC).isoformat()
+        return await super().upsert(
+            "items",
+            {"name": name, "created_at": created_at},
+            {"id": item_id},
+        )

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/requirements.txt

@@ -2,6 +2,8 @@ fastapi>=0.115,<1
 uvicorn[standard]>=0.30,<1
 pydantic-settings>=2.6,<3
 httpx>=0.27,<1
+aiosqlite>=0.21,<1
 csrd-auth>=0.1.0,<1
 csrd-delegate>=0.1.0,<1
+csrd-repository>=0.1.0,<1
 csrd-versioning>=0.1.0,<1

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/settings.py

@@ -6,6 +6,7 @@ class Settings(BaseSettings):
 
     app_name: str = "{{ cookiecutter.service_name }}"
     port: int = {{ cookiecutter.port }}
+    db_path: str = "{{ cookiecutter.db_path }}"
     auth_service_url: str = "{{ cookiecutter.auth_service_url }}"
     identity_service_url: str = "{{ cookiecutter.identity_service_url }}"
 

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/views/unversioned/auth_service_view.py

@@ -1,21 +1,10 @@
 from fastapi import APIRouter
-from pydantic import BaseModel
 
 from ...dependencies import AuthDelegateDep, IdentityDelegateDep
+from ...models import LoginRequest, SignupRequest
 
 router = APIRouter(tags=["Auth Service"])
 
-
-class SignupRequest(BaseModel):
-    username: str
-    password: str
-
-
-class LoginRequest(BaseModel):
-    username: str
-    password: str
-
-
 @router.post("/signup")
 async def signup(payload: SignupRequest, delegate: IdentityDelegateDep) -> dict[str, object]:
     async with delegate:

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

@@ -0,0 +1,68 @@
+from fastapi import APIRouter, HTTPException
+
+from ...dependencies import ItemRepositoryDep, router_auth
+from ...models import (
+    CreateItemRequest,
+    ItemDeleteResponse,
+    ItemListResponse,
+    ItemResponse,
+    ItemUpdateResponse,
+    ItemUpsertResponse,
+    UpdateItemRequest,
+)
+
+router = APIRouter(prefix="/api", tags=["Items Endpoints"], dependencies=[router_auth])
+
+
+@router.post("/items", response_model=ItemResponse)
+async def create_item(
+    payload: CreateItemRequest,
+    repo: ItemRepositoryDep,
+) -> ItemResponse:
+    return await repo.create_item(payload.name)
+
+
+@router.get("/items", response_model=ItemListResponse)
+async def list_items(repo: ItemRepositoryDep) -> ItemListResponse:
+    return {"items": await repo.list_items()}
+
+
+@router.get("/items/{entity_id}", response_model=ItemResponse)
+async def get_item(entity_id: str, repo: ItemRepositoryDep) -> ItemResponse:
+    item = await repo.get_item(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,
+    repo: ItemRepositoryDep,
+) -> ItemUpdateResponse:
+    rows = await repo.update_item(entity_id, payload.name)
+    if rows == 0:
+        raise HTTPException(status_code=404, detail="item not found")
+    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,
+    repo: ItemRepositoryDep,
+) -> ItemUpsertResponse:
+    rows = await repo.upsert_item(entity_id, payload.name)
+    return {"id": entity_id, "name": payload.name, "rows_affected": rows}
+
+
+@router.delete("/items/{entity_id}", response_model=ItemDeleteResponse)
+async def delete_item(
+    entity_id: str,
+    repo: ItemRepositoryDep,
+) -> ItemDeleteResponse:
+    rows = await repo.delete_item(entity_id)
+    if rows == 0:
+        raise HTTPException(status_code=404, detail="item not found")
+    return {"id": entity_id, "deleted": True}

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-auth-service/cookiecutter.json

@@ -1,6 +1,7 @@
 {
   "service_name": "auth-service",
   "port": "8081",
+  "db_path": "./platform.db",
   "identity_service_url": "http://identity-service:8082",
   "__service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}"
 }

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -17,7 +17,7 @@ Platform auth service — issues and verifies JWT tokens.
 | `JWT_ISSUER` | `{{ cookiecutter.service_name }}` | Token issuer |
 | `JWT_AUDIENCE` | `cluster` | Token audience |
 | `JWT_TTL_SECONDS` | `3600` | Token TTL |
-| `DB_PATH` | `./{{ cookiecutter.__service_name_snake }}.db` | SQLite database path |
+| `DB_PATH` | `{{ cookiecutter.db_path }}` | SQLite database path |
 | `IDENTITY_SERVICE_URL` | `{{ cookiecutter.identity_service_url }}` | Identity service URL |
 
 ## Run

csrd_utils-0.3.75/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/models/__init__.py

@@ -0,0 +1,9 @@
+from .auth import TokenRequest, TokenResponse, TokenVerifyResponse, VerifyClaims, VerifyRequest
+
+__all__ = (
+    "TokenRequest",
+    "TokenResponse",
+    "TokenVerifyResponse",
+    "VerifyClaims",
+    "VerifyRequest",
+)

csrd_utils-0.3.75/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/models/auth.py

@@ -0,0 +1,34 @@
+from pydantic import BaseModel
+
+
+class TokenRequest(BaseModel):
+    username: str
+    password: str
+
+
+class VerifyRequest(BaseModel):
+    token: str
+
+
+class TokenResponse(BaseModel):
+    """JWT token issuance response."""
+
+    access_token: str
+    token_type: str
+    expires_in: int
+
+
+class VerifyClaims(BaseModel):
+    """JWT claim fields returned by verify endpoint."""
+
+    sub: str
+    user_name: str
+    authorities: list[str]
+    roles: list[str]
+
+
+class TokenVerifyResponse(BaseModel):
+    """Token verification response."""
+
+    valid: bool
+    claims: VerifyClaims

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/settings.py

@@ -13,7 +13,7 @@ class Settings(BaseSettings):
     jwt_audience: str = "cluster"
     jwt_ttl_seconds: int = 3600
 
-    db_path: str = "./{{ cookiecutter.__service_name_snake }}.db"
+    db_path: str = "{{ cookiecutter.db_path }}"
     identity_service_url: str = "{{ cookiecutter.identity_service_url }}"
 
 

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/views/unversioned/auth_view.py

@@ -3,49 +3,15 @@ from datetime import UTC, datetime, timedelta
 import httpx
 import jwt
 from fastapi import APIRouter, HTTPException, Request
-from pydantic import BaseModel
 
 from csrd.auth import JWTAuthenticator, StaticKeyProvider
 
 from ...dependencies import TokenRepositoryDep
+from ...models import TokenRequest, TokenResponse, TokenVerifyResponse, VerifyClaims, VerifyRequest
 from ...settings import settings
 
 router = APIRouter(prefix="/api", tags=["Auth Endpoints"])
 
-
-class TokenRequest(BaseModel):
-    username: str
-    password: str
-
-
-class VerifyRequest(BaseModel):
-    token: str
-
-
-class TokenResponse(BaseModel):
-    """JWT token issuance response."""
-
-    access_token: str
-    token_type: str
-    expires_in: int
-
-
-class VerifyClaims(BaseModel):
-    """JWT claim fields returned by verify endpoint."""
-
-    sub: str
-    user_name: str
-    authorities: list[str]
-    roles: list[str]
-
-
-class TokenVerifyResponse(BaseModel):
-    """Token verification response."""
-
-    valid: bool
-    claims: VerifyClaims
-
-
 def _make_verifier() -> JWTAuthenticator:
     return JWTAuthenticator(
         key=StaticKeyProvider(settings.jwt_secret),

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-identity-service/cookiecutter.json

@@ -1,5 +1,6 @@
 {
   "service_name": "identity-service",
   "port": "8082",
+  "db_path": "./platform.db",
   "__service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}"
 }

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -15,7 +15,7 @@ Platform identity service — manages users and credentials.
 
 | Variable | Default | Description |
 |---|---|---|
-| `DB_PATH` | `./{{ cookiecutter.__service_name_snake }}.db` | SQLite database path |
+| `DB_PATH` | `{{ cookiecutter.db_path }}` | SQLite database path |
 
 ## Run
 

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

@@ -0,0 +1,17 @@
+from .users import (
+    AssignRoleRequest,
+    SignupRequest,
+    UserInfo,
+    UserRolesResponse,
+    VerifyCredentialsRequest,
+    VerifyCredentialsResponse,
+)
+
+__all__ = (
+    "AssignRoleRequest",
+    "SignupRequest",
+    "UserInfo",
+    "UserRolesResponse",
+    "VerifyCredentialsRequest",
+    "VerifyCredentialsResponse",
+)

csrd_utils-0.3.75/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/models/users.py

@@ -0,0 +1,37 @@
+from pydantic import BaseModel
+
+
+class SignupRequest(BaseModel):
+    username: str
+    password: str
+
+
+class VerifyCredentialsRequest(BaseModel):
+    username: str
+    password: str
+
+
+class AssignRoleRequest(BaseModel):
+    role: str
+
+
+class UserInfo(BaseModel):
+    """User information."""
+
+    id: str
+    username: str
+    created_at: str
+
+
+class UserRolesResponse(BaseModel):
+    """User roles response."""
+
+    user_id: str
+    roles: list[str]
+
+
+class VerifyCredentialsResponse(BaseModel):
+    """Credentials verification response."""
+
+    valid: bool
+    user: UserInfo

{csrd_utils-0.3.73 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/settings.py

@@ -6,7 +6,7 @@ class Settings(BaseSettings):
 
     app_name: str = "{{ cookiecutter.service_name }}"
     port: int = {{ cookiecutter.port }}
-    db_path: str = "./{{ cookiecutter.__service_name_snake }}.db"
+    db_path: str = "{{ cookiecutter.db_path }}"
 
 
 settings = Settings()