csrd-utils 0.3.33__tar.gz → 0.3.35__tar.gz

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/PKG-INFO

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

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

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/cookiecutter.json

@@ -22,6 +22,8 @@
   "port": "8080",
   "model_name": "Item",
   "model_name_plural": "{{ cookiecutter.model_name.lower() }}s",
+  "service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}",
+  "service_name_pascal": "{{ cookiecutter.service_name | replace('-', ' ') | title | replace(' ', '') }}",
   "_service_name_snake": "{{ cookiecutter.service_name | replace('-', '_') }}",
   "_service_name_pascal": "{{ cookiecutter.service_name | replace('-', ' ') | title | replace(' ', '') }}"
 }

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/hooks/post_gen_project.py

@@ -14,6 +14,7 @@ DB_KIND = "{{ cookiecutter.database }}"
 BROKER = "{{ cookiecutter.broker }}"
 CACHE_BACKEND = "{{ cookiecutter.cache_backend }}"
 UPSTREAMS = "{{ cookiecutter.upstreams }}"
+PKG = "{{ cookiecutter.service_name_snake }}"
 
 
 def _prune_disabled_files() -> None:
@@ -30,32 +31,32 @@ def _prune_disabled_files() -> None:
             path.rmdir()
 
     if not HAS_DATABASE:
-        _unlink("src/app/dependencies/item_repository.py")
-        _unlink("src/app/repositories/item_repository.py")
+        _unlink(f"{PKG}/dependencies/item_repository.py")
+        _unlink(f"{PKG}/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(f"{PKG}/dependencies/delegates.py")
+        _unlink(f"{PKG}/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(f"{PKG}/dependencies/worker_broker.py")
+        _unlink(f"{PKG}/workers/tasks.py")
         _unlink("tests/unit/test_worker_broker.py")
 
     if not HAS_CACHING:
-        _unlink("src/app/cache.py")
+        _unlink(f"{PKG}/cache.py")
         _unlink("tests/unit/test_cache.py")
 
     if not HAS_STRUCTURED_LOGGING:
-        _unlink("src/app/middleware/logging.py")
+        _unlink(f"{PKG}/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(f"{PKG}/repositories")
+    _rmdir_if_empty(f"{PKG}/delegates")
+    _rmdir_if_empty(f"{PKG}/workers")
+    _rmdir_if_empty(f"{PKG}/middleware")
     _rmdir_if_empty("tests/unit")
     _rmdir_if_empty("tests/acceptance")
 

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/pyproject.toml

@@ -36,7 +36,7 @@ dev = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/app"]
+packages = ["{{cookiecutter.service_name_snake}}"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
@@ -58,4 +58,4 @@ select = ["E", "F", "W", "I", "N", "UP", "BLE", "FBT", "A", "C4", "PIE", "SIM",
 ignore = ["E501"]
 
 [tool.ruff.lint.isort]
-known-first-party = ["app"]
+known-first-party = ["{{cookiecutter.service_name_snake}}"]

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_cache.py

@@ -2,7 +2,7 @@
 
 import importlib
 
-from app.cache import build_cache_client
+from {{cookiecutter.service_name_snake}}.cache import build_cache_client
 
 
 def test_cache_client_uses_configured_host() -> None:
@@ -28,4 +28,3 @@ def test_cache_client_uses_runtime_cache_url() -> None:
         assert kwargs.get("db") == 2
     finally:
         settings_mod.settings.cache_url = original
-

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_database_settings.py

@@ -1,6 +1,6 @@
 """Unit tests for database settings wiring."""
 
-from app.settings import settings
+from {{cookiecutter.service_name_snake}}.settings import settings
 
 
 def test_database_settings_enabled() -> None:

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

@@ -2,8 +2,8 @@
 
 import asyncio
 
-from app.dependencies.delegates import upstream_delegate_factory
-from app.delegates.upstreams import configured_upstreams
+from {{cookiecutter.service_name_snake}}.dependencies.delegates import upstream_delegate_factory
+from {{cookiecutter.service_name_snake}}.delegates.upstreams import configured_upstreams
 
 
 async def _collect_upstreams() -> list[str]:
@@ -23,4 +23,3 @@ def test_configured_upstreams_strips_and_filters() -> None:
     assert upstreams
     assert all(entry == entry.strip() for entry in upstreams)
     assert all(entry for entry in upstreams)
-

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_settings_contracts.py

@@ -7,7 +7,7 @@ from types import SimpleNamespace
 
 import pytest
 
-from app.settings import Settings
+from {{cookiecutter.service_name_snake}}.settings import Settings
 
 
 def test_validate_db_credentials_returns_self_without_database() -> None:

{csrd_utils-0.3.33 → csrd_utils-0.3.35}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/tests/unit/test_worker_broker.py

@@ -2,8 +2,8 @@
 
 import importlib
 
-from app.dependencies.worker_broker import get_worker_broker_url
-from app.workers.tasks import ping_task
+from {{cookiecutter.service_name_snake}}.dependencies.worker_broker import get_worker_broker_url
+from {{cookiecutter.service_name_snake}}.workers.tasks import ping_task
 
 
 def test_worker_broker_url_uses_expected_scheme() -> None:
@@ -23,4 +23,3 @@ def test_worker_broker_url_reflects_runtime_settings() -> None:
         assert get_worker_broker_url() == "amqp://runtime-test"
     finally:
         settings_mod.settings.worker_broker_url = original
-

{csrd_utils-0.3.33/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/src/app → csrd_utils-0.3.35/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/{{cookiecutter.service_name_snake}}}/settings.py

@@ -69,7 +69,7 @@ class Settings(BaseSettings):
 
         weak_values = {
             "",
-            "app",
+            "{{cookiecutter.service_name_snake}}",
             "sandbox",
             "service_user",
             "service_db",

{csrd_utils-0.3.33/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/src/app → csrd_utils-0.3.35/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/{{cookiecutter.service_name_snake}}}/views/unversioned/__init__.py

@@ -1,7 +1,6 @@
 from fastapi import FastAPI
 
-from . import health_view
-from . import items_view
+from . import health_view, items_view
 
 unversioned_app = FastAPI(title="{{ cookiecutter.service_name }}")