blockmachine 0.8.0__tar.gz → 0.8.2__tar.gz

{blockmachine-0.8.0 → blockmachine-0.8.2}/PKG-INFO

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

{blockmachine-0.8.0 → blockmachine-0.8.2}/blockmachine.egg-info/PKG-INFO

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

{blockmachine-0.8.0 → blockmachine-0.8.2}/commands/leaderboard.py

@@ -90,8 +90,12 @@ def _node_score_field(node: dict, field: str, archive: bool) -> Optional[float]:
     return node.get(field)
 
 
-def _is_in_rehab(node: dict, archive: bool) -> bool:
-    """True if the node has a zero routing score in the selected dimension."""
+def _is_in_probation(node: dict, archive: bool) -> bool:
+    """True if the node is explicitly reported as probation."""
+    scoring_state = node.get("scoring_state")
+    if scoring_state is not None:
+        return scoring_state == "probation"
+
     score = _node_score_field(node, "routing_score", archive)
     return score == 0.0
 
@@ -160,9 +164,9 @@ def _render_default(data: dict, own_hotkey: Optional[str], archive: bool) -> Non
             node_score = _node_score_field(node, "routing_score", archive)
             node_pf = _node_score_field(node, "price_factor", archive)
             node_traffic = node.get("_share") or 0.0
-            in_rehab = _is_in_rehab(node, archive)
+            in_probation = _is_in_probation(node, archive)
             node_name = prefix + _node_display_name(node)
-            if in_rehab:
+            if in_probation:
                 node_name += " \u21ba"
 
             table.add_row(
@@ -185,12 +189,14 @@ def _render_default(data: dict, own_hotkey: Optional[str], archive: bool) -> Non
         footer_parts.append("[yellow]*[/yellow] = your miner")
     footer_parts.append(f"{len(miners)} miners")
     footer_parts.append(f"{total_cus:,} total CUs")
-    has_rehab = any(
-        _is_in_rehab(n, archive) for m in miners_with_scores for n in m.get("nodes", [])
+    has_probation = any(
+        _is_in_probation(n, archive)
+        for m in miners_with_scores
+        for n in m.get("nodes", [])
     )
-    if has_rehab:
+    if has_probation:
         footer_parts.append(
-            "[dim]\u21ba = in rehab (zero score, receiving synthetic probes)[/dim]"
+            "[dim]\u21ba = in probation (building score via synthetic probes)[/dim]"
         )
     console.print("  " + "  \u00b7  ".join(footer_parts))
 
@@ -288,10 +294,12 @@ def _render_detail(data: dict, own_hotkey: Optional[str], archive: bool) -> None
         )
 
         for node in miner.get("nodes", []):
-            rehab_tag = (
-                "  [dim]\u21ba rehab[/dim]" if _is_in_rehab(node, archive) else ""
+            probation_tag = (
+                "  [dim]\u21ba probation[/dim]"
+                if _is_in_probation(node, archive)
+                else ""
             )
-            console.print(f"   [dim]{_node_display_name(node)}[/dim]{rehab_tag}")
+            console.print(f"   [dim]{_node_display_name(node)}[/dim]{probation_tag}")
 
             lat = node.get("latency_score") or 0.0
             rel = node.get("reliability") or 0.0

{blockmachine-0.8.0 → blockmachine-0.8.2}/commands/miner.py

@@ -17,10 +17,6 @@ from cli.config import load_config, save_config
 from cli.endpoints import get_cert_fingerprint, is_ip_endpoint, test_tls
 from cli.testing import test_health, test_rpc, test_wss
 from cli.utils import format_timestamp, resolve_node_id
-from common.pricing_units import (
-    usd_per_cu_to_usd_per_million_cu,
-    usd_per_million_cu_to_usd_per_cu,
-)
 
 app = typer.Typer(help="Miner node management")
 secret_app = typer.Typer(help="Secret management")
@@ -971,7 +967,7 @@ def price_simulate(
         raise typer.Exit(1)
 
     mode = "archive" if archive else "lite"
-    simulated_bid = usd_per_million_cu_to_usd_per_cu(price)
+    simulated_bid = price / 1_000_000
     score_key = "routing_score_archive" if archive else "routing_score"
     pf_key = "price_factor_archive" if archive else "price_factor"
     bid_key = "bid_archive" if archive else "bid"
@@ -1039,8 +1035,8 @@ def price_simulate(
         console.print(f"  [bold]{nr['alias']}[/bold]")
         console.print(
             f"    Price factor:   {_fmt_delta(nr['current_pf'], nr['new_pf'])}"
-            f"    (bid: ${usd_per_cu_to_usd_per_million_cu(nr['current_bid']):.4f}"
-            f" \u2192 ${price:.4f}, median: ${usd_per_cu_to_usd_per_million_cu(nr['median']):.4f})"
+            f"    (bid: ${nr['current_bid'] * 1_000_000:.4f}"
+            f" \u2192 ${price:.4f}, median: ${nr['median'] * 1_000_000:.4f})"
         )
         console.print(
             f"    Routing score:  {_fmt_delta(nr['current_score'], nr['new_score'])}"

{blockmachine-0.8.0 → blockmachine-0.8.2}/pyproject.toml

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

{blockmachine-0.8.0 → blockmachine-0.8.2}/tests/test_leaderboard_cli.py

@@ -179,22 +179,38 @@ class TestArchiveOrdering:
         assert archive[0]["hotkey"] == "hk-archive"
 
 
-class TestRehabDisplay:
-    def test_is_in_rehab_only_for_explicit_zero_score(self):
-        from cli.commands.leaderboard import _is_in_rehab
+class TestProbationDisplay:
+    def test_is_in_probation_prefers_explicit_scoring_state(self):
+        from cli.commands.leaderboard import _is_in_probation
+
+        assert (
+            _is_in_probation(
+                {"routing_score": 0.5, "scoring_state": "probation"}, archive=False
+            )
+            is True
+        )
+        assert (
+            _is_in_probation(
+                {"routing_score": 0.0, "scoring_state": "active"}, archive=False
+            )
+            is False
+        )
+
+    def test_is_in_probation_falls_back_to_zero_score_when_state_missing(self):
+        from cli.commands.leaderboard import _is_in_probation
 
-        assert _is_in_rehab({"routing_score": 0.0}, archive=False) is True
-        assert _is_in_rehab({"routing_score": None}, archive=False) is False
-        assert _is_in_rehab({}, archive=False) is False
+        assert _is_in_probation({"routing_score": 0.0}, archive=False) is True
+        assert _is_in_probation({"routing_score": None}, archive=False) is False
+        assert _is_in_probation({}, archive=False) is False
 
-    def test_is_in_rehab_uses_archive_score_in_archive_mode(self):
-        from cli.commands.leaderboard import _is_in_rehab
+    def test_is_in_probation_uses_archive_score_in_archive_mode(self):
+        from cli.commands.leaderboard import _is_in_probation
 
         node = {"routing_score": 1.0, "routing_score_archive": 0.0}
-        assert _is_in_rehab(node, archive=True) is True
-        assert _is_in_rehab(node, archive=False) is False
+        assert _is_in_probation(node, archive=True) is True
+        assert _is_in_probation(node, archive=False) is False
 
-    def test_render_default_shows_rehab_marker_without_literal_markup(
+    def test_render_default_shows_probation_marker_without_literal_markup(
         self, monkeypatch
     ):
         from cli.commands import leaderboard
@@ -216,7 +232,8 @@ class TestRehabDisplay:
                         "nodes": [
                             {
                                 "node_id": "node-12345678",
-                                "routing_score": 0.0,
+                                "routing_score": 0.1,
+                                "scoring_state": "probation",
                                 "latency_score": 1.0,
                                 "reliability": 1.0,
                                 "price_factor": 1.0,