cartograph-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{cartograph_cli-0.3.0 → cartograph_cli-0.3.2}/.github/workflows/fresh-install.yml

@@ -54,9 +54,12 @@ jobs:
 
       - name: Verify widget structure
         run: |
-          test -f cg/backend-ci-test-python/widget.json
-          test -d cg/backend-ci-test-python/src
-          test -d cg/backend-ci-test-python/tests
+          # Find the created widget dir dynamically instead of hardcoding
+          WIDGET_DIR=$(find cg -maxdepth 2 -name "widget.json" -printf "%h" -quit)
+          echo "Widget created at: $WIDGET_DIR"
+          test -f "$WIDGET_DIR/widget.json"
+          test -d "$WIDGET_DIR/src"
+          test -d "$WIDGET_DIR/tests"
 
       - name: cartograph stats
         run: cartograph stats

{cartograph_cli-0.3.0 → cartograph_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartograph-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Widget library manager for AI agents — CLI
 License-Expression: MIT
 License-File: LICENSE

{cartograph_cli-0.3.0 → cartograph_cli-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cartograph-cli"
-version = "0.3.0"
+version = "0.3.2"
 description = "Widget library manager for AI agents — CLI"
 readme = "README.md"
 license = "MIT"

{cartograph_cli-0.3.0 → cartograph_cli-0.3.2}/src/cartograph/installer.py

@@ -45,26 +45,29 @@ def _widget_dir(target_dir, widget_id):
     return os.path.join(target_dir, DEFAULT_INSTALL_DIR, python_dir_name(widget_id))
 
 
-def _install_from_cloud(widget_id, dest_path):
+def _install_from_cloud(widget_id, dest_path, owner_hint=None):
     """Search cloud for a widget and install it by downloading the zip."""
-    from .cloud import search as cloud_search, download_widget
-
-    # Search cloud to find the widget and its owner
-    results = cloud_search(widget_id, top_k=5)
-    widgets = results.get("widgets", [])
-    # Search results may return namespaced IDs (@owner/widget-id) or bare IDs
-    match = next(
-        (w for w in widgets
-         if w.get("id") == widget_id
-         or w.get("id", "").endswith(f"/{widget_id}")),
-        None,
-    )
-    if not match:
-        return {"error": f"Widget '{widget_id}' not found locally or in the cloud registry."}
-
-    owner = match.get("owner", "")
-    if not owner:
-        return {"error": f"Widget '{widget_id}' found in cloud but missing owner info."}
+    from .cloud import download_widget
+
+    if owner_hint:
+        # Already know the owner from @owner/widget_id format
+        owner = owner_hint
+    else:
+        # Search cloud to find the widget and its owner
+        from .cloud import search as cloud_search
+        results = cloud_search(widget_id, top_k=5)
+        widgets = results.get("widgets", [])
+        match = next(
+            (w for w in widgets
+             if w.get("id") == widget_id
+             or w.get("id", "").endswith(f"/{widget_id}")),
+            None,
+        )
+        if not match:
+            return {"error": f"Widget '{widget_id}' not found locally or in the cloud registry."}
+        owner = match.get("owner", "")
+        if not owner:
+            return {"error": f"Widget '{widget_id}' found in cloud but missing owner info."}
 
     result = download_widget(owner, widget_id)
     if "error" in result:
@@ -91,9 +94,16 @@ def _install_from_cloud(widget_id, dest_path):
 
 
 def install(carto, widget_id, target_dir, version=None):
-    """Install a widget into target_dir/cartograph/widget_id."""
+    """Install a widget into target_dir/cg/widget_id."""
     from .engine import REPO_DIR
 
+    # Strip @owner/ prefix if present (cloud widget IDs are namespaced)
+    owner_hint = None
+    if widget_id.startswith("@"):
+        parts = widget_id[1:].split("/", 1)
+        if len(parts) == 2:
+            owner_hint, widget_id = parts
+
     if not os.path.isabs(target_dir):
         return {"error": f"Target must be an absolute path, got: '{target_dir}'"}
 
@@ -134,7 +144,7 @@ def install(carto, widget_id, target_dir, version=None):
             return {"error": str(e)}
 
     # Fall back to cloud registry
-    return _install_from_cloud(widget_id, dest_path)
+    return _install_from_cloud(widget_id, dest_path, owner_hint=owner_hint)
 
 
 def upgrade(carto, widget_id, target_dir, version=None):

{cartograph_cli-0.3.0 → cartograph_cli-0.3.2}/tests/fresh_install/test_fresh_install.sh

@@ -53,14 +53,14 @@ check "cartograph create" cartograph create backend-hello-python \
     --language python --domain backend --name "Hello World"
 
 # 6. Check the widget structure exists
-check "widget structure" test -f cartograph/backend-hello-python/widget.json
-check "widget src exists" test -d cartograph/backend-hello-python/src
-check "widget tests exist" test -d cartograph/backend-hello-python/tests
+check "widget structure" test -f cg/backend_hello_python/widget.json
+check "widget src exists" test -d cg/backend_hello_python/src
+check "widget tests exist" test -d cg/backend_hello_python/tests
 
 # 7. Validate the widget (should fail on template TODOs)
 echo ""
 echo "=== validate (expect failure on TODOs) ==="
-if cartograph validate cartograph/backend-hello-python 2>&1; then
+if cartograph validate cg/backend_hello_python 2>&1; then
     echo "  NOTE: validate passed (unexpected but ok)"
 else
     echo "  Expected failure on template TODOs - PASS"