cloudwright-ai-cli 0.1.0__tar.gz → 0.2.1__tar.gz

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudwright-ai-cli
-Version: 0.1.0
+Version: 0.2.1
 Summary: CLI for Cloudwright architecture intelligence
 Project-URL: Homepage, https://github.com/xmpuspus/cloudwright
 Project-URL: Repository, https://github.com/xmpuspus/cloudwright

cloudwright_ai_cli-0.2.1/cloudwright_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.1"

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/analyze_cmd.py

@@ -27,6 +27,14 @@ def analyze(
         from cloudwright.analyzer import Analyzer
 
         spec = ArchSpec.from_file(spec_file)
+
+        if component:
+            valid_ids = {c.id for c in spec.components}
+            if component not in valid_ids:
+                console.print(f"[red]Error:[/red] Component '{component}' not found in spec.")
+                console.print(f"[dim]Available components: {', '.join(sorted(valid_ids))}[/dim]")
+                raise typer.Exit(1)
+
         analyzer = Analyzer()
         result = analyzer.analyze(spec, component_id=component)
 

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/catalog_cmd.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from typing import Annotated
 
 import typer
@@ -34,16 +35,33 @@ def catalog_search(
     memory: Annotated[float | None, typer.Option(help="Minimum memory in GB")] = None,
 ) -> None:
     """Search the cloud service catalog."""
-    filters: dict = {}
-    if provider:
-        filters["provider"] = provider.lower()
-    if vcpus is not None:
-        filters["min_vcpus"] = vcpus
-    if memory is not None:
-        filters["min_memory_gb"] = memory
+    # Extract structured filters from natural language query
+    parsed_vcpus = vcpus
+    parsed_memory = memory
+    text_query = query
+
+    if parsed_vcpus is None:
+        m = re.search(r"(\d+)\s*vcpu", query, re.IGNORECASE)
+        if m:
+            parsed_vcpus = int(m.group(1))
+            text_query = re.sub(r"\d+\s*vcpus?\s*", "", text_query, flags=re.IGNORECASE).strip()
+
+    if parsed_memory is None:
+        m = re.search(r"(\d+(?:\.\d+)?)\s*(?:gb|gib)\s*(?:memory|ram)?", query, re.IGNORECASE)
+        if m:
+            parsed_memory = float(m.group(1))
+            text_query = re.sub(r"\d+(?:\.\d+)?\s*(?:gb|gib)\s*(?:memory|ram)?\s*", "", text_query, flags=re.IGNORECASE).strip()
+
+    # Clean up leftover whitespace/empty query
+    text_query = text_query.strip() or None
 
     with console.status("Searching catalog..."):
-        results = Catalog().search(query, **filters)
+        results = Catalog().search(
+            query=text_query,
+            vcpus=parsed_vcpus,
+            memory_gb=parsed_memory,
+            provider=provider,
+        )
 
     # Resolve ctx.obj through parent chain when invoked via sub-app
     obj = ctx.obj or (ctx.parent.obj if ctx.parent else None)
@@ -67,14 +85,15 @@ def catalog_search(
     table.add_column("Notes", style="dim")
 
     for item in results:
+        price = item.get("price_per_hour")
         table.add_row(
-            item.get("service", ""),
-            item.get("provider", ""),
-            item.get("label", ""),
+            item.get("name", ""),
+            item.get("provider_id", ""),
+            item.get("family", ""),
             str(item.get("vcpus", "-")),
             str(item.get("memory_gb", "-")),
-            f"${item['hourly']:.4f}" if item.get("hourly") else "-",
-            item.get("notes", ""),
+            f"${price:.4f}" if price else "-",
+            item.get("description", ""),
         )
 
     console.print(table)

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/chat.py

@@ -4,6 +4,7 @@ from typing import Annotated
 
 import typer
 from cloudwright import Architect, ArchSpec
+from cloudwright.ascii_diagram import render_ascii
 from rich.console import Console
 from rich.panel import Panel
 from rich.prompt import Prompt
@@ -14,10 +15,14 @@ console = Console()
 
 _HELP = """\
 Commands:
-  /save <file>     Save last architecture to YAML file
-  /cost            Show cost estimate for last architecture
-  /export <fmt>    Export last architecture (terraform, mermaid, sbom, aibom)
-  /quit            Exit
+  /save <file>         Save last architecture to YAML file
+  /diagram             Show ASCII diagram for last architecture
+  /yaml                Show YAML for last architecture
+  /cost                Show cost estimate for last architecture
+  /validate [fw]       Run compliance check (hipaa, pci-dss, soc2, fedramp, gdpr)
+  /export <fmt>        Export last architecture (terraform, mermaid, d2, cloudformation, sbom, aibom)
+  /terraform           Export last architecture as Terraform
+  /quit                Exit
 """
 
 
@@ -85,6 +90,22 @@ def _run_terminal_chat() -> None:
                 console.print(f"[green]Saved to {path}[/green]")
             continue
 
+        if text == "/diagram":
+            if not last_spec:
+                console.print("[yellow]No architecture yet.[/yellow]")
+            else:
+                console.print(Rule(f"[bold cyan]{last_spec.name}[/bold cyan]"))
+                console.print(render_ascii(last_spec))
+            continue
+
+        if text == "/yaml":
+            if not last_spec:
+                console.print("[yellow]No architecture yet.[/yellow]")
+            else:
+                console.print(Rule(f"[bold cyan]{last_spec.name}[/bold cyan]"))
+                console.print(Syntax(last_spec.to_yaml(), "yaml", theme="monokai", word_wrap=True))
+            continue
+
         if text == "/cost":
             if not last_spec:
                 console.print("[yellow]No architecture yet.[/yellow]")
@@ -94,6 +115,26 @@ def _run_terminal_chat() -> None:
                 _print_cost_summary(last_spec)
             continue
 
+        if text.startswith("/validate"):
+            if not last_spec:
+                console.print("[yellow]No architecture yet.[/yellow]")
+            else:
+                parts = text.split(None, 1)
+                framework = parts[1].strip() if len(parts) > 1 else None
+                _run_validate(last_spec, framework)
+            continue
+
+        if text == "/terraform":
+            if not last_spec:
+                console.print("[yellow]No architecture to export yet.[/yellow]")
+            else:
+                try:
+                    content = last_spec.export("terraform")
+                    console.print(Syntax(content, "hcl", theme="monokai", word_wrap=True))
+                except ValueError as e:
+                    console.print(f"[red]Error:[/red] {e}")
+            continue
+
         if text.startswith("/export "):
             fmt = text[8:].strip()
             if not last_spec:
@@ -101,7 +142,9 @@ def _run_terminal_chat() -> None:
             else:
                 try:
                     content = last_spec.export(fmt)
-                    lang = {"terraform": "hcl", "mermaid": "text"}.get(fmt, "json")
+                    lang = {"terraform": "hcl", "mermaid": "text", "d2": "text", "cloudformation": "yaml"}.get(
+                        fmt, "json"
+                    )
                     console.print(Syntax(content, lang, theme="monokai", word_wrap=True))
                 except ValueError as e:
                     console.print(f"[red]Error:[/red] {e}")
@@ -124,13 +167,45 @@ def _run_terminal_chat() -> None:
         last_spec = spec
         history.append({"role": "assistant", "content": f"Designed: {spec.name}"})
 
-        yaml_str = spec.to_yaml()
         console.print(Rule(f"[bold cyan]{spec.name}[/bold cyan]"))
-        console.print(Syntax(yaml_str, "yaml", theme="monokai", word_wrap=True))
+        console.print(render_ascii(spec))
 
         if spec.cost_estimate:
             _print_cost_summary(spec)
 
+        from cloudwright_cli.utils import auto_save_spec
+
+        save_path = auto_save_spec(spec)
+        console.print(f"[dim]Saved: {save_path}[/dim]")
+
+        suggestions = spec.metadata.get("suggestions", [])
+        if suggestions:
+            console.print(f"[dim]Try: {' | '.join(repr(s) for s in suggestions[:3])}[/dim]")
+
+
+def _run_validate(spec: ArchSpec, framework: str | None) -> None:
+    from cloudwright.validator import Validator
+
+    if framework:
+        results = Validator().validate(spec, compliance=[framework])
+    else:
+        results = Validator().validate(spec, well_architected=True)
+
+    if not results:
+        console.print("[yellow]No validation results.[/yellow]")
+        return
+
+    for result in results:
+        passed = sum(1 for c in result.checks if c.passed)
+        total = len(result.checks)
+        status = "[green]PASS[/green]" if result.passed else "[red]FAIL[/red]"
+        console.print(f"{result.framework}: {status}  ({passed}/{total} checks passed)")
+        for check in result.checks:
+            icon = "[green]+[/green]" if check.passed else "[red]-[/red]"
+            console.print(f"  {icon} {check.name}")
+            if not check.passed and check.recommendation:
+                console.print(f"    [dim]{check.recommendation}[/dim]")
+
 
 def _looks_like_modification(text: str) -> bool:
     mod_verbs = (

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/design.py

@@ -5,6 +5,9 @@ from typing import Annotated
 
 import typer
 from cloudwright import Architect, Constraints
+from cloudwright.ascii_diagram import render_ascii, render_next_steps
+from cloudwright.cost import CostEngine
+from cloudwright.validator import Validator
 from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
@@ -23,6 +26,7 @@ def design(
         list[str] | None, typer.Option(help="Compliance frameworks (hipaa, pci-dss, soc2, fedramp, gdpr)")
     ] = None,
     output: Annotated[Path | None, typer.Option("--output", "-o", help="Write YAML to file")] = None,
+    yaml_output: Annotated[bool, typer.Option("--yaml")] = False,
 ) -> None:
     """Design a cloud architecture from a natural language description."""
     constraints = Constraints(
@@ -31,8 +35,14 @@ def design(
         compliance=compliance or [],
     )
 
+    try:
+        architect = Architect()
+    except RuntimeError as e:
+        console.print(f"[red]Error:[/red] {e}")
+        raise typer.Exit(1) from None
+
     with console.status("Designing architecture..."):
-        spec = Architect().design(description, constraints=constraints)
+        spec = architect.design(description, constraints=constraints)
         # Set provider/region from CLI args if not overridden by LLM
         if spec.provider == "aws" and provider != "aws":
             spec = spec.model_copy(update={"provider": provider})
@@ -47,20 +57,48 @@ def design(
 
     yaml_str = spec.to_yaml()
 
-    console.print(
-        Panel(
-            Syntax(yaml_str, "yaml", theme="monokai", word_wrap=True),
-            title=f"[bold cyan]{spec.name}[/bold cyan]",
-            subtitle=f"{spec.provider.upper()} / {spec.region}",
+    if yaml_output:
+        console.print(
+            Panel(
+                Syntax(yaml_str, "yaml", theme="monokai", word_wrap=True),
+                title=f"[bold cyan]{spec.name}[/bold cyan]",
+                subtitle=f"{spec.provider.upper()} / {spec.region}",
+            )
         )
-    )
+        if spec.cost_estimate:
+            _print_cost_table(spec)
+        if output:
+            output.write_text(yaml_str)
+            console.print(f"[green]Saved to {output}[/green]")
+        return
+
+    # Default: ASCII diagram + auto-save + next steps
+    console.print(render_ascii(spec))
+
+    if not spec.cost_estimate:
+        spec = spec.model_copy(update={"cost_estimate": CostEngine().estimate(spec)})
+    _print_cost_table(spec)
 
-    if spec.cost_estimate:
-        _print_cost_table(spec)
+    _print_compliance_flags(spec)
 
-    if output:
-        output.write_text(yaml_str)
-        console.print(f"[green]Saved to {output}[/green]")
+    from cloudwright_cli.utils import auto_save_spec
+
+    save_path = auto_save_spec(spec, output)
+    console.print(f"[dim]Saved: {save_path}[/dim]")
+    console.print(f"[dim]{render_next_steps()}[/dim]")
+
+
+def _print_compliance_flags(spec) -> None:
+    results = Validator().validate(spec, well_architected=True)
+    if not results:
+        return
+    wa = results[0]
+    total = len(wa.checks)
+    passed = sum(1 for c in wa.checks if c.passed)
+    console.print(
+        f"[dim]Well-Architected: {passed}/{total} checks passed  |  "
+        "Run 'cloudwright validate --compliance hipaa' for full report[/dim]"
+    )
 
 
 def _print_cost_table(spec) -> None:

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/export.py

@@ -15,6 +15,10 @@ _SYNTAX_MAP = {
     "terraform": "hcl",
     "cloudformation": "yaml",
     "mermaid": "text",
+    "d2": "text",
+    "svg": "xml",
+    "png": "text",
+    "c4": "text",
     "sbom": "json",
     "aibom": "json",
 }
@@ -23,10 +27,17 @@ _SYNTAX_MAP = {
 def export(
     ctx: typer.Context,
     spec_file: Annotated[Path, typer.Argument(help="Path to spec YAML file", exists=True)],
-    format: Annotated[str, typer.Option("--format", "-f", help=f"Export format: {', '.join(FORMATS)}")],
+    format: Annotated[
+        str,
+        typer.Option(
+            "--format",
+            "-f",
+            help=f"Export format: {', '.join(FORMATS)}. svg/png require the D2 binary (https://d2lang.com).",
+        ),
+    ],
     output: Annotated[Path | None, typer.Option("--output", "-o", help="Output file or directory")] = None,
 ) -> None:
-    """Export an architecture spec to Terraform, CloudFormation, Mermaid, SBOM, or AIBOM."""
+    """Export an architecture spec to Terraform, CloudFormation, Mermaid, SVG, PNG, SBOM, or AIBOM."""
     fmt = format.lower().strip()
     if fmt not in FORMATS and fmt != "cfn":
         console.print(f"[red]Error:[/red] Unknown format {fmt!r}. Supported: {', '.join(FORMATS)}")
@@ -46,6 +57,36 @@ def export(
         output_dir_str = output_str
         output_str = None
 
+    # PNG is binary — handle separately before the text-oriented path
+    if fmt == "png":
+        from cloudwright.exporter.renderer import DiagramRenderer
+
+        if not DiagramRenderer.is_available():
+            console.print(
+                "[red]Error:[/red] D2 binary not found. Install: curl -fsSL https://d2lang.com/install.sh | sh"
+            )
+            raise typer.Exit(1)
+
+        with console.status("Rendering PNG via D2..."):
+            data = DiagramRenderer().render_png(spec)
+
+        if output:
+            output.write_bytes(data)
+            console.print(f"[green]Written to {output}[/green]")
+        else:
+            console.print(f"[green]PNG rendered: {len(data)} bytes (use --output to save)[/green]")
+        return
+
+    # Warn when svg/c4 requested but D2 not installed — render still proceeds with fallback
+    if fmt in ("svg", "c4"):
+        from cloudwright.exporter.renderer import DiagramRenderer
+
+        if not DiagramRenderer.is_available():
+            console.print(
+                "[yellow]Warning:[/yellow] D2 binary not found — returning D2 source text. "
+                "Install: curl -fsSL https://d2lang.com/install.sh | sh"
+            )
+
     with console.status(f"Exporting as {fmt}..."):
         content = spec.export(fmt, output=output_str, output_dir=output_dir_str)
 

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/commands/modify_cmd.py

@@ -40,8 +40,13 @@ def modify(
 
         console.print(f"Modifying [cyan]{spec_file}[/cyan]: [yellow]{instruction}[/yellow]\n")
 
-        with console.status("Applying modification..."):
+        try:
             architect = Architect()
+        except RuntimeError as e:
+            console.print(f"[red]Error:[/red] {e}")
+            raise typer.Exit(1) from None
+
+        with console.status("Applying modification..."):
             modified = architect.modify(original, instruction)
 
         # Price both versions; ignore errors (catalog may not have all services)

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/cloudwright_cli/utils.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import json
+import re
+from pathlib import Path
 
 import typer
 from rich.console import Console
@@ -35,3 +37,13 @@ def handle_error(ctx: typer.Context, e: Exception) -> None:
         _err_console.print_exception()
 
     raise typer.Exit(1)
+
+
+def auto_save_spec(spec, explicit_output: Path | None = None) -> Path:
+    if explicit_output:
+        explicit_output.write_text(spec.to_yaml())
+        return explicit_output
+    slug = re.sub(r"[^a-z0-9]+", "-", spec.name.lower()).strip("-")
+    path = Path(f"{slug}.yaml")
+    path.write_text(spec.to_yaml())
+    return path

{cloudwright_ai_cli-0.1.0 → cloudwright_ai_cli-0.2.1}/tests/test_cli.py

@@ -65,7 +65,7 @@ def spec_pair(tmp_path: Path) -> tuple[Path, Path]:
 class TestAppHelp:
     def test_no_args_shows_help(self):
         result = runner.invoke(app, [])
-        assert result.exit_code == 0
+        assert result.exit_code in (0, 2)  # Typer returns 2 for missing required command
         assert "cloudwright" in result.output.lower() or "architecture" in result.output.lower()
 
     def test_help_flag(self):
@@ -263,6 +263,45 @@ class TestJsonOutput:
         assert "comparison" in data
 
 
+class TestRenderNextSteps:
+    def test_render_next_steps_content(self):
+        from cloudwright.ascii_diagram import render_next_steps
+
+        result = render_next_steps()
+        assert "cloudwright cost" in result
+        assert "cloudwright validate" in result
+
+    def test_render_next_steps_returns_string(self):
+        from cloudwright.ascii_diagram import render_next_steps
+
+        result = render_next_steps()
+        assert isinstance(result, str)
+        assert len(result) > 0
+
+
+class TestAutoSaveSpec:
+    def test_auto_save_explicit_output(self, tmp_path: Path):
+        from cloudwright import ArchSpec
+        from cloudwright_cli.utils import auto_save_spec
+
+        spec = ArchSpec.from_yaml(_SPEC_YAML)
+        out = tmp_path / "out.yaml"
+        result = auto_save_spec(spec, out)
+        assert result == out
+        assert out.exists()
+
+    def test_auto_save_slug_path(self, tmp_path: Path, monkeypatch):
+        from cloudwright import ArchSpec
+        from cloudwright_cli.utils import auto_save_spec
+
+        monkeypatch.chdir(tmp_path)
+        spec = ArchSpec.from_yaml(_SPEC_YAML)
+        result = auto_save_spec(spec)
+        assert result.exists()
+        assert result.suffix == ".yaml"
+        assert "test" in result.stem
+
+
 class TestErrorHandling:
     def test_error_handling_invalid_yaml(self, tmp_path: Path):
         bad_yaml = tmp_path / "bad.yaml"

cloudwright_ai_cli-0.1.0/cloudwright_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"