csrd-utils 0.3.37__tar.gz → 0.3.39__tar.gz

{csrd_utils-0.3.37 → csrd_utils-0.3.39}/PKG-INFO

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

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

{csrd_utils-0.3.37 → csrd_utils-0.3.39}/src/csrd_utils/augmentor.py

@@ -39,14 +39,27 @@ class ServiceAugmentor:
 
     @property
     def _pkg_dir(self) -> Path:
-        """Return the service package directory (flat layout: <service_root>/<pkg>)."""
+        """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 != "tests"
+                and p.name not in {"tests", "src"}
                 and (p / "__init__.py").is_file()
             ),
             None,

{csrd_utils-0.3.37 → csrd_utils-0.3.39}/src/csrd_utils/doctor.py

@@ -37,18 +37,30 @@ 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")
 
-    # Find the service package dir (flat layout: <service_root>/<pkg>/__init__.py)
-    pkg_dir = next(
-        (
-            p
-            for p in root.iterdir()
-            if p.is_dir()
-            and not p.name.startswith(".")
-            and p.name not in {"tests"}
-            and (p / "__init__.py").is_file()
-        ),
-        None,
-    )
+    # 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:

{csrd_utils-0.3.37 → csrd_utils-0.3.39}/src/csrd_utils/generator.py

@@ -66,8 +66,9 @@ def generate_service(
 ) -> Path:
     """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
+    src_dir = output_root / "src"
+    src_dir.mkdir(parents=True, exist_ok=True)
+    target = src_dir / name.replace("-", "_")
 
     if target.exists() and any(target.iterdir()) and not overwrite_if_exists:
         raise FileExistsError(
@@ -104,7 +105,7 @@ def generate_service(
                 str(template),
                 no_input=True,
                 extra_context=context,
-                output_dir=str(output_root),
+                output_dir=str(src_dir),
                 overwrite_if_exists=overwrite_if_exists,
             )
     finally:
@@ -118,4 +119,35 @@ def generate_service(
     for pycache_dir in generated_path.rglob("__pycache__"):
         shutil.rmtree(pycache_dir, ignore_errors=True)
 
+    # Move docker files to workspace root and update Dockerfile
+    _move_docker_files_to_workspace_root(generated_path, output_root, name)
+
     return generated_path
+
+
+def _move_docker_files_to_workspace_root(
+    service_path: Path, workspace_root: Path, service_name: str
+) -> None:
+    """Move docker-compose.yml and Dockerfile to workspace root, updating paths in Dockerfile."""
+    service_name_snake = service_name.replace("-", "_")
+
+    # Move docker-compose.yml to workspace root (create if doesn't exist)
+    docker_compose_src = service_path / "docker-compose.yml"
+    docker_compose_dst = workspace_root / "docker-compose.yml"
+    if docker_compose_src.exists():
+        if not docker_compose_dst.exists():
+            shutil.copy2(docker_compose_src, docker_compose_dst)
+        docker_compose_src.unlink()
+
+    # Move Dockerfile to workspace root as Dockerfile.{service_name}
+    dockerfile_src = service_path / "Dockerfile"
+    dockerfile_dst = workspace_root / f"Dockerfile.{service_name}"
+    if dockerfile_src.exists():
+        # Read and update the Dockerfile to account for workspace root context
+        dockerfile_content = dockerfile_src.read_text()
+        # Update COPY . to COPY src/{service_name}/
+        dockerfile_content = dockerfile_content.replace(
+            "COPY . /app", f"COPY src/{service_name_snake} /app"
+        )
+        dockerfile_dst.write_text(dockerfile_content)
+        dockerfile_src.unlink()

{csrd_utils-0.3.37 → csrd_utils-0.3.39}/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("dependencies/item_repository.py")
+        _unlink("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("dependencies/delegates.py")
+        _unlink("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("dependencies/worker_broker.py")
+        _unlink("workers/tasks.py")
         _unlink("tests/unit/test_worker_broker.py")
 
     if not HAS_CACHING:
-        _unlink(f"{PKG}/cache.py")
+        _unlink("cache.py")
         _unlink("tests/unit/test_cache.py")
 
     if not HAS_STRUCTURED_LOGGING:
-        _unlink(f"{PKG}/middleware/logging.py")
+        _unlink("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("repositories")
+    _rmdir_if_empty("delegates")
+    _rmdir_if_empty("workers")
+    _rmdir_if_empty("middleware")
     _rmdir_if_empty("tests/unit")
     _rmdir_if_empty("tests/acceptance")
 

{csrd_utils-0.3.37/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}} → csrd_utils-0.3.39/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}}/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app
 COPY requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir -r /app/requirements.txt
 
-COPY {{cookiecutter.__service_name_snake}} /app/{{cookiecutter.__service_name_snake}}
+COPY . /app
 
 ENV PORT={{ cookiecutter.port }}
 

{csrd_utils-0.3.37/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}} → csrd_utils-0.3.39/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}}/README.md

@@ -24,7 +24,7 @@
 ## Run locally
 
 ```bash
-uvicorn {{cookiecutter.__service_name_snake}}:build_app --factory --reload --port {{ cookiecutter.port }}
+PYTHONPATH=src uvicorn {{cookiecutter.__service_name_snake}}:build_app --factory --reload --port {{ cookiecutter.port }}
 ```
 
 ## Run with compose