csrd-utils 0.3.20__tar.gz → 0.3.22__tar.gz

{csrd_utils-0.3.20 → csrd_utils-0.3.22}/PKG-INFO

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

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

{csrd_utils-0.3.20 → csrd_utils-0.3.22}/src/csrd_utils/__main__.py

@@ -475,14 +475,27 @@ def _service_config_to_cluster_service(config: GenerateServiceArgs) -> ServiceSp
 
 
 def _append_service_to_workspace_cluster(
-    workspace_root: Path, config: GenerateServiceArgs
+    workspace_root: Path, config: GenerateServiceArgs, overwrite: bool = False
 ) -> ClusterSpec:
     spec = _load_workspace_cluster_spec(workspace_root)
-    service_names = {str(service.get("name", "")).strip() for service in spec.get("services", [])}
-    if config["name"] in service_names:
+    new_service = _service_config_to_cluster_service(config)
+    services = spec.get("services", [])
+    existing_idx = next(
+        (
+            idx
+            for idx, service in enumerate(services)
+            if str(service.get("name", "")).strip() == config["name"]
+        ),
+        None,
+    )
+
+    if existing_idx is None:
+        services.append(new_service)
+    elif overwrite:
+        services[existing_idx] = new_service
+    else:
         raise ValueError(f"Service '{config['name']}' already exists in workspace cluster spec")
 
-    spec["services"].append(_service_config_to_cluster_service(config))
     normalized = normalize_cluster_spec(spec)
     _save_workspace_cluster_spec(workspace_root, normalized)
     return normalized
@@ -614,7 +627,11 @@ def _maybe_update_workspace_cluster(
 ) -> Path | None:
     spec_path = _workspace_cluster_spec_path(workspace_root)
     if spec_path.is_file():
-        updated_spec = _append_service_to_workspace_cluster(workspace_root, service_config)
+        updated_spec = _append_service_to_workspace_cluster(
+            workspace_root,
+            service_config,
+            overwrite=service_config["overwrite_if_exists"],
+        )
         return generate_cluster(updated_spec, workspace_root, force=True, workspace_mode=True)
 
     service_roots = _workspace_service_roots(workspace_root)

csrd_utils-0.3.22/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/test_items.py

@@ -0,0 +1,182 @@
+"""Tests for {{ cookiecutter.service_name }} starter endpoints."""
+
+from fastapi import HTTPException
+
+
+def test_health(client):
+    response = client.get("/health")
+    assert response.status_code == 200
+    assert response.json() == {"status": "ok", "service": "{{ cookiecutter.service_name }}"}
+
+
+{%- if cookiecutter.has_database or not cookiecutter.has_delegates %}
+def test_create_item_returns_data(client):
+    create_response = client.post(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Test Item"}
+    )
+    assert create_response.status_code == 200
+    item = create_response.json()
+    assert item["name"] == "Test Item"
+    assert "id" in item
+    assert "created_at" in item
+
+
+def test_list_items(client):
+    client.post("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Item 1"})
+    client.post("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Item 2"})
+
+    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}")
+    assert response.status_code == 200
+    items = response.json()["{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}"]
+    names = {item["name"] for item in items}
+    assert "Item 1" in names
+    assert "Item 2" in names
+
+
+def test_get_item_missing_returns_404(client):
+    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/missing-id")
+    assert response.status_code == 404
+
+
+def test_get_item_returns_created_item(client):
+    created = client.post(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Lookup"}
+    ).json()
+    response = client.get(
+        f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{created['id']}"
+    )
+    assert response.status_code == 200
+    assert response.json()["id"] == created["id"]
+    assert response.json()["name"] == "Lookup"
+
+
+def test_update_and_delete_item(client):
+    created = client.post(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Original"}
+    ).json()
+    item_id = created["id"]
+
+    updated = client.put(
+        f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}",
+        json={"name": "Updated"},
+    )
+    assert updated.status_code == 200
+    assert updated.json()["updated"] is True
+
+    deleted = client.delete(f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}")
+    assert deleted.status_code == 200
+    assert deleted.json()["deleted"] is True
+
+
+def test_upsert_item(client):
+    item_id = "custom-upsert-id"
+    first = client.put(
+        f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}/upsert",
+        json={"name": "Created"},
+    )
+    assert first.status_code == 200
+    assert first.json()["rows_affected"] == 1
+
+    second = client.put(
+        f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}/upsert",
+        json={"name": "Updated"},
+    )
+    assert second.status_code == 200
+    assert second.json()["rows_affected"] == 1
+
+
+def test_update_missing_returns_404(client):
+    response = client.put(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/missing-id",
+        json={"name": "Nope"},
+    )
+    assert response.status_code == 404
+
+
+def test_delete_missing_returns_404(client):
+    response = client.delete(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/missing-id"
+    )
+    assert response.status_code == 404
+{%- endif %}
+
+
+{%- if cookiecutter.has_delegates and not cookiecutter.has_database %}
+def test_delegate_create_and_list(monkeypatch, client):
+    calls: list[tuple[str, str]] = []
+
+    async def fake_delegate_request(method: str, path: str, payload=None):
+        calls.append((method, path))
+        if method == "POST":
+            return {"id": "d1", "name": payload["name"], "created_at": "2026-01-01T00:00:00Z"}
+        return {"{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}": [{"id": "d1", "name": "X", "created_at": "t"}]}
+
+    monkeypatch.setattr("app.views.unversioned.items_view._delegate_request", fake_delegate_request)
+
+    created = client.post(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "X"}
+    )
+    assert created.status_code == 200
+    assert created.json()["id"] == "d1"
+
+    listed = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}")
+    assert listed.status_code == 200
+    assert len(listed.json()["{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}"]) == 1
+    assert calls[0][0] == "POST"
+    assert calls[1][0] == "GET"
+
+
+def test_delegate_error_mapping(monkeypatch, client):
+    async def fake_delegate_request(_method: str, _path: str, payload=None):
+        raise HTTPException(status_code=404, detail="not found")
+
+    monkeypatch.setattr("app.views.unversioned.items_view._delegate_request", fake_delegate_request)
+    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/missing")
+    assert response.status_code == 404
+
+
+def test_delegate_get_update_upsert_delete(monkeypatch, client):
+    async def fake_delegate_request(method: str, path: str, payload=None):
+        if method == "GET":
+            return {"id": "d2", "name": "From delegate", "created_at": "2026-01-01T00:00:00Z"}
+        if method == "PUT" and path.endswith("/upsert"):
+            return {"id": "d2", "name": payload["name"], "rows_affected": 1}
+        if method == "PUT":
+            return {"id": "d2", "name": payload["name"], "updated": True}
+        if method == "DELETE":
+            return {"id": "d2", "deleted": True}
+        return {}
+
+    monkeypatch.setattr("app.views.unversioned.items_view._delegate_request", fake_delegate_request)
+
+    fetched = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/d2")
+    assert fetched.status_code == 200
+    assert fetched.json()["id"] == "d2"
+
+    updated = client.put(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/d2",
+        json={"name": "Updated"},
+    )
+    assert updated.status_code == 200
+    assert updated.json()["updated"] is True
+
+    upserted = client.put(
+        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/d2/upsert",
+        json={"name": "Upserted"},
+    )
+    assert upserted.status_code == 200
+    assert upserted.json()["rows_affected"] == 1
+
+    deleted = client.delete("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/d2")
+    assert deleted.status_code == 200
+    assert deleted.json()["deleted"] is True
+
+
+def test_delegate_list_invalid_payload_returns_502(monkeypatch, client):
+    async def fake_delegate_request(_method: str, _path: str, payload=None):
+        return {"{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}": "bad"}
+
+    monkeypatch.setattr("app.views.unversioned.items_view._delegate_request", fake_delegate_request)
+    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}")
+    assert response.status_code == 502
+{%- endif %}

csrd_utils-0.3.22/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_cache.py

@@ -0,0 +1,31 @@
+"""Unit tests for cache dependency wiring."""
+
+import importlib
+
+from app.cache import build_cache_client
+
+
+def test_cache_client_uses_configured_host() -> None:
+    cache_client = build_cache_client()
+    host = cache_client.connection_pool.connection_kwargs.get("host")
+    assert host in {"localhost", "redis"}
+
+
+def test_cache_client_uses_decode_responses() -> None:
+    cache_client = build_cache_client()
+    assert cache_client.connection_pool.connection_kwargs.get("decode_responses") is True
+
+
+def test_cache_client_uses_runtime_cache_url() -> None:
+    settings_mod = importlib.import_module("app.settings")
+    original = settings_mod.settings.cache_url
+    try:
+        settings_mod.settings.cache_url = "redis://cache-host:6381/2"
+        cache_client = build_cache_client()
+        kwargs = cache_client.connection_pool.connection_kwargs
+        assert kwargs.get("host") == "cache-host"
+        assert kwargs.get("port") == 6381
+        assert kwargs.get("db") == 2
+    finally:
+        settings_mod.settings.cache_url = original
+

{csrd_utils-0.3.20 → csrd_utils-0.3.22}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_delegates.py

@@ -3,6 +3,7 @@
 import asyncio
 
 from app.dependencies.delegates import upstream_delegate_factory
+from app.delegates.upstreams import configured_upstreams
 
 
 async def _collect_upstreams() -> list[str]:
@@ -15,3 +16,11 @@ def test_upstream_delegate_factory_returns_urls() -> None:
     upstreams = asyncio.run(_collect_upstreams())
     assert upstreams
     assert all(url.startswith("http") for url in upstreams)
+
+
+def test_configured_upstreams_strips_and_filters() -> None:
+    upstreams = configured_upstreams()
+    assert upstreams
+    assert all(entry == entry.strip() for entry in upstreams)
+    assert all(entry for entry in upstreams)
+

csrd_utils-0.3.22/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_worker_broker.py

@@ -0,0 +1,26 @@
+"""Unit tests for worker broker dependency wiring."""
+
+import importlib
+
+from app.dependencies.worker_broker import get_worker_broker_url
+from app.workers.tasks import ping_task
+
+
+def test_worker_broker_url_uses_expected_scheme() -> None:
+    broker_url = get_worker_broker_url()
+    assert broker_url.startswith(("redis://", "amqp://"))
+
+
+def test_ping_task_returns_pong() -> None:
+    assert ping_task() == "pong"
+
+
+def test_worker_broker_url_reflects_runtime_settings() -> None:
+    settings_mod = importlib.import_module("app.settings")
+    original = settings_mod.settings.worker_broker_url
+    try:
+        settings_mod.settings.worker_broker_url = "amqp://runtime-test"
+        assert get_worker_broker_url() == "amqp://runtime-test"
+    finally:
+        settings_mod.settings.worker_broker_url = original
+

csrd_utils-0.3.20/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/test_items.py

@@ -1,55 +0,0 @@
-"""Tests for {{ cookiecutter.service_name }} starter endpoints."""
-
-
-def test_health(client):
-    response = client.get("/health")
-    assert response.status_code == 200
-    assert response.json() == {"status": "ok", "service": "{{ cookiecutter.service_name }}"}
-
-
-{%- if cookiecutter.has_database or not cookiecutter.has_delegates %}
-def test_create_item_returns_data(client):
-    create_response = client.post(
-        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Test Item"}
-    )
-    assert create_response.status_code == 200
-    item = create_response.json()
-    assert item["name"] == "Test Item"
-    assert "id" in item
-    assert "created_at" in item
-
-
-def test_list_items(client):
-    client.post("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Item 1"})
-    client.post("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Item 2"})
-
-    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}")
-    assert response.status_code == 200
-    items = response.json()["{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}"]
-    names = {item["name"] for item in items}
-    assert "Item 1" in names
-    assert "Item 2" in names
-
-
-def test_get_item_missing_returns_404(client):
-    response = client.get("/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/missing-id")
-    assert response.status_code == 404
-
-
-def test_update_and_delete_item(client):
-    created = client.post(
-        "/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}", json={"name": "Original"}
-    ).json()
-    item_id = created["id"]
-
-    updated = client.put(
-        f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}",
-        json={"name": "Updated"},
-    )
-    assert updated.status_code == 200
-    assert updated.json()["updated"] is True
-
-    deleted = client.delete(f"/api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{item_id}")
-    assert deleted.status_code == 200
-    assert deleted.json()["deleted"] is True
-{%- endif %}

csrd_utils-0.3.20/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_cache.py

@@ -1,9 +0,0 @@
-"""Unit tests for cache dependency wiring."""
-
-from app.cache import build_cache_client
-
-
-def test_cache_client_uses_configured_host() -> None:
-    cache_client = build_cache_client()
-    host = cache_client.connection_pool.connection_kwargs.get("host")
-    assert host in {"localhost", "redis"}

csrd_utils-0.3.20/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_worker_broker.py

@@ -1,8 +0,0 @@
-"""Unit tests for worker broker dependency wiring."""
-
-from app.dependencies.worker_broker import get_worker_broker_url
-
-
-def test_worker_broker_url_uses_expected_scheme() -> None:
-    broker_url = get_worker_broker_url()
-    assert broker_url.startswith(("redis://", "amqp://"))