csrd-utils 0.3.22__tar.gz → 0.3.24__tar.gz

{csrd_utils-0.3.22 → csrd_utils-0.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.3.22
+Version: 0.3.24
 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
@@ -44,6 +44,16 @@ csrd audit --service .                              # explicitly audit one servi
 
 `feature plan --json` is useful for CI or tooling wrappers.
 
+### Workspace extraction command
+
+Service extraction into a sibling workspace is supported:
+
+```bash
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --mode copy
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --mode move
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --dry-run --json
+```
+
 ### Interactive generation behavior
 
 - `csrd new service` and `csrd new cluster` are workspace-first commands.
@@ -112,6 +122,7 @@ with features_path() as feature_lib:
 - `docs/AGENT_SMOKE_TESTS.md` - copy/paste validation flow for clean workspaces
 - `docs/COMMAND_MATRIX.yaml` - machine-readable command matrix for automation
 - `AGENTS.md` - package-local rules for autonomous agents
+- `../../docs/SERVICE_EXTRACTION_PLAYBOOK.md` - workspace service extraction workflow and status
 
 ## CLI-only agent mode
 

{csrd_utils-0.3.22 → csrd_utils-0.3.24}/README.md

@@ -31,6 +31,16 @@ csrd audit --service .                              # explicitly audit one servi
 
 `feature plan --json` is useful for CI or tooling wrappers.
 
+### Workspace extraction command
+
+Service extraction into a sibling workspace is supported:
+
+```bash
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --mode copy
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --mode move
+csrd workspace extract-service --service ./source-ws/src/pricing --target-workspace ../pricing-ws --dry-run --json
+```
+
 ### Interactive generation behavior
 
 - `csrd new service` and `csrd new cluster` are workspace-first commands.
@@ -99,6 +109,7 @@ with features_path() as feature_lib:
 - `docs/AGENT_SMOKE_TESTS.md` - copy/paste validation flow for clean workspaces
 - `docs/COMMAND_MATRIX.yaml` - machine-readable command matrix for automation
 - `AGENTS.md` - package-local rules for autonomous agents
+- `../../docs/SERVICE_EXTRACTION_PLAYBOOK.md` - workspace service extraction workflow and status
 
 ## CLI-only agent mode
 

{csrd_utils-0.3.22 → csrd_utils-0.3.24}/pyproject.toml

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

{csrd_utils-0.3.22 → csrd_utils-0.3.24}/src/csrd_utils/__main__.py

@@ -2,10 +2,11 @@
 
 import argparse
 import json
+import shutil
 from contextlib import suppress
 from importlib.metadata import version
 from pathlib import Path
-from typing import TypedDict
+from typing import TypedDict, cast
 from urllib.parse import urlparse
 
 import yaml  # type: ignore[import-untyped]
@@ -57,6 +58,15 @@ class GenerateWorkspaceArgs(TypedDict):
     generate: str
 
 
+class ExtractWorkspaceServiceArgs(TypedDict):
+    service_root: Path
+    target_workspace: Path
+    mode: str
+    force: bool
+    dry_run: bool
+    as_json: bool
+
+
 WORKSPACE_MARKER = ".csrd-workspace"
 WORKSPACE_CLUSTER_SPEC = Path(".csrd") / "cluster.yaml"
 
@@ -545,9 +555,179 @@ 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
+    if _is_workspace(parent):
+        return parent
     return None
 
 
+def _validate_service_root(service_root: Path) -> None:
+    if not service_root.is_dir():
+        raise ValueError(f"Service path is not a directory: {service_root}")
+    if not (service_root / "src" / "app").is_dir():
+        raise ValueError(f"Missing required directory: {service_root / 'src' / 'app'}")
+    if not (service_root / "tests").is_dir():
+        raise ValueError(f"Missing required directory: {service_root / 'tests'}")
+    if not (service_root / "requirements.txt").is_file():
+        raise ValueError(f"Missing required file: {service_root / 'requirements.txt'}")
+
+
+def _collect_workspace_extract_config(args: argparse.Namespace) -> ExtractWorkspaceServiceArgs:
+    return ExtractWorkspaceServiceArgs(
+        {
+            "service_root": args.service.resolve(),
+            "target_workspace": args.target_workspace.resolve(),
+            "mode": args.mode,
+            "force": args.force,
+            "dry_run": args.dry_run,
+            "as_json": args.json,
+        }
+    )
+
+
+def _service_spec_from_workspace(service_root: Path, workspace_root: Path) -> ServiceSpec:
+    spec = _load_workspace_cluster_spec(workspace_root)
+    services = spec.get("services", [])
+    for service in services:
+        if str(service.get("name", "")).strip() == service_root.name:
+            return cast(ServiceSpec, dict(service))
+    return _infer_existing_workspace_service(service_root)
+
+
+def _upsert_workspace_service(
+    spec: ClusterSpec, service: ServiceSpec, workspace_name: str
+) -> ClusterSpec:
+    services: list[ServiceSpec] = [
+        cast(ServiceSpec, dict(entry))
+        for entry in spec.get("services", [])
+        if str(entry.get("name", "")).strip() != str(service["name"])
+    ]
+    services.append(cast(ServiceSpec, dict(service)))
+    _ensure_unique_ports(services, preserve_name=str(service["name"]))
+
+    cluster = spec.get("cluster", {})
+    candidate: ClusterSpec = {
+        "cluster": {
+            "name": str(cluster.get("name", "")).strip() or workspace_name,
+            "preset": str(cluster.get("preset", "none")).strip() or "none",
+        },
+        "services": services,
+    }
+    return normalize_cluster_spec(candidate)
+
+
+def _remove_workspace_service(
+    spec: ClusterSpec, service_name: str, workspace_name: str
+) -> ClusterSpec:
+    services: list[ServiceSpec] = [
+        cast(ServiceSpec, dict(entry))
+        for entry in spec.get("services", [])
+        if str(entry.get("name", "")).strip() != service_name
+    ]
+    cluster = spec.get("cluster", {})
+    candidate: ClusterSpec = {
+        "cluster": {
+            "name": str(cluster.get("name", "")).strip() or workspace_name,
+            "preset": str(cluster.get("preset", "none")).strip() or "none",
+        },
+        "services": services,
+    }
+    return normalize_cluster_spec(candidate)
+
+
+def _extract_service(config: ExtractWorkspaceServiceArgs) -> dict[str, object]:
+    service_root = config["service_root"]
+    target_workspace = config["target_workspace"]
+    mode = config["mode"]
+
+    _validate_service_root(service_root)
+    source_workspace = _workspace_root_for_service(service_root)
+    if source_workspace is None:
+        raise ValueError("Service is not inside a csrd workspace")
+    if source_workspace == target_workspace:
+        raise ValueError("Source and target workspace must be different paths")
+
+    source_service_spec = _service_spec_from_workspace(service_root, source_workspace)
+    target_services_dir = _workspace_services_dir(target_workspace)
+    target_service_root = target_services_dir / service_root.name
+
+    actions = [
+        f"source_workspace={source_workspace}",
+        f"target_workspace={target_workspace}",
+        f"service={service_root.name}",
+        f"mode={mode}",
+    ]
+
+    if not _is_workspace(target_workspace):
+        if target_workspace.exists() and any(target_workspace.iterdir()):
+            raise ValueError(
+                f"Target exists but is not a workspace: {target_workspace}. "
+                "Create a workspace marker first or use an empty directory."
+            )
+        actions.append("create_target_workspace_marker")
+
+    if target_service_root.exists() and not config["force"]:
+        raise FileExistsError(
+            f"Target service already exists: {target_service_root}. Use --force to overwrite."
+        )
+    if target_service_root.exists():
+        actions.append("overwrite_target_service")
+
+    if mode == "move":
+        actions.append("remove_source_service")
+
+    if config["dry_run"]:
+        return {
+            "ok": True,
+            "dry_run": True,
+            "source_workspace": str(source_workspace),
+            "target_workspace": str(target_workspace),
+            "service": service_root.name,
+            "mode": mode,
+            "actions": actions,
+        }
+
+    target_workspace.mkdir(parents=True, exist_ok=True)
+    if not _is_workspace(target_workspace):
+        _write_workspace_marker(target_workspace)
+
+    target_services_dir.mkdir(parents=True, exist_ok=True)
+    if target_service_root.exists():
+        shutil.rmtree(target_service_root)
+    shutil.copytree(service_root, target_service_root)
+
+    target_spec = _upsert_workspace_service(
+        _load_workspace_cluster_spec(target_workspace), source_service_spec, target_workspace.name
+    )
+    _save_workspace_cluster_spec(target_workspace, target_spec)
+    target_cluster_root = generate_cluster(
+        target_spec, target_workspace, force=True, workspace_mode=True
+    )
+
+    source_cluster_root = None
+    if mode == "move":
+        shutil.rmtree(service_root)
+        source_spec = _remove_workspace_service(
+            _load_workspace_cluster_spec(source_workspace), service_root.name, source_workspace.name
+        )
+        _save_workspace_cluster_spec(source_workspace, source_spec)
+        source_cluster_root = generate_cluster(
+            source_spec, source_workspace, force=True, workspace_mode=True
+        )
+
+    return {
+        "ok": True,
+        "dry_run": False,
+        "source_workspace": str(source_workspace),
+        "target_workspace": str(target_workspace),
+        "service": service_root.name,
+        "mode": mode,
+        "target_service": str(target_service_root),
+        "target_cluster": str(target_cluster_root),
+        "source_cluster": str(source_cluster_root) if source_cluster_root else None,
+        "actions": actions,
+    }
+
+
 def _infer_port_from_compose(compose_path: Path, service_name: str | None = None) -> int:
     try:
         payload = yaml.safe_load(compose_path.read_text(encoding="utf-8"))
@@ -752,6 +932,21 @@ def _build_parser() -> argparse.ArgumentParser:
     )
     workspace.add_argument("--force", action="store_true", help="Overwrite existing workspace path")
 
+    workspace_cmd = sub.add_parser("workspace", help="Workspace operations")
+    workspace_sub = workspace_cmd.add_subparsers(dest="workspace_command", required=True)
+
+    extract = workspace_sub.add_parser(
+        "extract-service", help="Copy or move a service into a sibling workspace"
+    )
+    extract.add_argument("--service", type=Path, required=True, help="Source service root path")
+    extract.add_argument(
+        "--target-workspace", type=Path, required=True, help="Target workspace root path"
+    )
+    extract.add_argument("--mode", choices=["copy", "move"], default="copy")
+    extract.add_argument("--dry-run", action="store_true", help="Show extraction plan only")
+    extract.add_argument("--json", action="store_true", help="Print extraction result as JSON")
+    extract.add_argument("--force", action="store_true", help="Overwrite target service path")
+
     return parser
 
 
@@ -960,6 +1155,31 @@ def main() -> int:
             return 1
         return 0
 
+    if args.command == "workspace" and args.workspace_command == "extract-service":
+        try:
+            result = _extract_service(_collect_workspace_extract_config(args))
+        except (FileExistsError, ValueError) as exc:
+            print(f"ERROR: {exc}")
+            return 1
+
+        if args.json:
+            print(json.dumps(result, indent=2, sort_keys=True))
+            return 0
+
+        if result.get("dry_run"):
+            print("Extraction plan (dry-run):")
+            actions = result.get("actions")
+            if isinstance(actions, list):
+                for action in actions:
+                    print(f"- {action}")
+            return 0
+
+        print(f"Extracted service to: {result['target_service']}")
+        print(f"Refreshed target cluster scaffold at: {result['target_cluster']}")
+        if result.get("source_cluster"):
+            print(f"Refreshed source cluster scaffold at: {result['source_cluster']}")
+        return 0
+
     if args.command == "doctor":
         return _run_doctor(args.service, args.json)
 

{csrd_utils-0.3.22 → csrd_utils-0.3.24}/src/csrd_utils/templates/cookiecutter-service/README.md

@@ -5,7 +5,7 @@ Generate a FastAPI service with composable feature toggles (database, delegates,
 ## Generate a service
 
 ```bash
-uvx cookiecutter . --directory starters/cookiecutter-service
+uvx cookiecutter . --directory packages/utils/src/csrd_utils/templates/cookiecutter-service
 ```
 
 Key prompts:
@@ -31,18 +31,18 @@ Key prompts:
 
 ```bash
 # DB-only SQLite service
-uvx cookiecutter . --directory starters/cookiecutter-service \
+uvx cookiecutter . --directory packages/utils/src/csrd_utils/templates/cookiecutter-service \
   --no-input service_name=inventory has_database=true database=sqlite \
   has_delegates=false has_workers=false has_caching=false
 
 # Postgres + delegates + caching
-uvx cookiecutter . --directory starters/cookiecutter-service \
+uvx cookiecutter . --directory packages/utils/src/csrd_utils/templates/cookiecutter-service \
   --no-input service_name=pricing has_database=true database=postgres \
   has_delegates=true upstreams=http://inventory:8081 \
   has_workers=false has_caching=true
 
 # Worker-focused service with RabbitMQ and no DB
-uvx cookiecutter . --directory starters/cookiecutter-service \
+uvx cookiecutter . --directory packages/utils/src/csrd_utils/templates/cookiecutter-service \
   --no-input service_name=jobs has_database=false has_workers=true broker=rabbitmq \
   has_delegates=false has_caching=false
 ```