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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.17
+Version: 0.3.19
 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
@@ -51,7 +51,7 @@ csrd audit --service .                              # explicitly audit one servi
 - Non-interactive generation errors when no workspace marker is present.
 - Workspace cluster source of truth is persisted at `.csrd/cluster.yaml`.
 - If `.csrd/cluster.yaml` already exists, `csrd new service` appends the generated service and refreshes scaffold files (`docker-compose.yml`, `.env.example`, `README.md`, `smoke.sh`). Service source directories and running containers are never touched.
-- If `.csrd/cluster.yaml` is missing and a second service is added to the workspace, `csrd new service` bootstraps `.csrd/cluster.yaml` and writes initial cluster scaffold files.
+- If `.csrd/cluster.yaml` is missing, `csrd new service` bootstraps `.csrd/cluster.yaml` and writes initial cluster scaffold files.
 - `csrd new service` runs a compact interactive flow by default (core prompts 1-6), then asks whether to show advanced options.
 - `csrd new workspace` creates a workspace directory and prompts whether to generate `none`, `service`, or `cluster` immediately.
 - In compact mode, advanced options are hidden by default.
@@ -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.19}/README.md

@@ -38,7 +38,7 @@ csrd audit --service .                              # explicitly audit one servi
 - Non-interactive generation errors when no workspace marker is present.
 - Workspace cluster source of truth is persisted at `.csrd/cluster.yaml`.
 - If `.csrd/cluster.yaml` already exists, `csrd new service` appends the generated service and refreshes scaffold files (`docker-compose.yml`, `.env.example`, `README.md`, `smoke.sh`). Service source directories and running containers are never touched.
-- If `.csrd/cluster.yaml` is missing and a second service is added to the workspace, `csrd new service` bootstraps `.csrd/cluster.yaml` and writes initial cluster scaffold files.
+- If `.csrd/cluster.yaml` is missing, `csrd new service` bootstraps `.csrd/cluster.yaml` and writes initial cluster scaffold files.
 - `csrd new service` runs a compact interactive flow by default (core prompts 1-6), then asks whether to show advanced options.
 - `csrd new workspace` creates a workspace directory and prompts whether to generate `none`, `service`, or `cluster` immediately.
 - In compact mode, advanced options are hidden by default.
@@ -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.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.3.17"
+version = "0.3.19"
 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.19}/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
@@ -485,23 +489,55 @@ def _append_service_to_workspace_cluster(
 
 
 def _workspace_service_roots(workspace_root: Path) -> list[Path]:
-    roots: list[Path] = []
-    for child in workspace_root.iterdir():
-        if not child.is_dir() or child.name.startswith("."):
-            continue
-        if (
-            (child / "src" / "app").is_dir()
-            and (child / "tests").is_dir()
-            and (child / "requirements.txt").is_file()
-            and (child / "docker-compose.yml").is_file()
-        ):
-            roots.append(child)
+    roots: set[Path] = set()
+
+    def _collect_from(base_dir: Path, skip_names: set[str] | None = None) -> None:
+        if not base_dir.is_dir():
+            return
+        for child in base_dir.iterdir():
+            if not child.is_dir() or child.name.startswith("."):
+                continue
+            if skip_names and child.name in skip_names:
+                continue
+            if (
+                (child / "src" / "app").is_dir()
+                and (child / "tests").is_dir()
+                and (child / "requirements.txt").is_file()
+            ):
+                roots.add(child.resolve())
+
+    services_root = _workspace_services_dir(workspace_root)
+    _collect_from(services_root)
+    # Legacy fallback: older workspaces stored services at workspace root.
+    _collect_from(workspace_root, skip_names={"src"})
     return sorted(roots)
 
 
-def _infer_port_from_service_root(service_root: Path) -> int:
+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:
+        return service_roots[0]
+    if not service_roots:
+        raise ValueError("No services found in workspace. Pass --service with a service root path.")
+    raise ValueError(
+        "Multiple services found in workspace. Pass --service with a specific service root path."
+    )
+
+
+def _workspace_root_for_service(service_root: Path) -> Path | None:
+    parent = service_root.parent
+    if parent.name == "src" and _is_workspace(parent.parent):
+        return parent.parent
+    return None
+
+
+def _infer_port_from_compose(compose_path: Path, service_name: str | None = None) -> int:
     try:
-        payload = yaml.safe_load((service_root / "docker-compose.yml").read_text(encoding="utf-8"))
+        payload = yaml.safe_load(compose_path.read_text(encoding="utf-8"))
     except (OSError, yaml.YAMLError):
         return 8080
 
@@ -511,10 +547,15 @@ def _infer_port_from_service_root(service_root: Path) -> int:
     if not isinstance(services, dict) or not services:
         return 8080
 
-    first_service = next(iter(services.values()))
-    if not isinstance(first_service, dict):
+    selected: object
+    if service_name and service_name in services:
+        selected = services[service_name]
+    else:
+        selected = next(iter(services.values()))
+    if not isinstance(selected, dict):
         return 8080
-    ports = first_service.get("ports")
+
+    ports = selected.get("ports")
     if not isinstance(ports, list) or not ports:
         return 8080
 
@@ -528,6 +569,17 @@ def _infer_port_from_service_root(service_root: Path) -> int:
     return 8080
 
 
+def _infer_port_from_service_root(service_root: Path) -> int:
+    service_compose = service_root / "docker-compose.yml"
+    if service_compose.is_file():
+        return _infer_port_from_compose(service_compose)
+
+    workspace_root = _workspace_root_for_service(service_root)
+    if workspace_root is not None:
+        return _infer_port_from_compose(workspace_root / "docker-compose.yml", service_root.name)
+    return 8080
+
+
 def _infer_existing_workspace_service(service_root: Path) -> ServiceSpec:
     return {
         "name": service_root.name,
@@ -566,9 +618,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 +865,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 +914,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 +956,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 +972,7 @@ def main() -> int:
                 json.dumps(
                     {
                         "feature": args.feature,
-                        "service": str(args.service.resolve()),
+                        "service": str(resolved_service),
                         "modifies": plan["modifies"],
                         "creates": plan["creates"],
                     },

{csrd_utils-0.3.17 → csrd_utils-0.3.19}/src/csrd_utils/augmentor.py

@@ -80,7 +80,7 @@ class ServiceAugmentor:
             True if valid
         """
         required_dirs = ["src/app", "tests"]
-        required_files = ["docker-compose.yml", "requirements.txt"]
+        required_files = ["requirements.txt"]
 
         for d in required_dirs:
             if not (self.service_root / d).is_dir():
@@ -92,8 +92,24 @@ class ServiceAugmentor:
                 print(f"❌ Missing required file: {f}")
                 return False
 
+        if not self._docker_compose_path().is_file():
+            print("❌ Missing required file: docker-compose.yml")
+            return False
+
         return True
 
+    def _docker_compose_path(self) -> Path:
+        local = self.service_root / "docker-compose.yml"
+        if local.is_file():
+            return local
+
+        parent = self.service_root.parent
+        if parent.name == "src" and (parent.parent / ".csrd-workspace").is_file():
+            workspace_compose = parent.parent / "docker-compose.yml"
+            if workspace_compose.is_file():
+                return workspace_compose
+        return local
+
     def validate_requirements(self) -> list[str]:
         """
         Validate that feature requirements are met.
@@ -189,7 +205,7 @@ class ServiceAugmentor:
             return True  # Not required
 
         try:
-            dc_path = self.service_root / "docker-compose.yml"
+            dc_path = self._docker_compose_path()
             self.backup_file(dc_path)
 
             # Load YAMLs

{csrd_utils-0.3.17 → csrd_utils-0.3.19}/src/csrd_utils/doctor.py

@@ -20,7 +20,11 @@ def run_doctor(service_root: Path) -> DoctorReport:
     warnings: list[str] = []
 
     required_dirs = ["src/app", "tests"]
-    required_files = ["docker-compose.yml", "requirements.txt"]
+    required_files = ["requirements.txt"]
+
+    compose_candidates = [root / "docker-compose.yml"]
+    if root.parent.name == "src" and (root.parent.parent / ".csrd-workspace").is_file():
+        compose_candidates.append(root.parent.parent / "docker-compose.yml")
 
     for rel in required_dirs:
         if not (root / rel).is_dir():
@@ -30,6 +34,9 @@ def run_doctor(service_root: Path) -> DoctorReport:
         if not (root / rel).is_file():
             errors.append(f"Missing required file: {rel}")
 
+    if not any(path.is_file() for path in compose_candidates):
+        errors.append("Missing required file: docker-compose.yml")
+
     marker_files = {
         "src/app/settings.py": "# [INSERT: fields]",
         "tests/conftest.py": "# [INSERT: fixtures]",

{csrd_utils-0.3.17 → csrd_utils-0.3.19}/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/src/app/views/unversioned/items_view.py

@@ -31,6 +31,33 @@ class Update{{ cookiecutter.model_name }}Request(BaseModel):
     name: str
 
 
+class {{ cookiecutter.model_name }}Response(BaseModel):
+    id: str
+    name: str
+    created_at: str
+
+
+class {{ cookiecutter.model_name }}ListResponse(BaseModel):
+    {{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}: list[{{ cookiecutter.model_name }}Response]
+
+
+class {{ cookiecutter.model_name }}UpdateResponse(BaseModel):
+    id: str
+    name: str
+    updated: bool
+
+
+class {{ cookiecutter.model_name }}UpsertResponse(BaseModel):
+    id: str
+    name: str
+    rows_affected: int
+
+
+class {{ cookiecutter.model_name }}DeleteResponse(BaseModel):
+    id: str
+    deleted: bool
+
+
 {%- if cookiecutter.has_delegates and not cookiecutter.has_database %}
 async def _delegate_request(
     method: str,
@@ -59,13 +86,13 @@ def _dummy_item(record_id: str, name: str, created_at: str) -> dict[str, str]:
 {%- endif %}
 
 
-@router.post(ITEMS_ROUTE)
+@router.post(ITEMS_ROUTE, response_model={{ cookiecutter.model_name }}Response)
 async def create_{{ cookiecutter.model_name | lower }}(
     payload: Create{{ cookiecutter.model_name }}Request,
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, str]:
+) -> {{ cookiecutter.model_name }}Response:
     {%- if cookiecutter.has_database %}
     return await repo.create(payload.name)
     {%- elif cookiecutter.has_delegates %}
@@ -84,12 +111,12 @@ async def create_{{ cookiecutter.model_name | lower }}(
     {%- endif %}
 
 
-@router.get(ITEMS_ROUTE)
+@router.get(ITEMS_ROUTE, response_model={{ cookiecutter.model_name }}ListResponse)
 async def list_{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}(
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, list[dict[str, str]]]:
+) -> {{ cookiecutter.model_name }}ListResponse:
     {%- if cookiecutter.has_database %}
     return {"{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}": await repo.list()}
     {%- elif cookiecutter.has_delegates %}
@@ -104,13 +131,13 @@ async def list_{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}(
     {%- endif %}
 
 
-@router.get(f"{ITEMS_ROUTE}" + "/{entity_id}")
+@router.get(f"{ITEMS_ROUTE}" + "/{entity_id}", response_model={{ cookiecutter.model_name }}Response)
 async def get_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, str]:
+) -> {{ cookiecutter.model_name }}Response:
     {%- if cookiecutter.has_database %}
     item = await repo.get(entity_id)
     {%- elif cookiecutter.has_delegates %}
@@ -128,14 +155,16 @@ async def get_{{ cookiecutter.model_name | lower }}(
     return item
 
 
-@router.put(f"{ITEMS_ROUTE}" + "/{entity_id}")
+@router.put(
+    f"{ITEMS_ROUTE}" + "/{entity_id}", response_model={{ cookiecutter.model_name }}UpdateResponse
+)
 async def update_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     payload: Update{{ cookiecutter.model_name }}Request,
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, object]:
+) -> {{ cookiecutter.model_name }}UpdateResponse:
     {%- if cookiecutter.has_database %}
     rows = await repo.update(entity_id, payload.name)
     {%- elif cookiecutter.has_delegates %}
@@ -161,14 +190,17 @@ async def update_{{ cookiecutter.model_name | lower }}(
     return {"id": entity_id, "name": payload.name, "updated": True}
 
 
-@router.put(f"{ITEMS_ROUTE}" + "/{entity_id}/upsert")
+@router.put(
+    f"{ITEMS_ROUTE}" + "/{entity_id}/upsert",
+    response_model={{ cookiecutter.model_name }}UpsertResponse,
+)
 async def upsert_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     payload: Update{{ cookiecutter.model_name }}Request,
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, object]:
+) -> {{ cookiecutter.model_name }}UpsertResponse:
     {%- if cookiecutter.has_database %}
     rows = await repo.upsert(entity_id, payload.name)
     {%- elif cookiecutter.has_delegates %}
@@ -194,13 +226,13 @@ async def upsert_{{ cookiecutter.model_name | lower }}(
     return {"id": entity_id, "name": payload.name, "rows_affected": rows}
 
 
-@router.delete(f"{ITEMS_ROUTE}" + "/{entity_id}")
+@router.delete(f"{ITEMS_ROUTE}" + "/{entity_id}", response_model={{ cookiecutter.model_name }}DeleteResponse)
 async def delete_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     {%- if cookiecutter.has_database %}
     repo: RepositoryDep,
     {%- endif %}
-) -> dict[str, object]:
+) -> {{ cookiecutter.model_name }}DeleteResponse:
     {%- if cookiecutter.has_database %}
     rows = await repo.delete(entity_id)
     {%- elif cookiecutter.has_delegates %}