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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "csrd-utils"
-version = "0.3.16"
+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.16 → 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
@@ -82,7 +86,15 @@ def _prompt_choice(label: str, choices: list[str], default: str) -> str:
             return default
         if value in choices:
             return value
-        print(f"ERROR: Invalid choice '{value}'. Expected one of: {rendered}")
+        # Try prefix matching
+        matching = [choice for choice in choices if choice.startswith(value)]
+        if len(matching) == 1:
+            return matching[0]
+        if len(matching) > 1:
+            matching_str = ", ".join(matching)
+            print(f"ERROR: Ambiguous choice '{value}'. Matches: {matching_str}")
+        else:
+            print(f"ERROR: Invalid choice '{value}'. Expected one of: {rendered}")
 
 
 def _prompt_int(label: str, default: int) -> int:
@@ -478,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 (
@@ -491,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"))
@@ -555,12 +589,9 @@ def _maybe_update_workspace_cluster(
     spec_path = _workspace_cluster_spec_path(workspace_root)
     if spec_path.is_file():
         updated_spec = _append_service_to_workspace_cluster(workspace_root, service_config)
-        return generate_cluster(updated_spec, workspace_root, force=True)
+        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:
@@ -575,7 +606,7 @@ def _maybe_update_workspace_cluster(
     }
     normalized = normalize_cluster_spec(bootstrap_spec)
     _save_workspace_cluster_spec(workspace_root, normalized)
-    return generate_cluster(normalized, workspace_root, force=True)
+    return generate_cluster(normalized, workspace_root, force=True, workspace_mode=True)
 
 
 def _build_parser() -> argparse.ArgumentParser:
@@ -808,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}")
@@ -856,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(
@@ -893,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:
@@ -903,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"],
                     },

{csrd_utils-0.3.16 → csrd_utils-0.3.18}/src/csrd_utils/cluster.py

@@ -452,9 +452,18 @@ def _build_smoke(spec: ClusterSpec) -> str:
     return "\n".join(lines) + "\n"
 
 
-def generate_cluster(spec: ClusterSpec, output_dir: Path, force: bool = False) -> Path:
+def generate_cluster(
+    spec: ClusterSpec, output_dir: Path, force: bool = False, workspace_mode: bool = False
+) -> Path:
     normalized = normalize_cluster_spec(spec)
-    cluster_root = output_dir.resolve() / normalized["cluster"]["name"]
+
+    if workspace_mode:
+        # In workspace mode, write files directly to output_dir (workspace root)
+        cluster_root = output_dir.resolve()
+    else:
+        # In standalone mode, create a subdirectory with cluster name
+        cluster_root = output_dir.resolve() / normalized["cluster"]["name"]
+
     cluster_root.mkdir(parents=True, exist_ok=True)
 
     if any(cluster_root.iterdir()) and not force:

csrd_utils-0.3.18/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/.gitignore

@@ -0,0 +1,64 @@
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Virtual environments
+.venv
+venv/
+ENV/
+env/
+
+# IDEs
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+
+# Testing
+.pytest_cache/
+.coverage
+htmlcov/
+.tox/
+.hypothesis/
+
+# Type checking
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Development
+*.log
+.env
+.env.local
+.env.*.local
+
+# Docker
+.dockerignore
+Dockerfile
+
+# Services
+.csrd-workspace
+.csrd/

csrd_utils-0.3.18/src/csrd_utils/templates/cookiecutter-service/{{cookiecutter.service_name}}/pyproject.toml

@@ -0,0 +1,61 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ cookiecutter.service_name }}"
+version = "0.1.0"
+description = "{{ cookiecutter.service_description }}"
+readme = "README.md"
+requires-python = ">=3.12"
+license = {text = "MIT"}
+authors = [{name = "Generated by csrd", email = "generated@csrd.local"}]
+keywords = ["fastapi", "microservice", "csrd"]
+
+dependencies = [
+    "fastapi>=0.110",
+    "uvicorn[standard]>=0.27",
+    "pydantic[email]>=2.5",
+    "csrd-versioning @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/versioning",
+    "csrd-lifespan @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/lifespan",
+    "csrd-repository @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/repository",
+    "csrd-context @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/context",
+    "httpx>=0.25",
+    "celery[redis]>=5.3",
+    "celery[amqp]>=5.3",
+    "redis>=5.0",
+    "csrd-logging @ git+https://github.com/csrd-api/fastapi-common.git#subdirectory=packages/logging",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.4",
+    "pytest-asyncio>=0.21",
+    "mypy>=1.7",
+    "ruff>=0.1",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/app"]
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = ["tests"]
+
+[tool.mypy]
+python_version = "3.12"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+strict = true
+
+[tool.ruff]
+target-version = "py312"
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I", "N", "UP", "BLE", "FBT", "A", "C4", "PIE", "SIM", "RUF"]
+ignore = ["E501"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["app"]

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

@@ -104,7 +104,7 @@ async def list_{{ cookiecutter.model_name_plural | lower | replace(' ', '_') }}(
     {%- endif %}
 
 
-@router.get(f"{ITEMS_ROUTE}/{entity_id}")
+@router.get(f"{ITEMS_ROUTE}" + "/{entity_id}")
 async def get_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     {%- if cookiecutter.has_database %}
@@ -128,7 +128,7 @@ async def get_{{ cookiecutter.model_name | lower }}(
     return item
 
 
-@router.put(f"{ITEMS_ROUTE}/{entity_id}")
+@router.put(f"{ITEMS_ROUTE}" + "/{entity_id}")
 async def update_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     payload: Update{{ cookiecutter.model_name }}Request,
@@ -161,7 +161,7 @@ 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")
 async def upsert_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     payload: Update{{ cookiecutter.model_name }}Request,
@@ -194,7 +194,7 @@ 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}")
 async def delete_{{ cookiecutter.model_name | lower }}(
     entity_id: str,
     {%- if cookiecutter.has_database %}