csrd-utils 0.3.72__tar.gz → 0.3.74__tar.gz

{csrd_utils-0.3.72 → csrd_utils-0.3.74}/PKG-INFO

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

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

{csrd_utils-0.3.72 → csrd_utils-0.3.74}/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(
@@ -499,7 +501,12 @@ def _generate_services_from_cluster_spec(
                 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")
+                    identity_port = next((port_map[n] for n in port_map if "identity" in n), 8082)
+                    identity_name = next(
+                        (n for n in port_map if "identity" in n), "identity-service"
+                    )
                     extra["auth_service_url"] = f"http://{auth_name}:{auth_port}"
+                    extra["identity_service_url"] = f"http://{identity_name}:{identity_port}"
                 result = generate_platform_service(
                     name=name,
                     output_dir=workspace_root,

{csrd_utils-0.3.72 → csrd_utils-0.3.74}/src/csrd_utils/cluster.py

@@ -292,6 +292,10 @@ 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_PATH"] = "./platform.db"
+
     return env
 
 

{csrd_utils-0.3.72 → csrd_utils-0.3.74}/src/csrd_utils/templates/platform-app-service/cookiecutter.json

@@ -1,6 +1,8 @@
 {
   "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.72 → csrd_utils-0.3.74}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -2,9 +2,14 @@
 
 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
+- `POST /signup` - passthrough to identity signup (public)
+- `POST /login` - passthrough to auth token issue (public)
 - `POST /api/items` - create item (bearer required)
 - `GET /api/items` - list items (bearer required)
 - `GET /api/items/{entity_id}` - get item (bearer required)
@@ -16,7 +21,9 @@ 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 |
 
 ## Run
 

csrd_utils-0.3.74/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/delegates/__init__.py

@@ -0,0 +1,4 @@
+from .auth_delegate import AuthDelegate
+from .identity_delegate import IdentityDelegate
+
+__all__ = ("AuthDelegate", "IdentityDelegate")

csrd_utils-0.3.74/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/delegates/auth_delegate.py

@@ -0,0 +1,11 @@
+from csrd.delegate import BaseDelegate
+
+from ..settings import settings
+
+
+class AuthDelegate(BaseDelegate):
+    def __init__(self) -> None:
+        super().__init__(settings.auth_service_url)
+
+    async def login(self, username: str, password: str) -> dict[str, object]:
+        return await self.post("/api/token", json={"username": username, "password": password})

csrd_utils-0.3.74/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/delegates/identity_delegate.py

@@ -0,0 +1,11 @@
+from csrd.delegate import BaseDelegate
+
+from ..settings import settings
+
+
+class IdentityDelegate(BaseDelegate):
+    def __init__(self) -> None:
+        super().__init__(settings.identity_service_url)
+
+    async def signup(self, username: str, password: str) -> dict[str, object]:
+        return await self.post("/api/signup", json={"username": username, "password": password})

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

@@ -0,0 +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.74/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/auth_passthrough.py

@@ -0,0 +1,25 @@
+from typing import Annotated
+
+from fastapi import Depends
+
+from ..delegates import AuthDelegate, IdentityDelegate
+
+
+def auth_delegate_factory() -> AuthDelegate:
+    return AuthDelegate()
+
+
+def identity_delegate_factory() -> IdentityDelegate:
+    return IdentityDelegate()
+
+
+AuthDelegateDep = Annotated[AuthDelegate, Depends(auth_delegate_factory)]
+IdentityDelegateDep = Annotated[IdentityDelegate, Depends(identity_delegate_factory)]
+
+
+__all__ = (
+    "AuthDelegateDep",
+    "IdentityDelegateDep",
+    "auth_delegate_factory",
+    "identity_delegate_factory",
+)

csrd_utils-0.3.74/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.74/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.74/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.72 → csrd_utils-0.3.74}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/requirements.txt

@@ -2,5 +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.72 → csrd_utils-0.3.74}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/settings.py

@@ -6,7 +6,9 @@ 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 }}"
 
 
 settings = Settings()

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

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

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

@@ -0,0 +1,28 @@
+from fastapi import APIRouter
+from pydantic import BaseModel
+
+from ...dependencies import AuthDelegateDep, IdentityDelegateDep
+
+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:
+        return await delegate.signup(payload.username, payload.password)
+
+
+@router.post("/login")
+async def login(payload: LoginRequest, delegate: AuthDelegateDep) -> dict[str, object]:
+    async with delegate:
+        return await delegate.login(payload.username, payload.password)

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

@@ -1,16 +1,10 @@
-import uuid
-from datetime import UTC, datetime
-
 from fastapi import APIRouter, HTTPException
 from pydantic import BaseModel
 
-from ...dependencies import router_auth
+from ...dependencies import ItemRepositoryDep, router_auth
 
 router = APIRouter(prefix="/api", tags=["Items Endpoints"], dependencies=[router_auth])
 
-_ITEMS: dict[str, dict[str, str]] = {}
-
-
 class CreateItemRequest(BaseModel):
     name: str
 
@@ -49,22 +43,19 @@ class ItemDeleteResponse(BaseModel):
 @router.post("/items", response_model=ItemResponse)
 async def create_item(
     payload: CreateItemRequest,
+    repo: ItemRepositoryDep,
 ) -> 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
+    return await repo.create_item(payload.name)
 
 
 @router.get("/items", response_model=ItemListResponse)
-async def list_items() -> ItemListResponse:
-    return {"items": list(_ITEMS.values())}
+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) -> ItemResponse:
-    item = _ITEMS.get(entity_id)
+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
@@ -74,11 +65,11 @@ async def get_item(entity_id: str) -> ItemResponse:
 async def update_item(
     entity_id: str,
     payload: UpdateItemRequest,
+    repo: ItemRepositoryDep,
 ) -> ItemUpdateResponse:
-    item = _ITEMS.get(entity_id)
-    if item is None:
+    rows = await repo.update_item(entity_id, payload.name)
+    if rows == 0:
         raise HTTPException(status_code=404, detail="item not found")
-    item["name"] = payload.name
     return {"id": entity_id, "name": payload.name, "updated": True}
 
 
@@ -86,21 +77,18 @@ async def update_item(
 async def upsert_item(
     entity_id: str,
     payload: UpdateItemRequest,
+    repo: ItemRepositoryDep,
 ) -> 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}
+    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 = 1 if _ITEMS.pop(entity_id, None) is not None else 0
+    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.72 → csrd_utils-0.3.74}/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.72 → csrd_utils-0.3.74}/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.72 → csrd_utils-0.3.74}/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.72 → csrd_utils-0.3.74}/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.72 → csrd_utils-0.3.74}/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.72 → csrd_utils-0.3.74}/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()

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

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