csrd-utils 0.3.78__tar.gz → 0.3.80__tar.gz

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/PKG-INFO

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

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

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/__main__.py

@@ -485,8 +485,6 @@ 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.78 → csrd_utils-0.3.80}/src/csrd_utils/cluster.py

@@ -313,7 +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]] = {}
+    compose_volumes: dict[str, None] = {}
 
     for service in services:
         name = str(service["name"])
@@ -366,14 +366,14 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
 
         if volume_name is not None:
             app_service["volumes"] = [f"{volume_name}:/data"]
-            compose_volumes[volume_name] = {}
+            compose_volumes[volume_name] = None
 
         if depends_on:
             app_service["depends_on"] = depends_on
         compose["services"][name] = app_service
 
     if "postgres" in infra:
-        compose_volumes["postgres-data"] = {}
+        compose_volumes["postgres-data"] = None
         compose["services"]["postgres"] = {
             "image": "postgres:16",
             "environment": {

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-app-service/cookiecutter.json

@@ -1,7 +1,6 @@
 {
   "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.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-app-service/{{cookiecutter.__service_name_snake}}/dependencies/item_repository.py

@@ -3,14 +3,20 @@ from typing import Annotated
 
 from fastapi import Depends
 
-from csrd.repository import SQLiteAdapter
+from csrd.repository import PGAdapter
 
 from ..repositories import ItemRepository
 from ..settings import settings
 
 
 async def item_repository_factory() -> AsyncIterator[ItemRepository]:
-    adapter = SQLiteAdapter(settings.db_path)
+    adapter = PGAdapter(
+        host=settings.db_host,
+        port=settings.db_port,
+        user=settings.db_user,
+        password=settings.db_password,
+        database=settings.db_name,
+    )
     await adapter.connect()
     repo = ItemRepository(adapter)
     await repo._init_schema()

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

@@ -42,7 +42,7 @@ class ItemRepository(BaseRepository):
     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",
+            "SELECT id, name, created_at FROM items WHERE id = %(id)s",
             {"id": item_id},
         )
         if row is None:

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

@@ -2,7 +2,7 @@ fastapi>=0.115,<1
 uvicorn[standard]>=0.30,<1
 pydantic-settings>=2.6,<3
 httpx>=0.27,<1
-aiosqlite>=0.21,<1
+psycopg[binary]>=3.1,<4
 csrd-auth>=0.1.0,<1
 csrd-delegate>=0.1.0,<1
 csrd-repository>=0.1.0,<1

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

@@ -6,7 +6,13 @@ class Settings(BaseSettings):
 
     app_name: str = "{{ cookiecutter.service_name }}"
     port: int = {{ cookiecutter.port }}
-    db_path: str = "{{ cookiecutter.db_path }}"
+
+    db_host: str = "localhost"
+    db_port: int = 5432
+    db_user: str = "service_user"
+    db_password: str = "change_me"
+    db_name: str = "service_db"
+
     auth_service_url: str = "{{ cookiecutter.auth_service_url }}"
     identity_service_url: str = "{{ cookiecutter.identity_service_url }}"
 

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-auth-service/cookiecutter.json

@@ -1,7 +1,6 @@
 {
   "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.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

@@ -1,16 +1,23 @@
+# Auth service dependencies
 from collections.abc import AsyncIterator
 from typing import Annotated
 
 from fastapi import Depends
 
-from csrd.repository import SQLiteAdapter
+from csrd.repository import PGAdapter
 
 from ..repositories.token_repository import TokenRepository
 from ..settings import settings
 
 
 async def token_repository_factory() -> AsyncIterator[TokenRepository]:
-    adapter = SQLiteAdapter(settings.db_path)
+    adapter = PGAdapter(
+        host=settings.db_host,
+        port=settings.db_port,
+        user=settings.db_user,
+        password=settings.db_password,
+        database=settings.db_name,
+    )
     await adapter.connect()
     repo = TokenRepository(adapter)
     await repo._init_schema()

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/repositories/token_repository.py

@@ -26,7 +26,8 @@ class TokenRepository(BaseRepository):
         issued_at = datetime.now(UTC).isoformat()
         await self._init_schema()
         await self.execute(
-            "INSERT OR REPLACE INTO issued_tokens (token, subject, issued_at) "
-            "VALUES (:token, :subject, :issued_at)",
+            "INSERT INTO issued_tokens (token, subject, issued_at) "
+            "VALUES (%(token)s, %(subject)s, %(issued_at)s) "
+            "ON CONFLICT (token) DO UPDATE SET subject = EXCLUDED.subject, issued_at = EXCLUDED.issued_at",
             {"token": token, "subject": subject, "issued_at": issued_at},
         )

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-auth-service/{{cookiecutter.__service_name_snake}}/requirements.txt

@@ -3,7 +3,7 @@ uvicorn[standard]>=0.30,<1
 pyjwt>=2.8,<3
 pydantic-settings>=2.6,<3
 httpx>=0.27,<1
-aiosqlite>=0.21,<1
+psycopg[binary]>=3.1,<4
 csrd-versioning>=0.1.0,<1
 csrd-repository>=0.1.0,<1
 csrd-auth>=0.1.0,<1

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

@@ -13,8 +13,13 @@ class Settings(BaseSettings):
     jwt_audience: str = "cluster"
     jwt_ttl_seconds: int = 3600
 
-    db_path: str = "{{ cookiecutter.db_path }}"
     identity_service_url: str = "{{ cookiecutter.identity_service_url }}"
 
+    db_host: str = "localhost"
+    db_port: int = 5432
+    db_user: str = "service_user"
+    db_password: str = "change_me"
+    db_name: str = "service_db"
+
 
 settings = Settings()

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

@@ -6,7 +6,6 @@ from fastapi import APIRouter, HTTPException, Request
 
 from csrd.auth import JWTAuthenticator, StaticKeyProvider
 
-from ...dependencies import TokenRepositoryDep
 from ...models import TokenRequest, TokenResponse, TokenVerifyResponse, VerifyClaims, VerifyRequest
 from ...settings import settings
 
@@ -48,9 +47,7 @@ async def _validate_credentials(username: str, password: str) -> list[str]:
 
 
 @router.post("/token", response_model=TokenResponse)
-async def issue_token(
-    payload: TokenRequest, token_repo: TokenRepositoryDep
-) -> TokenResponse:
+async def issue_token(payload: TokenRequest) -> TokenResponse:
     roles = await _validate_credentials(payload.username, payload.password)
 
     now = datetime.now(UTC)
@@ -64,7 +61,6 @@ async def issue_token(
         "roles": roles,
     }
     token = jwt.encode(claims, settings.jwt_secret, algorithm=settings.jwt_algorithm)
-    await token_repo.record_issued_token(token=token, subject=payload.username)
     return TokenResponse(
         access_token=token, token_type="bearer", expires_in=settings.jwt_ttl_seconds
     )

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-identity-service/cookiecutter.json

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

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/dependencies/__init__.py

@@ -3,14 +3,20 @@ from typing import Annotated
 
 from fastapi import Depends
 
-from csrd.repository import SQLiteAdapter
+from csrd.repository import PGAdapter
 
 from ..repositories.user_repository import UserRepository
 from ..settings import settings
 
 
 async def user_repository_factory() -> AsyncIterator[UserRepository]:
-    adapter = SQLiteAdapter(settings.db_path)
+    adapter = PGAdapter(
+        host=settings.db_host,
+        port=settings.db_port,
+        user=settings.db_user,
+        password=settings.db_password,
+        database=settings.db_name,
+    )
     await adapter.connect()
     repo = UserRepository(adapter)
     await repo._init_schema()

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/repositories/user_repository.py

@@ -49,7 +49,7 @@ class UserRepository(BaseRepository):
         created_at = datetime.now(UTC).isoformat()
         await self._init_schema()
         await self.execute(
-            "INSERT INTO users (id, username, created_at) VALUES (:id, :username, :created_at)",
+            "INSERT INTO users (id, username, created_at) VALUES (%(id)s, %(username)s, %(created_at)s)",
             {"id": user_id, "username": username, "created_at": created_at},
         )
         return {"id": user_id, "username": username, "created_at": created_at}
@@ -57,7 +57,7 @@ class UserRepository(BaseRepository):
     async def get_user(self, user_id: str) -> dict[str, str] | None:
         await self._init_schema()
         row = await self.fetch_one(
-            "SELECT id, username, created_at FROM users WHERE id = :id",
+            "SELECT id, username, created_at FROM users WHERE id = %(id)s",
             {"id": user_id},
         )
         if row is None:
@@ -71,7 +71,7 @@ class UserRepository(BaseRepository):
     async def get_roles(self, user_id: str) -> list[str]:
         await self._init_schema()
         rows = await self.fetch_all(
-            "SELECT role FROM user_roles WHERE user_id = :user_id",
+            "SELECT role FROM user_roles WHERE user_id = %(user_id)s",
             {"user_id": user_id},
         )
         return [str(row["role"]) for row in rows]
@@ -79,7 +79,8 @@ class UserRepository(BaseRepository):
     async def assign_role(self, user_id: str, role: str) -> None:
         await self._init_schema()
         await self.execute(
-            "INSERT OR IGNORE INTO user_roles (user_id, role) VALUES (:user_id, :role)",
+            "INSERT INTO user_roles (user_id, role) VALUES (%(user_id)s, %(role)s) "
+            "ON CONFLICT (user_id, role) DO NOTHING",
             {"user_id": user_id, "role": role},
         )
 
@@ -88,7 +89,7 @@ class UserRepository(BaseRepository):
         row = await self.fetch_one(
             "SELECT u.id, u.username, u.created_at FROM users u "
             "JOIN user_credentials c ON c.user_id = u.id "
-            "WHERE u.username = :username AND c.password_hash = :password_hash",
+            "WHERE u.username = %(username)s AND c.password_hash = %(password_hash)s",
             {"username": username, "password_hash": self._hash_password(username, password)},
         )
         if row is None:
@@ -105,7 +106,7 @@ class UserRepository(BaseRepository):
     async def signup(self, username: str, password: str) -> dict[str, str]:
         await self._init_schema()
         existing = await self.fetch_one(
-            "SELECT id FROM users WHERE username = :username",
+            "SELECT id FROM users WHERE username = %(username)s",
             {"username": username},
         )
         if existing is not None:
@@ -114,7 +115,7 @@ class UserRepository(BaseRepository):
         user = await self.create_user(username)
         await self.execute(
             "INSERT INTO user_credentials (user_id, password_hash) "
-            "VALUES (:user_id, :password_hash)",
+            "VALUES (%(user_id)s, %(password_hash)s)",
             {
                 "user_id": user["id"],
                 "password_hash": self._hash_password(username, password),

{csrd_utils-0.3.78 → csrd_utils-0.3.80}/src/csrd_utils/templates/platform-identity-service/{{cookiecutter.__service_name_snake}}/requirements.txt

@@ -1,6 +1,6 @@
 fastapi>=0.115,<1
 uvicorn[standard]>=0.30,<1
 pydantic-settings>=2.6,<3
-aiosqlite>=0.21,<1
+psycopg[binary]>=3.1,<4
 csrd-versioning>=0.1.0,<1
 csrd-repository>=0.1.0,<1

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

@@ -6,7 +6,12 @@ class Settings(BaseSettings):
 
     app_name: str = "{{ cookiecutter.service_name }}"
     port: int = {{ cookiecutter.port }}
-    db_path: str = "{{ cookiecutter.db_path }}"
+
+    db_host: str = "localhost"
+    db_port: int = 5432
+    db_user: str = "service_user"
+    db_password: str = "change_me"
+    db_name: str = "service_db"
 
 
 settings = Settings()