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

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

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

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

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

@@ -1159,7 +1159,7 @@ def main() -> int:
             workspace_root = _ensure_workspace_for_output(
                 service_config["output_dir"], allow_prompt=_service_is_interactive(args)
             )
-            service_config["output_dir"] = _workspace_services_dir(workspace_root)
+            service_config["output_dir"] = workspace_root
             generated = generate_service(**service_config)
             generated_cluster = _maybe_update_workspace_cluster(
                 workspace_root, service_config, generated
@@ -1205,9 +1205,9 @@ def main() -> int:
             generate_mode = workspace_config["generate"]
             if generate_mode == "service":
                 service_config = _collect_new_service_config(
-                    _default_service_namespace(_workspace_services_dir(workspace_root))
+                    _default_service_namespace(workspace_root)
                 )
-                service_config["output_dir"] = _workspace_services_dir(workspace_root)
+                service_config["output_dir"] = workspace_root
                 generated_service = generate_service(**service_config)
                 generated_cluster = _maybe_update_workspace_cluster(
                     workspace_root, service_config, generated_service

{csrd_utils-0.3.38 → csrd_utils-0.3.40}/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.replace("-", "_")
+    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.38 → csrd_utils-0.3.40}/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"src/{PKG}/dependencies/item_repository.py")
-        _unlink(f"src/{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"src/{PKG}/dependencies/delegates.py")
-        _unlink(f"src/{PKG}/delegates/upstreams.py")
+        _unlink("dependencies/delegates.py")
+        _unlink("delegates/upstreams.py")
         _unlink("tests/unit/test_delegates.py")
 
     if not HAS_WORKERS:
-        _unlink(f"src/{PKG}/dependencies/worker_broker.py")
-        _unlink(f"src/{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"src/{PKG}/cache.py")
+        _unlink("cache.py")
         _unlink("tests/unit/test_cache.py")
 
     if not HAS_STRUCTURED_LOGGING:
-        _unlink(f"src/{PKG}/middleware/logging.py")
+        _unlink("middleware/logging.py")
         _unlink("tests/acceptance/test_logging_middleware.py")
 
-    _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("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.38 → csrd_utils-0.3.40}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.__service_name_snake}}/Dockerfile

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