cloudwright-ai-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{cloudwright_ai_cli-0.2.0 → cloudwright_ai_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudwright-ai-cli
-Version: 0.2.0
+Version: 0.2.2
 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.2/cloudwright_cli/__init__.py

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

{cloudwright_ai_cli-0.2.0 → cloudwright_ai_cli-0.2.2}/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.2.0 → cloudwright_ai_cli-0.2.2}/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.2.0 → cloudwright_ai_cli-0.2.2}/cloudwright_cli/commands/design.py

@@ -35,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})

{cloudwright_ai_cli-0.2.0 → cloudwright_ai_cli-0.2.2}/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.2.0/cloudwright_cli/__init__.py

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