csrd-utils 0.3.36__tar.gz → 0.3.38__tar.gz

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/PKG-INFO

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

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

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/src/csrd_utils/__main__.py

@@ -580,6 +580,16 @@ def _append_service_to_workspace_cluster(
     return normalized
 
 
+def _is_service_root(path: Path) -> bool:
+    """Return True if path looks like a csrd service (flat layout)."""
+    return (
+        path.is_dir()
+        and (path / "requirements.txt").is_file()
+        and (path / "tests").is_dir()
+        and (path / "pyproject.toml").is_file()
+    )
+
+
 def _workspace_service_roots(workspace_root: Path) -> list[Path]:
     roots: set[Path] = set()
 
@@ -591,11 +601,7 @@ def _workspace_service_roots(workspace_root: Path) -> list[Path]:
                 continue
             if skip_names and child.name in skip_names:
                 continue
-            if (
-                (child / "src" / "app").is_dir()
-                and (child / "tests").is_dir()
-                and (child / "requirements.txt").is_file()
-            ):
+            if _is_service_root(child):
                 roots.add(child.resolve())
 
     services_root = _workspace_services_dir(workspace_root)
@@ -632,12 +638,12 @@ def _workspace_root_for_service(service_root: Path) -> Path | None:
 def _validate_service_root(service_root: Path) -> None:
     if not service_root.is_dir():
         raise ValueError(f"Service path is not a directory: {service_root}")
-    if not (service_root / "src" / "app").is_dir():
-        raise ValueError(f"Missing required directory: {service_root / 'src' / 'app'}")
     if not (service_root / "tests").is_dir():
         raise ValueError(f"Missing required directory: {service_root / 'tests'}")
     if not (service_root / "requirements.txt").is_file():
         raise ValueError(f"Missing required file: {service_root / 'requirements.txt'}")
+    if not (service_root / "pyproject.toml").is_file():
+        raise ValueError(f"Missing required file: {service_root / 'pyproject.toml'}")
 
 
 def _collect_workspace_extract_config(args: argparse.Namespace) -> ExtractWorkspaceServiceArgs:

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/src/csrd_utils/augmentor.py

@@ -37,6 +37,35 @@ class ServiceAugmentor:
         self.applied_changes: list[str] = []
         self.backups: dict[str, str] = {}
 
+    @property
+    def _pkg_dir(self) -> Path:
+        """Return the service package directory — src/ layout first, then flat."""
+        src_dir = self.service_root / "src"
+        if src_dir.is_dir():
+            candidate = next(
+                (
+                    p
+                    for p in src_dir.iterdir()
+                    if p.is_dir() and not p.name.startswith(".") and (p / "__init__.py").is_file()
+                ),
+                None,
+            )
+            if candidate is not None:
+                return candidate
+        # Flat layout fallback
+        candidate = next(
+            (
+                p
+                for p in self.service_root.iterdir()
+                if p.is_dir()
+                and not p.name.startswith(".")
+                and p.name not in {"tests", "src"}
+                and (p / "__init__.py").is_file()
+            ),
+            None,
+        )
+        return candidate if candidate is not None else self.service_root / "src" / "app"
+
     def load_feature(self, feature_name: str) -> bool:
         """
         Load and validate feature manifest.
@@ -72,14 +101,14 @@ class ServiceAugmentor:
         """
         Validate that service has required structure.
 
-        Checks for src/app/, docker-compose.yml, etc.
+        Checks for <pkg>/, docker-compose.yml, etc.
 
         Returns
         -------
         bool
             True if valid
         """
-        required_dirs = ["src/app", "tests"]
+        required_dirs = [str(self._pkg_dir.relative_to(self.service_root)), "tests"]
         required_files = ["requirements.txt"]
 
         for d in required_dirs:
@@ -245,7 +274,7 @@ class ServiceAugmentor:
             return True  # Not required
 
         try:
-            settings_path = self.service_root / "src/app/settings.py"
+            settings_path = self._pkg_dir / "settings.py"
             if not settings_path.exists():
                 print("⚠ settings.py not found, skipping")
                 return True
@@ -330,12 +359,11 @@ class ServiceAugmentor:
             return True
 
         try:
-            # Copy entire tree
+            # Copy entire tree into the service package directory
             for src_file in feature_dir.rglob("*"):
                 if src_file.is_file():
-                    # Map to destination
                     rel_path = src_file.relative_to(feature_dir)
-                    dest_file = self.service_root / "src" / "app" / rel_path
+                    dest_file = self._pkg_dir / rel_path
 
                     # Create parent dirs
                     dest_file.parent.mkdir(parents=True, exist_ok=True)
@@ -417,8 +445,13 @@ class ServiceAugmentor:
         # Step 2.5: Check if feature already applied (idempotency)
         creates = self.manifest.get("creates", [])
         if creates:
-            first_created_file = Path(creates[0])
-            full_path = self.service_root / first_created_file
+            first_created_path = Path(creates[0])
+            # Feature manifests use src/app/ prefix — remap to flat pkg layout
+            try:
+                rel = first_created_path.relative_to("src/app")
+                full_path = self._pkg_dir / rel
+            except ValueError:
+                full_path = self.service_root / first_created_path
             if full_path.exists():
                 print(f"✅ Feature '{feature_name}' already applied (detected {creates[0]})")
                 return True, []

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/src/csrd_utils/doctor.py

@@ -19,8 +19,8 @@ def run_doctor(service_root: Path) -> DoctorReport:
     errors: list[str] = []
     warnings: list[str] = []
 
-    required_dirs = ["src/app", "tests"]
-    required_files = ["requirements.txt"]
+    required_dirs = ["tests"]
+    required_files = ["requirements.txt", "pyproject.toml"]
 
     compose_candidates = [root / "docker-compose.yml"]
     if root.parent.name == "src" and (root.parent.parent / ".csrd-workspace").is_file():
@@ -37,10 +37,35 @@ def run_doctor(service_root: Path) -> DoctorReport:
     if not any(path.is_file() for path in compose_candidates):
         errors.append("Missing required file: docker-compose.yml")
 
-    marker_files = {
-        "src/app/settings.py": "# [INSERT: fields]",
-        "tests/conftest.py": "# [INSERT: fixtures]",
-    }
+    # Find the service package dir — check src/ layout first, then flat layout
+    src_dir = root / "src"
+    pkg_dir = None
+    if src_dir.is_dir():
+        pkg_dir = next(
+            (
+                p
+                for p in src_dir.iterdir()
+                if p.is_dir() and not p.name.startswith(".") and (p / "__init__.py").is_file()
+            ),
+            None,
+        )
+    if pkg_dir is None:
+        pkg_dir = next(
+            (
+                p
+                for p in root.iterdir()
+                if p.is_dir()
+                and not p.name.startswith(".")
+                and p.name not in {"tests", "src"}
+                and (p / "__init__.py").is_file()
+            ),
+            None,
+        )
+
+    marker_files: dict[str, str] = {}
+    if pkg_dir is not None:
+        marker_files[f"{pkg_dir.name}/settings.py"] = "# [INSERT: fields]"
+    marker_files["tests/conftest.py"] = "# [INSERT: fixtures]"
     for rel, marker in marker_files.items():
         path = root / rel
         if path.exists():

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/src/csrd_utils/generator.py

@@ -67,7 +67,7 @@ def generate_service(
     """Generate a service from the bundled cookiecutter-service template."""
     output_root = output_dir.resolve()
     output_root.mkdir(parents=True, exist_ok=True)
-    target = output_root / name
+    target = output_root / name.replace("-", "_")
 
     if target.exists() and any(target.iterdir()) and not overwrite_if_exists:
         raise FileExistsError(

{csrd_utils-0.3.36 → csrd_utils-0.3.38}/src/csrd_utils/templates/cookiecutter-service/hooks/post_gen_project.py

@@ -31,32 +31,32 @@ def _prune_disabled_files() -> None:
             path.rmdir()
 
     if not HAS_DATABASE:
-        _unlink(f"{PKG}/dependencies/item_repository.py")
-        _unlink(f"{PKG}/repositories/item_repository.py")
+        _unlink(f"src/{PKG}/dependencies/item_repository.py")
+        _unlink(f"src/{PKG}/repositories/item_repository.py")
         _unlink("tests/unit/test_database_settings.py")
 
     if not HAS_DELEGATES:
-        _unlink(f"{PKG}/dependencies/delegates.py")
-        _unlink(f"{PKG}/delegates/upstreams.py")
+        _unlink(f"src/{PKG}/dependencies/delegates.py")
+        _unlink(f"src/{PKG}/delegates/upstreams.py")
         _unlink("tests/unit/test_delegates.py")
 
     if not HAS_WORKERS:
-        _unlink(f"{PKG}/dependencies/worker_broker.py")
-        _unlink(f"{PKG}/workers/tasks.py")
+        _unlink(f"src/{PKG}/dependencies/worker_broker.py")
+        _unlink(f"src/{PKG}/workers/tasks.py")
         _unlink("tests/unit/test_worker_broker.py")
 
     if not HAS_CACHING:
-        _unlink(f"{PKG}/cache.py")
+        _unlink(f"src/{PKG}/cache.py")
         _unlink("tests/unit/test_cache.py")
 
     if not HAS_STRUCTURED_LOGGING:
-        _unlink(f"{PKG}/middleware/logging.py")
+        _unlink(f"src/{PKG}/middleware/logging.py")
         _unlink("tests/acceptance/test_logging_middleware.py")
 
-    _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(f"src/{PKG}/repositories")
+    _rmdir_if_empty(f"src/{PKG}/delegates")
+    _rmdir_if_empty(f"src/{PKG}/workers")
+    _rmdir_if_empty(f"src/{PKG}/middleware")
     _rmdir_if_empty("tests/unit")
     _rmdir_if_empty("tests/acceptance")
 

csrd_utils-0.3.38/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}/.cookiecutterignore

@@ -0,0 +1 @@
+.ruff_cache/

{csrd_utils-0.3.36/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}} → csrd_utils-0.3.38/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}}/Dockerfile

@@ -8,6 +8,6 @@ RUN pip install --no-cache-dir -r /app/requirements.txt
 COPY src /app/src
 
 ENV PYTHONPATH=/app/src
-ENV PORT=8080
+ENV PORT={{ cookiecutter.port }}
 
-CMD uvicorn app:build_app --factory --host 0.0.0.0 --port ${PORT}
+CMD uvicorn {{cookiecutter.__service_name_snake}}:build_app --factory --host 0.0.0.0 --port ${PORT}

{csrd_utils-0.3.36/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}} → csrd_utils-0.3.38/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}}/README.md

@@ -24,8 +24,7 @@
 ## Run locally
 
 ```bash
-pip install -r requirements.txt
-PYTHONPATH=src uvicorn app:build_app --factory --reload --port {{ cookiecutter.port }}
+PYTHONPATH=src uvicorn {{cookiecutter.__service_name_snake}}:build_app --factory --reload --port {{ cookiecutter.port }}
 ```
 
 ## Run with compose

csrd_utils-0.3.36/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/.env.example

@@ -1,44 +0,0 @@
-APP_NAME={{ cookiecutter.service_name }}
-PORT={{ cookiecutter.port }}
-APP_ENV=development
-ENFORCE_STRONG_DB_CREDENTIALS=false
-INCLUDE_ACTUATOR_ENDPOINTS=false
-
-{%- if cookiecutter.has_database %}
-DB_KIND={{ cookiecutter.database }}
-{%- if cookiecutter.database == "sqlite" %}
-DB_PATH=./service.db
-{%- elif cookiecutter.database == "maria" %}
-DB_HOST=localhost
-DB_PORT=3306
-DB_USER=service_user
-DB_PASSWORD=change_me
-DB_NAME=service_db
-MYSQL_ROOT_PASSWORD=change_me_root
-{%- else %}
-DB_HOST=localhost
-DB_PORT=5432
-DB_USER=service_user
-DB_PASSWORD=change_me
-DB_NAME=service_db
-{%- endif %}
-{%- endif %}
-
-{%- if cookiecutter.has_delegates %}
-# Comma-separated upstream service URLs.
-UPSTREAMS={{ cookiecutter.upstreams }}
-{%- endif %}
-
-{%- if cookiecutter.has_workers %}
-{%- if cookiecutter.broker == "redis" %}
-WORKER_BROKER_URL=redis://localhost:6380/1
-{%- else %}
-RABBITMQ_USER=service_rabbit
-RABBITMQ_PASSWORD=change_me
-WORKER_BROKER_URL=amqp://service_rabbit:change_me@localhost:5672/
-{%- endif %}
-{%- endif %}
-
-{%- if cookiecutter.has_caching %}
-CACHE_URL=redis://localhost:6379/0
-{%- endif %}

csrd_utils-0.3.36/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/.gitignore

@@ -1,64 +0,0 @@
-# Python
-__pycache__/
-*.py[cod]
-*$py.class
-*.so
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# Virtual environments
-.venv
-venv/
-ENV/
-env/
-
-# IDEs
-.vscode/
-.idea/
-*.swp
-*.swo
-*~
-.DS_Store
-
-# Testing
-.pytest_cache/
-.coverage
-htmlcov/
-.tox/
-.hypothesis/
-
-# Type checking
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Development
-*.log
-.env
-.env.local
-.env.*.local
-
-# Docker
-.dockerignore
-Dockerfile
-
-# Services
-.csrd-workspace
-.csrd/