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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.3.74"
+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.74 → 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"
@@ -294,7 +300,11 @@ def _service_environment(service: ServiceSpec, services: list[ServiceSpec]) -> d
 
     role = str(service.get("role", "")).strip()
     if service["type"] == "platform" and role in {"app", "auth", "identity"}:
-        env["DB_PATH"] = "./platform.db"
+        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
 
@@ -303,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"])
@@ -345,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
@@ -412,6 +435,9 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
             },
         }
 
+    if compose_volumes:
+        compose["volumes"] = compose_volumes
+
     return compose
 
 

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.74 → 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.74 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/views/unversioned/items_view.py

@@ -1,44 +1,18 @@
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel
 
 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])
 
-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(

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.74 → 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.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.74 → csrd_utils-0.3.75}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/views/unversioned/users_view.py

@@ -1,47 +1,17 @@
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel
 
 from ...dependencies import UserRepositoryDep
+from ...models import (
+    AssignRoleRequest,
+    SignupRequest,
+    UserInfo,
+    UserRolesResponse,
+    VerifyCredentialsRequest,
+    VerifyCredentialsResponse,
+)
 
 router = APIRouter(prefix="/api", tags=["Identity Endpoints"])
 
-
-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
-
-
 @router.get("/users/{user_id}", response_model=UserInfo)
 async def get_user(user_id: str, repo: UserRepositoryDep) -> UserInfo:
     user = await repo.get_user(user_id)