PyPI - csrd-utils - Versions diffs - 0.3.10__tar.gz → 0.3.12__tar.gz - Mend

@@ -4,6 +4,7 @@ from __future__ import annotations
 import argparse
 import json
+from contextlib import suppress
 from importlib.metadata import version
 from pathlib import Path
 from typing import TypedDict
@@ -75,6 +76,12 @@ def _prompt_int(label: str, default: int) -> int:
             print("ERROR: Enter a valid integer")
+def _print_cancelled() -> None:
+    # Avoid surfacing a traceback if a second Ctrl-C lands while printing.
+    with suppress(KeyboardInterrupt):
+        print("\nCancelled.")
 def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs:
     explicit_interactive = getattr(args, "interactive", None)
     is_explicit_interactive = explicit_interactive is True
@@ -386,7 +393,7 @@ def main() -> int:
             print(f"ERROR: {exc}")
             return 1
         except KeyboardInterrupt:
-            print("\nCancelled.")
+            _print_cancelled()
             return 1
         print(f"Generated service at: {generated}")
         return 0
@@ -399,11 +406,11 @@ def main() -> int:
                 cluster_config["output_dir"],
                 force=cluster_config["overwrite_if_exists"],
             )
-        except (FileExistsError, ValueError) as exc:
+        except (FileExistsError, FileNotFoundError, ValueError) as exc:
             print(f"ERROR: {exc}")
             return 1
         except KeyboardInterrupt:
-            print("\nCancelled.")
+            _print_cancelled()
             return 1
         print(f"Generated cluster at: {generated}")
         return 0

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.10
+Version: 0.3.12
 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

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

@@ -76,6 +76,8 @@ def _split_csv(raw: str) -> list[str]:
 def load_cluster_spec(spec_path: Path) -> ClusterSpec:
+    if not spec_path.is_file():
+        raise ValueError(f"Cluster spec file not found: {spec_path}")
     payload = yaml.safe_load(spec_path.read_text(encoding="utf-8"))
     if not isinstance(payload, dict):
         raise ValueError("Cluster spec must be a YAML object")

@@ -32,25 +32,32 @@ def _prune_disabled_files() -> None:
     if not HAS_DATABASE:
         _unlink("src/app/dependencies/item_repository.py")
         _unlink("src/app/repositories/item_repository.py")
+        _unlink("tests/unit/test_database_settings.py")
     if not HAS_DELEGATES:
         _unlink("src/app/dependencies/delegates.py")
         _unlink("src/app/delegates/upstreams.py")
+        _unlink("tests/unit/test_delegates.py")
     if not HAS_WORKERS:
         _unlink("src/app/dependencies/worker_broker.py")
         _unlink("src/app/workers/tasks.py")
+        _unlink("tests/unit/test_worker_broker.py")
     if not HAS_CACHING:
         _unlink("src/app/cache.py")
+        _unlink("tests/unit/test_cache.py")
     if not HAS_STRUCTURED_LOGGING:
         _unlink("src/app/middleware/logging.py")
+        _unlink("tests/acceptance/test_logging_middleware.py")
     _rmdir_if_empty("src/app/repositories")
     _rmdir_if_empty("src/app/delegates")
     _rmdir_if_empty("src/app/workers")
     _rmdir_if_empty("src/app/middleware")
+    _rmdir_if_empty("tests/unit")
+    _rmdir_if_empty("tests/acceptance")
 def main() -> int:

@@ -44,3 +44,14 @@ docker compose up --build
 - `PUT /api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{entity_id}`
 - `DELETE /api/{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}/{entity_id}`
 {%- endif %}
+## Generated tests
+- Acceptance tests live under `tests/acceptance/`
+- Unit tests live under `tests/unit/`
+- Feature-dependent tests are generated only when corresponding dependencies are enabled:
+  - database -> `tests/unit/test_database_settings.py`
+  - delegates -> `tests/unit/test_delegates.py`
+  - workers -> `tests/unit/test_worker_broker.py`
+  - caching -> `tests/unit/test_cache.py`
+  - structured logging -> `tests/acceptance/test_logging_middleware.py`

@@ -0,0 +1,7 @@
+"""Acceptance tests for structured logging middleware behavior."""
+def test_health_includes_request_duration_header(client) -> None:
+    response = client.get("/health")
+    assert response.status_code == 200
+    assert "X-Request-Duration-Ms" in response.headers

@@ -0,0 +1,9 @@
+"""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"}

@@ -0,0 +1,8 @@
+"""Unit tests for database settings wiring."""
+from app.settings import settings
+def test_database_settings_enabled() -> None:
+    assert settings.has_database is True
+    assert settings.db_kind in {"sqlite", "maria", "postgres"}

@@ -0,0 +1,17 @@
+"""Unit tests for delegate dependency wiring."""
+import asyncio
+from app.dependencies.delegates import upstream_delegate_factory
+async def _collect_upstreams() -> list[str]:
+    async for upstreams in upstream_delegate_factory():
+        return upstreams
+    return []
+def test_upstream_delegate_factory_returns_urls() -> None:
+    upstreams = asyncio.run(_collect_upstreams())
+    assert upstreams
+    assert all(url.startswith("http") for url in upstreams)

@@ -0,0 +1,8 @@
+"""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://"))

csrd-utils 0.3.10__tar.gz → 0.3.12__tar.gz

csrd-utils 0.3.10tar.gz → 0.3.12tar.gz