csrd-utils 0.4.0__tar.gz → 0.5.0__tar.gz

{csrd_utils-0.4.0 → csrd_utils-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csrd-utils
-Version: 0.4.0
+Version: 0.5.0
 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
@@ -126,7 +126,7 @@ csrd new service --name pricing --output ./local-dev --database postgres
 ## Bundled assets
 
 - `features/workers/` feature manifests and fragments
-- `templates/cookiecutter-service/` template starter
+- `templates/service/` template starter
 
 ## Python API
 

{csrd_utils-0.4.0 → csrd_utils-0.5.0}/README.md

@@ -111,7 +111,7 @@ csrd new service --name pricing --output ./local-dev --database postgres
 ## Bundled assets
 
 - `features/workers/` feature manifests and fragments
-- `templates/cookiecutter-service/` template starter
+- `templates/service/` template starter
 
 ## Python API
 

{csrd_utils-0.4.0 → csrd_utils-0.5.0}/pyproject.toml

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

{csrd_utils-0.4.0/src/csrd_utils/v2 → csrd_utils-0.5.0/src/csrd_utils}/AGENTS.md

@@ -1,27 +1,15 @@
 # Menu System & Compose Design Rules
 
-This file captures the design principles of the `v2/generate` menu system
-and the `v2/compose` rendering pipeline.
+This file captures the design principles of the `generate` menu system
+and the `compose` rendering pipeline.
 Consult it for every change that adds, removes, or modifies menus, menu items,
 prompts, interactive selection flows, or compose/renderer behavior.
 
 ## Scope
 
-- Applies to `packages/utils/src/csrd_utils/v2/**`.
+- Applies to `packages/utils/src/csrd_utils/generate/**` and `packages/utils/src/csrd_utils/compose/**`.
 - Also follow `packages/utils/AGENTS.md` and the top-level `AGENTS.md`.
 
-## Drop-in replacement intent
-
-The `v2` module is intended to **fully replace** the bare `csrd` command.
-Once promoted, the `v2/` directory becomes the top-level implementation and
-the `v2` namespace disappears.
-
-**Naming rule**: Do not use "v2" in any module name, class name, function name,
-variable name, constant, test name, CLI label, or user-facing string inside this
-package. The only place "v2" appears is the directory name itself, which will be
-removed at promotion time. Names should read as if `v2/` does not exist —
-e.g. `compose`, `generate`, `ComposeSpec`, `render_workspace`, not
-`v2_compose`, `V2ComposeSpec`, `render_v2_workspace`.
 
 ## Architecture overview
 
@@ -347,7 +335,7 @@ When asked to "audit the menus or compose system", verify each of the following:
 9. Names are normalized and the user is informed of changes.
 10. No new prompt primitives exist outside `helpers.py`.
 11. The three-layer separation (helpers → menu → handlers) is preserved.
-12. Tests in `tests/test_cli.py` and `tests/test_v2_generate*.py` cover new/changed items.
+12. Tests in `tests/test_cli.py` and `tests/test_*.py` cover new/changed items.
 13. All multi-step interactive flows use `run_wizard()` with a list of `WizardStep` callables — no raw `while step <= N` / `if step == 0` dispatch exists in handlers.
 14. No step logic is duplicated across wizard flows — shared steps (`_step_workspace_name`, `_step_git_init`, etc.) are extracted to `_step_*` functions.
 15. Custom workflow can produce output identical to every registered preset (custom–preset parity rule #21).

csrd_utils-0.5.0/src/csrd_utils/__main__.py

@@ -0,0 +1,341 @@
+"""Command-line interface for csrd-utils."""
+
+import argparse
+import json
+import sys
+from importlib.metadata import version
+from pathlib import Path
+
+from .audit import run_audit
+from .compose import apply as compose_apply
+from .compose import validate as compose_validate
+from .doctor import run_doctor
+from .generate import run_generate_menu
+
+# ---------------------------------------------------------------------------
+# Bash completion
+# ---------------------------------------------------------------------------
+
+
+def _parser_shape(
+    parser: argparse.ArgumentParser,
+    chain: tuple[str, ...] = (),
+) -> tuple[dict[tuple[str, ...], list[str]], dict[tuple[str, ...], list[str]]]:
+    commands: dict[tuple[str, ...], list[str]] = {}
+    options: dict[tuple[str, ...], list[str]] = {}
+
+    subcommands: list[str] = []
+    flags: list[str] = []
+    for action in parser._actions:
+        if isinstance(action, argparse._SubParsersAction):
+            subcommands.extend(sorted(action.choices.keys()))
+            for name, subparser in action.choices.items():
+                child_chain = (*chain, name)
+                child_commands, child_options = _parser_shape(subparser, child_chain)
+                commands.update(child_commands)
+                options.update(child_options)
+        else:
+            flags.extend([item for item in action.option_strings if item.startswith("-")])
+
+    commands[chain] = sorted(dict.fromkeys(subcommands))
+    options[chain] = sorted(dict.fromkeys(flags))
+    return commands, options
+
+
+def _render_bash_completion(parser: argparse.ArgumentParser) -> str:
+    commands, options = _parser_shape(parser)
+
+    lines = [
+        "# bash completion for csrd",
+        "_csrd_completion() {",
+        "  local cur key token",
+        '  cur="${COMP_WORDS[COMP_CWORD]}"',
+        '  key=""',
+        "",
+        '  for token in "${COMP_WORDS[@]:1:COMP_CWORD-1}"; do',
+        '    case "$token" in',
+        "      -*) continue ;;",
+        "    esac",
+        '    if [[ -n "$key" ]]; then',
+        '      key="$key $token"',
+        "    else",
+        '      key="$token"',
+        "    fi",
+        "  done",
+        "",
+        '  case "$key" in',
+    ]
+
+    for chain in sorted(commands.keys()):
+        key = " ".join(chain)
+        command_candidates = commands.get(chain, [])
+        option_candidates = options.get(chain, [])
+        candidates = " ".join(command_candidates + option_candidates).strip()
+        if not candidates:
+            continue
+        lines.append(f'    "{key}") COMPREPLY=( $(compgen -W "{candidates}" -- "$cur") ) ;;')
+
+    lines.extend(
+        [
+            "    *) COMPREPLY=() ;;",
+            "  esac",
+            "}",
+            "complete -F _csrd_completion csrd csrd-utils csrt",
+        ]
+    )
+    return "\n".join(lines) + "\n"
+
+
+# ---------------------------------------------------------------------------
+# Parser
+# ---------------------------------------------------------------------------
+
+
+def _build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(prog="csrd", description="csrd utilities")
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"csrd-utils {version('csrd-utils')}",
+    )
+
+    sub = parser.add_subparsers(dest="command", required=True)
+
+    # ── generate ──────────────────────────────────────────────────────
+    gen = sub.add_parser("generate", help="Interactive generator menu")
+    gen.add_argument(
+        "target",
+        nargs="?",
+        choices=[
+            "workspace",
+            "preset",
+            "add-service",
+            "add-infra",
+            "remove-infra",
+            "add-augment",
+            "remove-service",
+            "list-augments",
+            "empty",
+        ],
+        help="Direct generator target",
+    )
+    gen.add_argument("--name", dest="generate_name", help="Workspace or service name")
+    gen.add_argument(
+        "--git-init",
+        action="store_true",
+        default=False,
+        help="Initialize a git repository in the generated workspace",
+    )
+    gen.add_argument(
+        "--features",
+        nargs="*",
+        choices=["database", "caching", "messaging"],
+        default=None,
+        help="Service capabilities to wire (for add-service)",
+    )
+    gen.add_argument("--port", type=int, default=None, help="Service port (for add-service)")
+    gen.add_argument(
+        "--infra-type",
+        dest="infra_type",
+        choices=["postgres", "mariadb", "sqlite", "redis", "rabbitmq"],
+        default=None,
+        help="Infrastructure type (for add-infra / remove-infra)",
+    )
+    gen.add_argument(
+        "--service-name",
+        dest="service_name",
+        default=None,
+        help="Service name (for remove-service)",
+    )
+
+    # ── compose ───────────────────────────────────────────────────────
+    compose = sub.add_parser("compose", help="Compose operations")
+    compose_sub = compose.add_subparsers(dest="compose_command")
+
+    val = compose_sub.add_parser("validate", help="Validate csrd-compose.yaml")
+    val.add_argument("--output", type=Path, default=Path.cwd(), help="Workspace root")
+    val.add_argument("--json", action="store_true", help="Print validated spec as JSON")
+
+    plan = compose_sub.add_parser("plan", help="Preview resolved compose baseline")
+    plan.add_argument("--output", type=Path, default=Path.cwd(), help="Workspace root")
+    plan.add_argument("--json", action="store_true", help="Print plan payload as JSON")
+
+    apply_cmd = compose_sub.add_parser("apply", help="Render baseline workspace artifacts")
+    apply_cmd.add_argument("--output", type=Path, default=Path.cwd(), help="Workspace root")
+    apply_cmd.add_argument(
+        "--git-init",
+        action="store_true",
+        default=False,
+        help="Initialize a git repository in the workspace",
+    )
+
+    # ── doctor ────────────────────────────────────────────────────────
+    doctor = sub.add_parser("doctor", help="Validate service compatibility")
+    doctor.add_argument("--service", type=Path, default=Path.cwd(), help="Service root path")
+    doctor.add_argument("--json", action="store_true", help="Print doctor report as JSON")
+
+    # ── audit ─────────────────────────────────────────────────────────
+    audit = sub.add_parser("audit", help="Audit weak or insecure service defaults")
+    audit.add_argument(
+        "--service",
+        type=Path,
+        default=None,
+        help="Service path (default: workspace root or cwd)",
+    )
+    audit.add_argument("--json", action="store_true", help="Print audit report as JSON")
+
+    # ── completion ────────────────────────────────────────────────────
+    completion = sub.add_parser("completion", help="Shell completion helpers")
+    completion_sub = completion.add_subparsers(dest="completion_shell", required=True)
+    completion_sub.add_parser("bash", help="Print bash completion script")
+
+    return parser
+
+
+# ---------------------------------------------------------------------------
+# Dispatch
+# ---------------------------------------------------------------------------
+
+
+def main() -> int:
+    # Shorthand: `csrd compose <path>` => `csrd compose apply --output <path>`
+    raw_argv = sys.argv[1:]
+    if len(raw_argv) >= 2 and raw_argv[0] == "compose":
+        second = raw_argv[1]
+        if second not in {"validate", "plan", "apply", "-h", "--help"} and not second.startswith(
+            "-"
+        ):
+            shorthand_dir = Path(second).resolve()
+            has_spec = (shorthand_dir / "csrd-compose.yaml").is_file() or (
+                shorthand_dir / "csrd-compose.yml"
+            ).is_file()
+            if not has_spec:
+                print(f"ERROR: Compose shorthand requires csrd-compose.yaml in: {shorthand_dir}")
+                print(
+                    "Hint: create a spec first (csrd generate workspace --name <name>) "
+                    "or use explicit apply: csrd compose apply --output <path>"
+                )
+                return 1
+            sys.argv = [sys.argv[0], "compose", "apply", "--output", second, *raw_argv[2:]]
+
+    parser = _build_parser()
+    args = parser.parse_args()
+
+    # ── generate ──────────────────────────────────────────────────────
+    if args.command == "generate":
+        return run_generate_menu(
+            target=getattr(args, "target", None),
+            name=getattr(args, "generate_name", None),
+            git_init=getattr(args, "git_init", False),
+            features=getattr(args, "features", None),
+            port=getattr(args, "port", None),
+            infra_type=getattr(args, "infra_type", None),
+            service_name=getattr(args, "service_name", None),
+        )
+
+    # ── compose ───────────────────────────────────────────────────────
+    if args.command == "compose":
+        compose_cmd = getattr(args, "compose_command", None)
+        if compose_cmd is None:
+            parser.print_help()
+            return 0
+
+        output_dir = Path(args.output).resolve()
+        try:
+            if compose_cmd == "apply":
+                generated = compose_apply(output_dir, git_init=getattr(args, "git_init", False))
+                print(f"Rendered compose workspace at: {generated}")
+                return 0
+
+            if compose_cmd == "validate":
+                spec = compose_validate(output_dir)
+                if args.json:
+                    print(json.dumps(spec.model_dump(mode="python"), indent=2, sort_keys=True))
+                else:
+                    print(f"Compose spec valid: {output_dir / 'csrd-compose.yaml'}")
+                return 0
+
+            if compose_cmd == "plan":
+                spec = compose_validate(output_dir)
+                payload = {
+                    "workspace": spec.workspace.name,
+                    "version": spec.version,
+                    "services": len(spec.services),
+                    "infra": len(spec.infra),
+                    "presets": [p.name for p in spec.presets],
+                    "overrides_keys": sorted(spec.overrides.keys()),
+                }
+                if args.json:
+                    print(json.dumps(payload, indent=2, sort_keys=True))
+                else:
+                    print("Compose plan")
+                    print(f"- workspace: {payload['workspace']}")
+                    print(f"- version: {payload['version']}")
+                    print(f"- services: {payload['services']}")
+                    print(f"- infra: {payload['infra']}")
+                    presets = payload["presets"]
+                    overrides_keys = payload["overrides_keys"]
+                    assert isinstance(presets, list)
+                    assert isinstance(overrides_keys, list)
+                    print(f"- presets: {', '.join(presets) if presets else '<none>'}")
+                    print(
+                        f"- overrides: {', '.join(overrides_keys) if overrides_keys else '<none>'}"
+                    )
+                return 0
+        except ValueError as exc:
+            print(f"ERROR: {exc}")
+            return 1
+
+    # ── completion ────────────────────────────────────────────────────
+    # ── doctor ────────────────────────────────────────────────────────
+    if args.command == "doctor":
+        service_path = Path(getattr(args, "service", Path.cwd())).resolve()
+        report = run_doctor(service_path)
+        if getattr(args, "json", False):
+            from dataclasses import asdict
+
+            print(json.dumps(asdict(report), indent=2, sort_keys=True))
+        else:
+            if report.ok:
+                print("Doctor check passed.")
+            else:
+                print("Doctor check failed.")
+            for err in report.errors:
+                print(f"ERROR: {err}")
+            for warning in report.warnings:
+                print(f"WARN: {warning}")
+        return 0 if report.ok else 1
+
+    # ── audit ─────────────────────────────────────────────────────────
+    if args.command == "audit":
+        audit_path = getattr(args, "service", None)
+        target = audit_path.resolve() if audit_path is not None else Path.cwd().resolve()
+        audit_report = run_audit(target)
+        payload = audit_report.to_payload()
+        if getattr(args, "json", False):
+            print(json.dumps(payload, indent=2, sort_keys=True))
+        else:
+            if audit_report.ok:
+                print("Audit passed (no high-severity findings).")
+            else:
+                print("Audit failed (high-severity findings detected).")
+            for finding in audit_report.findings:
+                print(
+                    f"{finding.severity.upper()}: [{finding.rule}] "
+                    f"{finding.file} :: {finding.message}"
+                )
+                print(f"  evidence: {finding.evidence}")
+                print(f"  fix: {finding.remediation}")
+        return 0 if audit_report.ok else 1
+
+    if args.command == "completion" and getattr(args, "completion_shell", None) == "bash":
+        print(_render_bash_completion(parser), end="")
+        return 0
+
+    parser.print_help()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

{csrd_utils-0.4.0 → csrd_utils-0.5.0}/src/csrd_utils/audit.py

@@ -3,6 +3,7 @@
 import re
 from dataclasses import asdict, dataclass, field
 from pathlib import Path
+from typing import Literal
 
 
 @dataclass
@@ -10,7 +11,7 @@ class AuditFinding:
     """A single hardening finding."""
 
     rule: str
-    severity: str
+    severity: Literal["high", "medium", "low"]
     message: str
     file: str
     evidence: str

{csrd_utils-0.4.0/src/csrd_utils/v2 → csrd_utils-0.5.0/src/csrd_utils}/compose/__init__.py

@@ -10,6 +10,7 @@ from ..models import (
     PresetDefinition,
     ServiceAugment,
     ServiceNode,
+    StyleDefinition,
     WorkspaceAugment,
     find_service_by_name,
     find_service_by_role,
@@ -19,6 +20,7 @@ from .augments import (
     ROLE_REGISTRY,
     AugmentDescriptor,
     OptionPrompt,
+    ProxySpec,
     RoleDescriptor,
     augment_for,
     augments_for_scope,
@@ -87,9 +89,11 @@ __all__ = [
     "InfraNode",
     "OptionPrompt",
     "PresetDefinition",
+    "ProxySpec",
     "RoleDescriptor",
     "ServiceAugment",
     "ServiceNode",
+    "StyleDefinition",
     "WorkspaceAugment",
     "add_infra",
     "add_service",