csrd-utils 0.3.54__tar.gz → 0.3.56__tar.gz

{csrd_utils-0.3.54 → csrd_utils-0.3.56}/PKG-INFO

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

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

{csrd_utils-0.3.54 → csrd_utils-0.3.56}/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
@@ -331,7 +346,9 @@ def _collect_new_cluster_config(args: argparse.Namespace) -> GenerateClusterArgs
         )
 
     print("Interactive cluster mode: press Enter to accept defaults.")
-    cluster_name = _prompt_text("Cluster name", args.name or "my-cluster")
+    cluster_name = (
+        _prompt_text("Cluster name", args.name or "my-cluster") if not args.name else args.name
+    )
     preset = _prompt_choice("Preset", list(PRESETS.keys()), args.preset)
     services: list[ServiceSpec] = []
 
@@ -421,6 +438,70 @@ def _create_workspace(config: GenerateWorkspaceArgs) -> Path:
     return workspace_root
 
 
+def _generate_services_from_cluster_spec(
+    spec: ClusterSpec, workspace_root: Path, force: bool = False
+) -> list[Path]:
+    """Scaffold source trees for every service in a cluster spec that lacks one.
+
+    Derives generate_service arguments from each ServiceSpec so the resulting
+    workspace has src/<service>/ code alongside the compose wiring.
+    """
+
+    normalized = normalize_cluster_spec(spec)
+    services = normalized["services"]
+    port_map = {str(svc["name"]): int(svc["port"]) for svc in services}
+
+    generated: list[Path] = []
+    for service in services:
+        name = str(service["name"])
+        service_type = str(service["type"])
+        port = int(service["port"])
+        features = list(service.get("features", []))
+        delegates_list = list(service.get("delegates", []))
+        broker = str(service.get("broker", "redis"))
+
+        # Derive upstreams from delegate targets + their ports
+        upstreams = ",".join(f"http://{t}:{port_map[t]}" for t in delegates_list if t in port_map)
+
+        has_database = service_type == "db"
+        has_delegates = bool(delegates_list) or service_type == "delegate"
+        has_workers = service_type == "worker" or "workers" in features
+        has_caching = "caching" in features
+        has_structured_logging = "logging" in features
+        database = str(service.get("database", "sqlite")) if has_database else "sqlite"
+
+        src_dir = workspace_root / "src" / name.replace("-", "_")
+        if src_dir.exists() and any(src_dir.iterdir()) and not force:
+            print(f"Skipped existing service: {name}")
+            continue
+
+        try:
+            result = generate_service(
+                name=name,
+                output_dir=workspace_root,
+                description=f"{name} service",
+                port=port,
+                model_name="Item",
+                model_name_plural="items",
+                has_database=has_database,
+                database=database,
+                has_delegates=has_delegates,
+                upstreams=upstreams,
+                has_workers=has_workers,
+                broker=broker,
+                has_caching=has_caching,
+                cache_backend="redis",
+                has_structured_logging=has_structured_logging,
+                overwrite_if_exists=force,
+            )
+            generated.append(result)
+            print(f"Generated service: {name}")
+        except Exception as exc:
+            print(f"WARN: could not scaffold service '{name}': {exc}")
+
+    return generated
+
+
 def _default_service_namespace(output_dir: Path) -> argparse.Namespace:
     return argparse.Namespace(
         interactive=True,
@@ -446,7 +527,7 @@ def _default_service_namespace(output_dir: Path) -> argparse.Namespace:
 def _default_cluster_namespace(output_dir: Path) -> argparse.Namespace:
     return argparse.Namespace(
         spec=None,
-        name=None,
+        name=output_dir.name,  # Default cluster name to workspace folder name
         output=output_dir,
         preset="none",
         force=False,
@@ -461,6 +542,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
@@ -1262,7 +1359,14 @@ def main() -> int:
                     cluster_config["output_dir"],
                     force=cluster_config["overwrite_if_exists"],
                 )
-                print(f"Generated cluster at: {generated_cluster}")
+                _save_workspace_cluster_spec(workspace_root, cluster_config["spec"])
+                print(f"Generated cluster scaffold at: {generated_cluster}")
+                scaffolded = _generate_services_from_cluster_spec(
+                    cluster_config["spec"],
+                    workspace_root,
+                    force=cluster_config["overwrite_if_exists"],
+                )
+                print(f"Scaffolded {len(scaffolded)} service(s) under src/.")
         except (FileExistsError, FileNotFoundError, ValueError) as exc:
             print(f"ERROR: {exc}")
             return 1

{csrd_utils-0.3.54 → csrd_utils-0.3.56}/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