astromesh-cli 0.1.1__tar.gz → 0.2.0__tar.gz

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/.gitignore

@@ -22,7 +22,9 @@ htmlcov/
 .coverage
 *.log
 .uv/
-uv.lock
+# uv.lock se versiona a propósito: sin él CI resolvía dependencias frescas en
+# cada corrida y el gate podía romperse por calendario en vez de por commits
+# (pasó con ruff 0.16). Para actualizar una dependencia: `uv lock --upgrade-package <nombre>`.
 target/
 native/target/
 *.so
@@ -37,3 +39,7 @@ docs-site/.astro/
 
 # Astromesh Orbit working directory
 .orbit/
+
+# SDD scratch
+.superpowers/
+config/connections.yaml

astromesh_cli-0.2.0/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.0] - 2026-07-27
+
+### Added
+- `run` now surfaces the per-model consumption breakdown (`usage.by_model`, astromesh core v0.36.0): a "Por modelo" table with provider / model / role / calls / tokens in-out / cost.
+- `version` now also reports the installed astromesh **core** version (via `importlib.metadata`), not just the CLI's own.
+
+### Changed
+- Bumped the astromesh core dependency pin to `>=0.36.0`.
+- `run` and `ask` now read the real run-response contract (`answer` + `usage`) instead of the stale `response`/`tokens_used` field names, via a shared `_format_run_output` helper; `trace_id` is read from the nested `trace`. `ask` previously rendered an empty body against core ≥ the version that introduced `answer`.

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: astromesh-cli
-Version: 0.1.1
+Version: 0.2.0
 Summary: CLI tool for managing Astromesh nodes and clusters
 License: Apache-2.0
 Requires-Python: >=3.12
-Requires-Dist: astromesh>=0.18.0
+Requires-Dist: astromesh>=0.36.0
 Requires-Dist: jinja2>=3.1.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.12.0

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/astromesh_cli/__init__.py

@@ -1,3 +1,3 @@
 """Astromesh CLI — manage Astromesh nodes and clusters."""
 
-__version__ = "0.1.1"
+__version__ = "0.2.0"

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/astromesh_cli/commands/ask.py

@@ -7,8 +7,10 @@ from typing import Optional
 import typer
 from rich.markdown import Markdown
 from rich.panel import Panel
+from rich.table import Table
 
 from astromesh_cli.client import api_post_with_timeout
+from astromesh_cli.commands.run import _format_run_output
 from astromesh_cli.output import console, print_error, print_json
 
 COPILOT_AGENT = "astromesh-copilot"
@@ -98,14 +100,25 @@ def ask_command(
         print_json(data)
         return
 
-    response_text = data.get("response", "")
-    trace_id = data.get("trace_id", "N/A")
+    text, subtitle, by_model_rows = _format_run_output(data)
 
     console.print(
         Panel(
-            Markdown(response_text),
+            Markdown(text),
             title="[cyan]Astromesh Copilot[/cyan]",
-            subtitle=f"trace: {trace_id}",
+            subtitle=subtitle,
             border_style="cyan",
         )
     )
+    if by_model_rows:
+        table = Table(title="Por modelo", show_header=True)
+        for col in ("Provider", "Model", "Role", "Calls", "In", "Out", "Cost"):
+            table.add_column(col, style="cyan" if col == "Provider" else None)
+        for r in by_model_rows:
+            cost = r.get("cost", 0.0) or 0.0
+            table.add_row(
+                r.get("provider", ""), r.get("model", ""), r.get("role", ""),
+                str(r.get("calls", 0)), str(r.get("tokens_in", 0)), str(r.get("tokens_out", 0)),
+                f"${cost:.4f}" if cost else "—",
+            )
+        console.print(table)

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/astromesh_cli/commands/run.py

@@ -12,6 +12,30 @@ from astromesh_cli.client import api_post_with_timeout
 from astromesh_cli.output import console, print_error, print_json
 
 
+def _format_run_output(data: dict) -> tuple[str, str, list[dict]]:
+    """Extrae (texto, subtítulo, filas by_model) de la respuesta de /run.
+
+    Prefiere el contrato del core v0.36.0 (answer + usage{tokens_in, tokens_out,
+    by_model}); cae a los campos legacy (response + tokens_used) si no está.
+    El trace_id se extrae de `trace.trace_id` (el trace anidado), no de un
+    campo top-level, y también se usa para armar el subtítulo.
+    """
+    text = data.get("answer") or data.get("response", "")
+    trace_id = (data.get("trace") or {}).get("trace_id", "N/A")
+    usage = data.get("usage")
+    if isinstance(usage, dict):
+        tin = usage.get("tokens_in", 0)
+        tout = usage.get("tokens_out", 0)
+        tokens = tin + tout
+        by_model = usage.get("by_model") or []
+    else:
+        tokens = data.get("tokens_used", "N/A")
+        by_model = []
+    rows = [m for m in by_model if isinstance(m, dict)]
+    subtitle = f"trace: {trace_id} | tokens: {tokens}"
+    return text, subtitle, rows
+
+
 def run_command(
     name: str = typer.Argument(..., help="Agent or workflow name to run"),
     query: str = typer.Argument("", help="Query to send to the agent"),
@@ -48,18 +72,27 @@ def run_command(
         print_json(data)
         return
 
-    response_text = data.get("response", "")
-    trace_id = data.get("trace_id", "N/A")
-    tokens = data.get("tokens_used", "N/A")
-
+    text, subtitle, by_model_rows = _format_run_output(data)
     console.print(
         Panel(
-            response_text,
+            text,
             title=f"[cyan]{name}[/cyan]",
-            subtitle=f"trace: {trace_id} | tokens: {tokens}",
+            subtitle=subtitle,
             border_style="blue",
         )
     )
+    if by_model_rows:
+        table = Table(title="Por modelo", show_header=True)
+        for col in ("Provider", "Model", "Role", "Calls", "In", "Out", "Cost"):
+            table.add_column(col, style="cyan" if col == "Provider" else None)
+        for r in by_model_rows:
+            cost = r.get("cost", 0.0) or 0.0
+            table.add_row(
+                r.get("provider", ""), r.get("model", ""), r.get("role", ""),
+                str(r.get("calls", 0)), str(r.get("tokens_in", 0)), str(r.get("tokens_out", 0)),
+                f"${cost:.4f}" if cost else "—",
+            )
+        console.print(table)
 
 
 def _run_workflow(

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/astromesh_cli/main.py

@@ -49,7 +49,13 @@ app.command("ask")(ask.ask_command)
 @app.command()
 def version():
     """Show astromesh version."""
-    typer.echo(f"astromesh {__version__}")
+    from importlib.metadata import PackageNotFoundError, version as _pkg_version
+
+    typer.echo(f"astromesh-cli {__version__}")
+    try:
+        typer.echo(f"astromesh core {_pkg_version('astromesh')}")
+    except PackageNotFoundError:
+        typer.echo("astromesh core (not installed)")
 
 
 # Plugin discovery — after all static registrations

{astromesh_cli-0.1.1 → astromesh_cli-0.2.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "astromesh-cli"
-version = "0.1.1"
+version = "0.2.0"
 description = "CLI tool for managing Astromesh nodes and clusters"
 requires-python = ">=3.12"
 license = {text = "Apache-2.0"}
 dependencies = [
-    "astromesh>=0.18.0",
+    "astromesh>=0.36.0",
     "typer>=0.12.0",
     "rich>=13.0.0",
     "jinja2>=3.1.0",

astromesh_cli-0.2.0/tests/test_ask.py

@@ -0,0 +1,84 @@
+"""Tests for the `ask` command against the core v0.36.0 response shape."""
+
+from unittest.mock import MagicMock, patch
+
+from typer.testing import CliRunner
+
+from astromesh_cli.main import app
+
+runner = CliRunner()
+
+
+def _mock_httpx_post(payload: dict):
+    mock_response = MagicMock()
+    mock_response.json.return_value = payload
+    mock_response.raise_for_status = MagicMock()
+    return mock_response
+
+
+def test_ask_renders_answer_for_v036_shape():
+    """The ask command must render `answer` (not the stale `response` field)."""
+    payload = {
+        "answer": "Esta es la respuesta del copiloto.",
+        "steps": [],
+        "usage": {"tokens_in": 12, "tokens_out": 8, "model": "llama3", "by_model": []},
+        "trace": {"trace_id": "trace-xyz"},
+    }
+    with patch("astromesh_cli.client.httpx") as mock_httpx:
+        mock_httpx.post.return_value = _mock_httpx_post(payload)
+        result = runner.invoke(app, ["ask", "hola"])
+
+    assert result.exit_code == 0
+    assert "Esta es la respuesta del copiloto." in result.stdout
+    # trace_id must come from the nested `trace` dict, not a stale top-level field.
+    assert "trace-xyz" in result.stdout
+
+
+def test_ask_falls_back_to_legacy_response_field():
+    payload = {"response": "respuesta legacy", "tokens_used": 5}
+    with patch("astromesh_cli.client.httpx") as mock_httpx:
+        mock_httpx.post.return_value = _mock_httpx_post(payload)
+        result = runner.invoke(app, ["ask", "hola"])
+
+    assert result.exit_code == 0
+    assert "respuesta legacy" in result.stdout
+
+
+def test_ask_renders_by_model_table():
+    payload = {
+        "answer": "hola",
+        "usage": {
+            "tokens_in": 10,
+            "tokens_out": 5,
+            "model": "llama3",
+            "by_model": [
+                {
+                    "provider": "ollama",
+                    "model": "llama3",
+                    "role": "default",
+                    "calls": 2,
+                    "tokens_in": 10,
+                    "tokens_out": 5,
+                    "cost": 0.0,
+                },
+            ],
+        },
+        "trace": {"trace_id": "trace-abc"},
+    }
+    with patch("astromesh_cli.client.httpx") as mock_httpx:
+        mock_httpx.post.return_value = _mock_httpx_post(payload)
+        result = runner.invoke(app, ["ask", "hola"])
+
+    assert result.exit_code == 0
+    assert "Por modelo" in result.stdout
+    assert "ollama" in result.stdout
+
+
+def test_ask_json_output_unchanged():
+    payload = {"answer": "hola", "usage": {"tokens_in": 1, "tokens_out": 1}}
+    with patch("astromesh_cli.client.httpx") as mock_httpx:
+        mock_httpx.post.return_value = _mock_httpx_post(payload)
+        result = runner.invoke(app, ["ask", "hola", "--json"])
+
+    assert result.exit_code == 0
+    assert '"answer"' in result.stdout

astromesh_cli-0.2.0/tests/test_run_usage.py

@@ -0,0 +1,40 @@
+from astromesh_cli.commands.run import _format_run_output
+
+
+def test_reads_answer_and_usage_totals():
+    data = {
+        "answer": "hola",
+        "steps": [],
+        "usage": {"tokens_in": 10, "tokens_out": 5, "model": "llama3", "by_model": []},
+    }
+    text, subtitle, rows = _format_run_output(data)
+    assert text == "hola"
+    assert "15" in subtitle or ("10" in subtitle and "5" in subtitle)
+    assert rows == []
+
+
+def test_builds_by_model_rows():
+    data = {
+        "answer": "hola",
+        "usage": {
+            "tokens_in": 10,
+            "tokens_out": 5,
+            "model": "llama3",
+            "by_model": [
+                {"provider": "ollama", "model": "llama3", "role": "default",
+                 "calls": 2, "tokens_in": 10, "tokens_out": 5, "cost": 0.0},
+            ],
+        },
+    }
+    _text, _subtitle, rows = _format_run_output(data)
+    assert rows[0]["provider"] == "ollama"
+    assert rows[0]["model"] == "llama3"
+
+
+def test_falls_back_to_legacy_fields():
+    # Pre-v0.36 / daemon that returns response+tokens_used and no usage object.
+    data = {"response": "hola", "tokens_used": 42}
+    text, subtitle, rows = _format_run_output(data)
+    assert text == "hola"
+    assert "42" in subtitle
+    assert rows == []

astromesh_cli-0.2.0/tests/test_version.py

@@ -0,0 +1,11 @@
+from typer.testing import CliRunner
+from astromesh_cli.main import app
+
+runner = CliRunner()
+
+
+def test_version_reports_cli_and_core():
+    result = runner.invoke(app, ["version"])
+    assert result.exit_code == 0
+    assert "cli" in result.stdout.lower()
+    assert "core" in result.stdout.lower()