blockmachine 0.3.0__tar.gz → 0.3.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockmachine
-Version: 0.3.0
+Version: 0.3.2
 Summary: Blockmachine CLI - Miner and validator operator interface
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/taostat/blockmachine

{blockmachine-0.3.0 → blockmachine-0.3.2}/blockmachine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockmachine
-Version: 0.3.0
+Version: 0.3.2
 Summary: Blockmachine CLI - Miner and validator operator interface
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/taostat/blockmachine

{blockmachine-0.3.0 → blockmachine-0.3.2}/commands/miner.py

@@ -8,7 +8,7 @@ import logging
 import socket
 import ssl
 import time
-from typing import Optional
+from typing import Callable, Optional
 from urllib.parse import urlparse
 
 import httpx
@@ -116,6 +116,17 @@ def _test_tls(hostname: str, port: int) -> tuple[bool, Optional[str], str]:
         return False, None, str(e)
 
 
+def _bracket_ipv6(hostname: str) -> str:
+    """Wrap bare IPv6 addresses in brackets for use in URLs."""
+    try:
+        addr = ipaddress.ip_address(hostname)
+        if addr.version == 6:
+            return f"[{hostname}]"
+    except ValueError:
+        pass
+    return hostname
+
+
 def _is_ip_endpoint(endpoint: str) -> bool:
     """Return True if the endpoint hostname is an IP address (not a domain)."""
     hostname = urlparse(endpoint).hostname
@@ -344,23 +355,100 @@ def show(
         node_id = _resolve_node(client, alias)
         response = client.get(f"/nodes/{node_id}")
 
-    if response.status_code == 404:
-        console.print(f"[red]Node not found:[/red] {alias}")
-        raise typer.Exit(1)
-    if response.status_code != 200:
-        console.print(f"[red]Error:[/red] {response.status_code} - {response.text}")
-        raise typer.Exit(1)
+        if response.status_code == 404:
+            console.print(f"[red]Node not found:[/red] {alias}")
+            raise typer.Exit(1)
+        if response.status_code != 200:
+            console.print(f"[red]Error:[/red] {response.status_code} - {response.text}")
+            raise typer.Exit(1)
 
-    node = response.json()
-    console.print(f"[bold]ID:[/bold] {node['id']}")
-    console.print(f"[bold]Alias:[/bold] {node.get('alias') or '-'}")
-    console.print(f"[bold]Chain:[/bold] {node['chain']}")
-    console.print(f"[bold]Status:[/bold] {node['status']}")
-    console.print(f"[bold]Endpoint:[/bold] {node['endpoint']}")
-    console.print(f"[bold]Created:[/bold] {format_timestamp(node['created_at'])}")
-    console.print(
-        f"[bold]Last Seen:[/bold] {format_timestamp(node.get('last_seen_at'))}"
-    )
+        node = response.json()
+        console.print(f"[bold]ID:[/bold] {node['id']}")
+        console.print(f"[bold]Alias:[/bold] {node.get('alias') or '-'}")
+        console.print(f"[bold]Chain:[/bold] {node['chain']}")
+        console.print(f"[bold]Status:[/bold] {node['status']}")
+        console.print(f"[bold]Endpoint:[/bold] {node['endpoint']}")
+        console.print(f"[bold]Created:[/bold] {format_timestamp(node['created_at'])}")
+        console.print(
+            f"[bold]Last Seen:[/bold] {format_timestamp(node.get('last_seen_at'))}"
+        )
+
+        m_resp = client.get(f"/nodes/{node_id}/metrics")
+        if m_resp.status_code == 200:
+            m = m_resp.json()
+            if m.get("available"):
+                console.print()
+                console.print("[bold]Routing Metrics[/bold]")
+                _print_metrics(m)
+
+
+def _fmt_success_rate(v: float) -> str:
+    pct = v * 100
+    color = "green" if pct >= 99 else "yellow" if pct >= 95 else "red"
+    return f"[{color}]{pct:.1f}%[/{color}]"
+
+
+_METRIC_FIELDS: list[tuple[str, str, Callable]] = [
+    ("request_count", "Requests", lambda v: f"{v:,}"),
+    ("success_rate", "Success Rate", _fmt_success_rate),
+    ("p95_ms", "P95 Latency", lambda v: f"{v:.0f} ms"),
+    ("latency_score", "Latency Score", lambda v: f"{v:.4f}"),
+    ("routing_score", "Routing Score", lambda v: f"{v:.4f}"),
+    ("traffic_pct", "Traffic Share", lambda v: f"{v:.1f}%"),
+    ("reliability", "Reliability", lambda v: f"{v:.4f}"),
+    ("epochs_good", "Epochs Good", str),
+    ("bid", "Bid", lambda v: f"${v:.6f}"),
+    ("cohort_median", "Cohort Median", lambda v: f"${v:.6f}"),
+    ("price_factor", "Price Factor", lambda v: f"{v:.4f}"),
+]
+
+
+def _print_metrics(m: dict) -> None:
+    """Print routing metrics from a metrics API response."""
+    table = Table(show_header=False, box=None, padding=(0, 2))
+    table.add_column("Key", style="bold")
+    table.add_column("Value")
+
+    for key, label, fmt in _METRIC_FIELDS:
+        val = m.get(key)
+        if val is not None:
+            table.add_row(label, fmt(val))
+
+    console.print(table)
+
+
+@app.command("metrics")
+def metrics(
+    alias: str = typer.Argument(None, help="Node alias or ID"),
+) -> None:
+    """Show routing metrics for a miner node."""
+    alias = _get_alias(alias)
+    config = load_config()
+
+    with RegistryClient(config) as client:
+        node_id = _resolve_node(client, alias)
+        response = client.get(f"/nodes/{node_id}/metrics")
+
+        if response.status_code == 503:
+            console.print(
+                "[yellow]Metrics not available (scoring not enabled)[/yellow]"
+            )
+            raise typer.Exit(1)
+        if response.status_code != 200:
+            console.print(f"[red]Error:[/red] {response.status_code} - {response.text}")
+            raise typer.Exit(1)
+
+        m = response.json()
+        if not m.get("available"):
+            console.print(
+                f"[yellow]No metrics available for {alias}[/yellow]\n"
+                "[dim]The gateway may not have routed traffic to this"
+                " node yet.[/dim]"
+            )
+            return
+
+        console.print(f"[bold]Routing Metrics: {alias}[/bold]\n")
+        _print_metrics(m)
 
 
 @app.command("rm")
@@ -443,7 +531,7 @@ def _test_health(hostname: str) -> tuple[bool, str]:
     """Test HTTP health endpoint on port 80."""
     try:
         r = httpx.get(
-            f"http://{hostname}/health",
+            f"http://{_bracket_ipv6(hostname)}/health",
             timeout=10,
             follow_redirects=True,
         )
@@ -458,7 +546,7 @@ def _test_rpc(
     hostname: str, port: int, secret: str
 ) -> tuple[bool, Optional[float], str]:
     """Send system_health RPC over HTTPS. Return (ok, latency_ms, message)."""
-    url = f"https://{hostname}:{port}"
+    url = f"https://{_bracket_ipv6(hostname)}:{port}"
     payload = {
         "jsonrpc": "2.0",
         "method": "system_health",

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "blockmachine"
-version = "0.3.0"
+version = "0.3.2"
 description = "Blockmachine CLI - Miner and validator operator interface"
 requires-python = ">=3.10"
 license = "MIT"