csrd-utils 0.3.17__tar.gz → 0.3.18__tar.gz

{csrd_utils-0.3.17 → csrd_utils-0.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.17
+Version: 0.3.18
 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
@@ -70,19 +70,19 @@ csrd new workspace --name local-dev --output . --generate none
 csrd new service --name inventory --output ./local-dev --database postgres --workers
 
 # 1) Verify service compatibility
-csrd doctor --service ./local-dev/inventory
+csrd doctor --service ./local-dev/src/inventory
 
 # 1b) Audit for weak/insecure defaults
-csrd audit --service ./local-dev/inventory
+csrd audit --service ./local-dev/src/inventory
 
 # 2) Inspect available bundled features
 csrd feature list
 
 # 3) Dry-run a feature
-csrd feature plan workers --service ./local-dev/inventory
+csrd feature plan workers --service ./local-dev/src/inventory
 
 # 4) Apply feature files/merges
-csrd feature add workers --service ./local-dev/inventory
+csrd feature add workers --service ./local-dev/src/inventory
 
 # 5) Add a second service — workspace auto-upgrades to cluster
 csrd new service --name pricing --output ./local-dev --database postgres
@@ -135,8 +135,8 @@ Then run a clean smoke flow:
 mkdir -p /tmp/csrd-smoke
 csrd new workspace --name ws --output /tmp/csrd-smoke --generate none
 csrd new service --name demo-svc --output /tmp/csrd-smoke/ws --no-interactive
-csrd doctor --service /tmp/csrd-smoke/ws/demo-svc
-csrd audit --service /tmp/csrd-smoke/ws/demo-svc
-csrd feature plan workers --service /tmp/csrd-smoke/ws/demo-svc
-csrd feature add workers --service /tmp/csrd-smoke/ws/demo-svc
+csrd doctor --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd audit --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd feature plan workers --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd feature add workers --service /tmp/csrd-smoke/ws/src/demo-svc
 ```

{csrd_utils-0.3.17 → csrd_utils-0.3.18}/README.md

@@ -57,19 +57,19 @@ csrd new workspace --name local-dev --output . --generate none
 csrd new service --name inventory --output ./local-dev --database postgres --workers
 
 # 1) Verify service compatibility
-csrd doctor --service ./local-dev/inventory
+csrd doctor --service ./local-dev/src/inventory
 
 # 1b) Audit for weak/insecure defaults
-csrd audit --service ./local-dev/inventory
+csrd audit --service ./local-dev/src/inventory
 
 # 2) Inspect available bundled features
 csrd feature list
 
 # 3) Dry-run a feature
-csrd feature plan workers --service ./local-dev/inventory
+csrd feature plan workers --service ./local-dev/src/inventory
 
 # 4) Apply feature files/merges
-csrd feature add workers --service ./local-dev/inventory
+csrd feature add workers --service ./local-dev/src/inventory
 
 # 5) Add a second service — workspace auto-upgrades to cluster
 csrd new service --name pricing --output ./local-dev --database postgres
@@ -122,8 +122,8 @@ Then run a clean smoke flow:
 mkdir -p /tmp/csrd-smoke
 csrd new workspace --name ws --output /tmp/csrd-smoke --generate none
 csrd new service --name demo-svc --output /tmp/csrd-smoke/ws --no-interactive
-csrd doctor --service /tmp/csrd-smoke/ws/demo-svc
-csrd audit --service /tmp/csrd-smoke/ws/demo-svc
-csrd feature plan workers --service /tmp/csrd-smoke/ws/demo-svc
-csrd feature add workers --service /tmp/csrd-smoke/ws/demo-svc
+csrd doctor --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd audit --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd feature plan workers --service /tmp/csrd-smoke/ws/src/demo-svc
+csrd feature add workers --service /tmp/csrd-smoke/ws/src/demo-svc
 ```

{csrd_utils-0.3.17 → csrd_utils-0.3.18}/pyproject.toml

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

{csrd_utils-0.3.17 → csrd_utils-0.3.18}/src/csrd_utils/__main__.py

@@ -61,6 +61,10 @@ WORKSPACE_MARKER = ".csrd-workspace"
 WORKSPACE_CLUSTER_SPEC = Path(".csrd") / "cluster.yaml"
 
 
+def _workspace_services_dir(workspace_root: Path) -> Path:
+    return workspace_root / "src"
+
+
 def _prompt_text(label: str, default: str) -> str:
     value = input(f"{label} [{default}]: ").strip()
     return value or default
@@ -486,7 +490,11 @@ def _append_service_to_workspace_cluster(
 
 def _workspace_service_roots(workspace_root: Path) -> list[Path]:
     roots: list[Path] = []
-    for child in workspace_root.iterdir():
+    services_root = _workspace_services_dir(workspace_root)
+    if not services_root.is_dir():
+        return roots
+
+    for child in services_root.iterdir():
         if not child.is_dir() or child.name.startswith("."):
             continue
         if (
@@ -499,6 +507,24 @@ def _workspace_service_roots(workspace_root: Path) -> list[Path]:
     return sorted(roots)
 
 
+def _resolve_feature_service_root(service_arg: Path) -> Path:
+    candidate = service_arg.resolve()
+    if not _is_workspace(candidate):
+        return candidate
+
+    service_roots = _workspace_service_roots(candidate)
+    if len(service_roots) == 1:
+        print(f"Detected workspace service target: {service_roots[0]}")
+        return service_roots[0]
+    if not service_roots:
+        raise ValueError(
+            "No services found under workspace src/. Pass --service with a service root path."
+        )
+    raise ValueError(
+        "Multiple services found under workspace src/. Pass --service with a specific service root path."
+    )
+
+
 def _infer_port_from_service_root(service_root: Path) -> int:
     try:
         payload = yaml.safe_load((service_root / "docker-compose.yml").read_text(encoding="utf-8"))
@@ -566,9 +592,6 @@ def _maybe_update_workspace_cluster(
         return generate_cluster(updated_spec, workspace_root, force=True, workspace_mode=True)
 
     service_roots = _workspace_service_roots(workspace_root)
-    if len(service_roots) < 2:
-        return None
-
     generated_name = generated_service.name
     services: list[ServiceSpec] = [_service_config_to_cluster_service(service_config)]
     for service_root in service_roots:
@@ -816,12 +839,13 @@ def main() -> int:
     if args.command == "new" and args.new_command == "service":
         try:
             service_config = _collect_new_service_config(args)
-            service_config["output_dir"] = _ensure_workspace_for_output(
+            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)
             generated = generate_service(**service_config)
             generated_cluster = _maybe_update_workspace_cluster(
-                service_config["output_dir"], service_config, generated
+                workspace_root, service_config, generated
             )
             if generated_cluster is not None:
                 print(f"Refreshed cluster scaffold at: {generated_cluster}")
@@ -864,10 +888,15 @@ def main() -> int:
             generate_mode = workspace_config["generate"]
             if generate_mode == "service":
                 service_config = _collect_new_service_config(
-                    _default_service_namespace(workspace_root)
+                    _default_service_namespace(_workspace_services_dir(workspace_root))
                 )
-                service_config["output_dir"] = workspace_root
+                service_config["output_dir"] = _workspace_services_dir(workspace_root)
                 generated_service = generate_service(**service_config)
+                generated_cluster = _maybe_update_workspace_cluster(
+                    workspace_root, service_config, generated_service
+                )
+                if generated_cluster is not None:
+                    print(f"Refreshed cluster scaffold at: {generated_cluster}")
                 print(f"Generated service at: {generated_service}")
             elif generate_mode == "cluster":
                 cluster_config = _collect_new_cluster_config(
@@ -901,8 +930,14 @@ def main() -> int:
     if args.feature_command == "list":
         return _list_features()
 
+    try:
+        resolved_service = _resolve_feature_service_root(args.service)
+    except ValueError as exc:
+        print(f"ERROR: {exc}")
+        return 1
+
     with features_path() as feature_lib:
-        augmentor = ServiceAugmentor(args.service, feature_lib)
+        augmentor = ServiceAugmentor(resolved_service, feature_lib)
         if args.feature_command == "plan" and args.json:
             plan = augmentor.build_plan(args.feature)
             if plan is None:
@@ -911,7 +946,7 @@ def main() -> int:
                 json.dumps(
                     {
                         "feature": args.feature,
-                        "service": str(args.service.resolve()),
+                        "service": str(resolved_service),
                         "modifies": plan["modifies"],
                         "creates": plan["creates"],
                     },