csrd-utils 0.3.52__tar.gz → 0.3.55__tar.gz

{csrd_utils-0.3.52 → csrd_utils-0.3.55}/PKG-INFO

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

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

{csrd_utils-0.3.52 → csrd_utils-0.3.55}/src/csrd_utils/__main__.py

@@ -213,12 +213,19 @@ def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs
         has_database = args.database != "none"
         selected_database = "sqlite" if not has_database else args.database
         normalized_name = _normalize_service_name(args.name)
+        # Auto-advance port when default (8080) is already taken in the workspace spec.
+        output_root = args.output.resolve()
+        effective_port = (
+            _next_free_port(output_root, args.port)
+            if _is_workspace(output_root) and args.port == 8080
+            else args.port
+        )
         return GenerateServiceArgs(
             {
                 "name": normalized_name,
                 "output_dir": args.output,
                 "description": args.description,
-                "port": args.port,
+                "port": effective_port,
                 "model_name": args.model_name,
                 "model_name_plural": args.model_name_plural,
                 "has_database": has_database,
@@ -242,7 +249,15 @@ def _collect_new_service_config(args: argparse.Namespace) -> GenerateServiceArgs
     else:
         output_dir = Path(_prompt_text("Output directory", str(args.output)))
     description = _prompt_text("Service description", args.description)
-    port = _prompt_int("HTTP port", args.port)
+
+    # Suggest the next available port based on what's already in the workspace spec.
+    workspace_root_candidate = output_dir.resolve()
+    default_port = (
+        _next_free_port(workspace_root_candidate, args.port)
+        if _is_workspace(workspace_root_candidate)
+        else args.port
+    )
+    port = _prompt_int("HTTP port", default_port)
     model_name = _prompt_text("Model name", args.model_name)
 
     plural_default = args.model_name_plural
@@ -461,6 +476,22 @@ def _is_workspace(path: Path) -> bool:
     return (path / WORKSPACE_MARKER).is_file()
 
 
+def _next_free_port(workspace_root: Path, start: int = 8080) -> int:
+    """Return the lowest port >= start that is not already used in the workspace cluster spec."""
+    spec_path = workspace_root / WORKSPACE_CLUSTER_SPEC
+    if not spec_path.is_file():
+        return start
+    try:
+        raw = yaml.safe_load(spec_path.read_text(encoding="utf-8")) or {}
+        used = {int(svc["port"]) for svc in raw.get("services", []) if "port" in svc}
+    except Exception:
+        return start
+    port = start
+    while port in used:
+        port += 1
+    return port
+
+
 def _service_is_interactive(args: argparse.Namespace) -> bool:
     explicit_interactive = getattr(args, "interactive", None)
     return bool(explicit_interactive) if explicit_interactive is not None else args.name is None
@@ -881,6 +912,37 @@ def _ensure_unique_ports(services: list[ServiceSpec], preserve_name: str) -> Non
         used.add(port)
 
 
+def _sync_workspace_service_feature(
+    workspace_root: Path, service_name: str, feature_name: str
+) -> Path | None:
+    spec = _load_workspace_cluster_spec(workspace_root)
+    services = spec.get("services", [])
+    target = next(
+        (
+            cast(ServiceSpec, dict(service))
+            for service in services
+            if str(service.get("name", "")).strip() == service_name
+        ),
+        None,
+    )
+    if target is None:
+        return None
+
+    features = list(target.get("features", []))
+    if feature_name not in features:
+        features.append(feature_name)
+    target["features"] = features
+
+    requires = list(target.get("requires", []))
+    if feature_name in {"caching", "workers"} and "redis" not in requires:
+        requires.append("redis")
+    target["requires"] = requires
+
+    updated_spec = _upsert_workspace_service(spec, target, workspace_root.name)
+    _save_workspace_cluster_spec(workspace_root, updated_spec)
+    return generate_cluster(updated_spec, workspace_root, force=True)
+
+
 def _maybe_update_workspace_cluster(
     workspace_root: Path,
     service_config: GenerateServiceArgs,
@@ -1315,6 +1377,13 @@ def main() -> int:
     if args.plan:
         print("Plan validated.")
     else:
+        feature_workspace_root = _workspace_root_for_service(resolved_service)
+        if feature_workspace_root is not None:
+            refreshed_cluster = _sync_workspace_service_feature(
+                feature_workspace_root, resolved_service.name, args.feature
+            )
+            if refreshed_cluster is not None:
+                print(f"Refreshed cluster scaffold at: {refreshed_cluster}")
         print(f"Feature '{args.feature}' added.")
         if changes:
             for change in changes:

{csrd_utils-0.3.52 → csrd_utils-0.3.55}/src/csrd_utils/augmentor.py

@@ -80,6 +80,15 @@ class ServiceAugmentor:
             return workspace_root / "tests"
         return self.service_root / "tests"
 
+    @property
+    def _pkg_import_name(self) -> str:
+        return self._pkg_dir.name
+
+    def _rewrite_src_app_refs(self, content: str) -> str:
+        """Map legacy feature fragment imports to the concrete service package name."""
+        pkg = self._pkg_import_name
+        return content.replace("src.app.", f"{pkg}.").replace("src.app", pkg)
+
     def load_feature(self, feature_name: str) -> bool:
         """
         Load and validate feature manifest.
@@ -247,6 +256,11 @@ class ServiceAugmentor:
         if not fragment_path.exists():
             return True  # Not required
 
+        if self._workspace_root is not None:
+            # Workspace compose is generated from cluster spec, not merged via legacy fragments.
+            print("✓ Skipped docker-compose.yml fragment merge (workspace-managed compose)")
+            return True
+
         try:
             dc_path = self._docker_compose_path()
             self.backup_file(dc_path)
@@ -343,7 +357,7 @@ class ServiceAugmentor:
             self.backup_file(conftest_path)
 
             base = conftest_path.read_text()
-            fragment = fragment_path.read_text()
+            fragment = self._rewrite_src_app_refs(fragment_path.read_text())
             merged = ConfTestMerger.merge(base, fragment)
 
             conftest_path.write_text(merged)
@@ -387,8 +401,11 @@ class ServiceAugmentor:
                     # Create parent dirs
                     dest_file.parent.mkdir(parents=True, exist_ok=True)
 
-                    # Copy file
-                    shutil.copy2(src_file, dest_file)
+                    if src_file.suffix == ".py":
+                        rendered = self._rewrite_src_app_refs(src_file.read_text())
+                        dest_file.write_text(rendered)
+                    else:
+                        shutil.copy2(src_file, dest_file)
                     self.applied_changes.append(f"Created {rel_path}")
 
             print("✓ Created feature files")
@@ -433,7 +450,11 @@ class ServiceAugmentor:
                         dest_file = self._tests_dir / rel_path
 
                     dest_file.parent.mkdir(parents=True, exist_ok=True)
-                    shutil.copy2(src_file, dest_file)
+                    if src_file.suffix == ".py":
+                        rendered = self._rewrite_src_app_refs(src_file.read_text())
+                        dest_file.write_text(rendered)
+                    else:
+                        shutil.copy2(src_file, dest_file)
                     self.applied_changes.append(f"Created {rel_path}")
 
             print("✓ Created test files")

{csrd_utils-0.3.52 → csrd_utils-0.3.55}/src/csrd_utils/cluster.py

@@ -232,8 +232,14 @@ def _infer_infra(services: Iterable[ServiceSpec]) -> set[str]:
         if service_type == "worker":
             broker = service.get("broker", "redis")
             infra.add("redis" if broker == "redis" else "rabbitmq")
+        if "workers" in service.get("features", []):
+            broker = service.get("broker", "redis")
+            infra.add("redis" if broker == "redis" else "rabbitmq")
         if "caching" in service.get("features", []):
             infra.add("redis")
+        for required in service.get("requires", []):
+            if required in INFRA_NAMES:
+                infra.add(required)
     return infra
 
 
@@ -258,7 +264,7 @@ def _service_environment(service: ServiceSpec, services: list[ServiceSpec]) -> d
             env["DB_PASSWORD"] = "${DB_PASSWORD:-change_me}"
             env["DB_NAME"] = "${DB_NAME:-service_db}"
 
-    if service["type"] == "worker":
+    if service["type"] == "worker" or "workers" in service.get("features", []):
         broker = service.get("broker", "redis")
         if broker == "redis":
             env["CELERY_BROKER_URL"] = "redis://redis:6379/0"
@@ -306,6 +312,9 @@ def render_compose(spec: ClusterSpec) -> dict[str, Any]:
         if service["type"] == "worker":
             requires.add("redis" if service.get("broker", "redis") == "redis" else "rabbitmq")
 
+        if "workers" in service.get("features", []):
+            requires.add("redis" if service.get("broker", "redis") == "redis" else "rabbitmq")
+
         if "caching" in service.get("features", []):
             requires.add("redis")
 
@@ -432,14 +441,14 @@ def _build_readme(spec: ClusterSpec) -> str:
             "From the workspace root, run all tests:",
             "",
             "```bash",
-            "pytest",
+            "uv run pytest",
             "```",
             "",
             "Run tests for a specific service:",
             "",
             "```bash",
-            "pytest tests/unit/{service_name}",
-            "pytest tests/acceptance/{service_name}",
+            "uv run pytest tests/unit/{service_name}",
+            "uv run pytest tests/acceptance/{service_name}",
             "```",
             "",
             "## Run",

{csrd_utils-0.3.52 → csrd_utils-0.3.55}/src/csrd_utils/generator.py

@@ -49,6 +49,7 @@ dev = [
 asyncio_mode = "auto"
 testpaths = ["tests"]
 pythonpath = ["src"]
+consider_namespace_packages = true
 
 [tool.mypy]
 python_version = "3.12"
@@ -289,6 +290,19 @@ def _move_tests_to_workspace_root(
     unit_dst.mkdir(parents=True, exist_ok=True)
     acceptance_dst.mkdir(parents=True, exist_ok=True)
 
+    # Ensure every test directory level has an __init__.py so pytest uses
+    # package-based import paths and avoids module-name collisions across services.
+    def _ensure_init(dir_path: Path) -> None:
+        init = dir_path / "__init__.py"
+        if not init.exists():
+            init.write_text("", encoding="utf-8")
+
+    _ensure_init(tests_root)
+    _ensure_init(tests_root / "unit")
+    _ensure_init(tests_root / "acceptance")
+    _ensure_init(unit_dst)
+    _ensure_init(acceptance_dst)
+
     def _copy_tree(src_dir: Path, dst_dir: Path) -> None:
         if not src_dir.is_dir():
             return