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

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

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

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

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

@@ -499,7 +499,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.71 → csrd_utils-0.3.73}/src/csrd_utils/templates/platform-app-service/cookiecutter.json

@@ -2,5 +2,6 @@
   "service_name": "app-service",
   "port": "8080",
   "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.71 → csrd_utils-0.3.73}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/README.md

@@ -5,6 +5,8 @@ Platform app service with auth-guarded item endpoints.
 ## 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)
@@ -17,6 +19,7 @@ Platform app service with auth-guarded item endpoints.
 | Variable | Default | Description |
 |---|---|---|
 | `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.73/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.73/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.73/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.73/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

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

csrd_utils-0.3.73/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.71 → csrd_utils-0.3.73}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/auth_service.py

@@ -2,7 +2,6 @@ from typing import Annotated
 
 import httpx
 from fastapi import Depends, HTTPException, Security
-from fastapi.params import Depends as DependsParam
 from fastapi.requests import Request
 from fastapi.security import HTTPBearer
 
@@ -50,12 +49,20 @@ async def _remote_verify(_: Request, token: str) -> UserClaims:
 _authenticator = CallbackAuthenticator(callback=_remote_verify)
 _bearer_dep = create_bearer_dependency(_authenticator, token_finder=find_token)
 _http_bearer_scheme = HTTPBearer()
+_router_scheme_dep = Security(_http_bearer_scheme)
+_router_claims_dep = Depends(_bearer_dep)
 
 # For use as a route function parameter annotation.
 VerifiedTokenDep = Annotated[UserClaims, Security(_bearer_dep)]
 
-# For router-level dependencies: surfaces the Authorize button in Swagger
-# and enforces token validation on every route in the router.
-router_auth: list[DependsParam] = [Security(_http_bearer_scheme), Depends(_bearer_dep)]
+async def _router_auth_guard(
+    _scheme=_router_scheme_dep,
+    _claims=_router_claims_dep,
+) -> None:
+    """Composite auth dependency for router-level use."""
+
+
+# Use as `dependencies=[router_auth]` so adding more deps stays explicit.
+router_auth = Depends(_router_auth_guard)
 
 __all__ = ("VerifiedTokenDep", "router_auth")

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

@@ -3,4 +3,5 @@ uvicorn[standard]>=0.30,<1
 pydantic-settings>=2.6,<3
 httpx>=0.27,<1
 csrd-auth>=0.1.0,<1
+csrd-delegate>=0.1.0,<1
 csrd-versioning>=0.1.0,<1

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

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

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

@@ -6,7 +6,7 @@ from pydantic import BaseModel
 
 from ...dependencies import router_auth
 
-router = APIRouter(prefix="/api", tags=["Items Endpoints"], dependencies=router_auth)
+router = APIRouter(prefix="/api", tags=["Items Endpoints"], dependencies=[router_auth])
 
 _ITEMS: dict[str, dict[str, str]] = {}
 

csrd_utils-0.3.71/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")