sima-cli 2.1.19__tar.gz → 2.1.20__tar.gz

{sima_cli-2.1.19/sima_cli.egg-info → sima_cli-2.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sima-cli
-Version: 2.1.19
+Version: 2.1.20
 Summary: CLI tool for SiMa Developer Portal to download models, firmware, and apps.
 Home-page: https://community.sima.ai/
 Author: SiMa.ai

{sima_cli-2.1.19 → sima_cli-2.1.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sima-cli"
-version = "2.1.19"
+version = "2.1.20"
 description = "CLI tool for SiMa Developer Portal to download models, firmware, and apps."
 readme = "README.md"
 requires-python = ">=3.8"

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/__version__.py

@@ -1,2 +1,2 @@
 # sima_cli/__version__.py
-__version__ = "2.1.19"
+__version__ = "2.1.20"

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/cli.py

@@ -180,7 +180,7 @@ class InspectionAwareGroup(click.Group):
             _command_name_from_argv(['sima-cli'] + options) == 'bootimg'
             and any(arg in ('--netboot', '-n', '--autoflash', '-a') for arg in options)
         )
-        if _command_name_from_argv(['sima-cli'] + options) == 'update' and any(arg in ('--inspect', '--swap') for arg in options):
+        if _command_name_from_argv(['sima-cli'] + options) == 'update' and any(arg in ('--inspect', '--swap', '--reset-overlay') for arg in options):
             ctx.meta['update_inspect'] = True
         return super().parse_args(ctx, args)
 
@@ -363,15 +363,16 @@ def download(ctx, url, dest):
     "--dryrun",
     is_flag=True,
     default=False,
-    help="For eLxr, preview an update or slot swap without installing, switching slots, or rebooting."
+    help="For eLxr, preview an update, slot swap, or overlay reset without making changes."
 )
 @click.option("--inspect", "inspect_state", is_flag=True, help="Show eLxr 3.0+ A/B slots and overlay customizations without updating (local or --ip).")
+@click.option("--reset-overlay", is_flag=True, help="Discard local overlay software and settings without updating firmware; reboot to use the clean system (eLxr 3.0+).")
 @click.option("--swap", is_flag=True, help="Select the available inactive eLxr 3.0+ slot for next boot; use --reboot to restart now.")
 @click.option("--verbose", is_flag=True, help="Show detailed overlay file categories during eLxr 3.0+ inspection or update.")
 @click.option("--signing-cert", metavar="URL_OR_FILE", help="SWUpdate PEM verification certificate: HTTP(S) URL or local file. Defaults to the certificate for the selected channel when configured (eLxr 3.0+).")
-@click.option("--reboot", is_flag=True, help="Reboot after successful eLxr 3.0+ installation or slot selection; verify remote boot health.")
+@click.option("--reboot", is_flag=True, help="Reboot after successful eLxr 3.0+ installation, slot selection, or overlay reset.")
 @click.pass_context
-def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force, troot_only, dryrun, inspect_state, verbose, reboot, signing_cert, swap):
+def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force, troot_only, dryrun, inspect_state, verbose, reboot, signing_cert, swap, reset_overlay):
     """
     Update a SiMa DevKit, remote device, or Linux PCIe host.
 
@@ -383,6 +384,10 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
     eLxr 3.0+ uses signed full-system SWU bundles. Use --inspect for A/B
     state, --ip for remote updates, and --reboot to reboot after installation.
 
+    Use --reset-overlay to discard local software and settings without updating
+    firmware or switching slots. Save needed files first; the saved inventory
+    contains metadata only. Reboot promptly, or add --reboot. Use --dryrun to preview.
+
     Use --swap to select the valid inactive slot without downloading an update.
     The current and target versions are shown before confirmation; --yes skips
     confirmation. Reboot separately to apply, or add --reboot to restart now.
@@ -393,7 +398,8 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
 
     The verification certificate is downloaded for the selected channel when configured; use
     --signing-cert URL_OR_FILE for an image signed with your own certificate.
-    Developer-portal version lookup for 3.0 is not available yet.
+    For official eLxr 3.0+ releases, specify -v 3.0.0 (or -v 3.0) to
+    download the SWU from docs.sima.ai using your developer-portal login.
 
     Internal mode warns that pre-release software may be unstable and is used
     at your own risk. On eLxr 3.0+, unavailable Artifactory access falls back
@@ -501,6 +507,7 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
         or troot_only
         or inspect_state
         or swap
+        or reset_overlay
         or verbose
         or reboot
         or force
@@ -518,6 +525,8 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
         return
 
     is_elxr = is_devkit_running_elxr()
+    if reset_overlay and (inspect_state or swap or version_or_url or force or troot_only or signing_cert is not None or flavor != "auto"):
+        raise click.UsageError("--reset-overlay cannot be combined with --inspect, --swap, or installation options.")
     if swap and (inspect_state or version_or_url or force or troot_only or signing_cert is not None or flavor != "auto"):
         raise click.UsageError("--swap cannot be combined with --inspect or installation options.")
     if inspect_state and (version_or_url or dryrun or force or troot_only or reboot or signing_cert is not None or flavor != 'auto'):
@@ -527,7 +536,7 @@ def update(ctx, version_or_url, version_option, ip, yes, passwd, flavor, force,
                          internal=ctx.obj.get("internal", False),
                          auto_confirm=yes or ctx.obj.get("yes", False), dryrun=dryrun,
                          signing_cert=signing_cert, reboot=reboot, inspect=inspect_state, force=force,
-                         troot_only=troot_only, flavor=flavor, local_elxr=is_elxr, verbose=verbose, swap=swap):
+                         troot_only=troot_only, flavor=flavor, local_elxr=is_elxr, verbose=verbose, swap=swap, reset_overlay=reset_overlay):
             return
     except (click.ClickException, click.Abort):
         raise
@@ -815,6 +824,8 @@ def bootimg_cmd(ctx, version, boardtype, netboot, images, delete_cache, devkit_i
         else:
             write_image(version, boardtype, fwtype, internal, flavor='headless', recovery=recovery)
             click.echo("✅ Boot image successfully written.")
+    except click.ClickException:
+        raise
     except Exception as e:
         click.echo(f"❌ Failed to write boot image: {e}", err=True)
         ctx.exit(1)

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/cloudex/client.py

@@ -7,6 +7,7 @@ import json
 import os
 import shutil
 import subprocess
+import sys
 import time
 import uuid
 from pathlib import Path
@@ -17,6 +18,8 @@ import requests
 
 DEFAULT_ROOT = Path.home() / ".sima-cli" / "cloudex"
 FORWARDER_NAME = "kerrigan-p2p-forwarder"
+MACOS_TUNNEL_PATH = "/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin:/usr/local/bin"
+MACOS_WIREGUARD_INSTALL = "Install WireGuard CLI support with: brew install wireguard-tools"
 CONNECTION_SETUP_TIMEOUT_SECONDS = 60
 DIAGNOSTIC_LOG_LINES = 50
 SAFE_FORWARDER_STAGES = {
@@ -68,8 +71,8 @@ def decode_key(value):
         raise CloudExError("--key contains an invalid value")
     if len(profile["allocation_secret"]) < 32:
         raise CloudExError("--key contains an invalid allocation secret")
-    if profile["environment"] != "vulcan-staging":
-        raise CloudExError("CloudEx currently supports only vulcan-staging allocation keys")
+    if profile["environment"] not in {"vulcan-staging", "vulcan-production"}:
+        raise CloudExError("CloudEx supports only vulcan-staging or vulcan-production allocation keys")
     return profile
 
 
@@ -393,6 +396,9 @@ def _forwarder_failure(log_path):
         "start wireguard-go": "the WireGuard interface could not start",
         "invalid session config": "the native forwarder rejected the session configuration",
     }
+    if sys.platform == "darwin":
+        for needle in ("wireguard is unavailable", "start wireguard-go"):
+            mappings[needle] += ". " + MACOS_WIREGUARD_INSTALL
     for needle, message in mappings.items():
         if needle in detail:
             return message + suffix
@@ -552,6 +558,50 @@ def _reconcile_existing_connection(profile, store, progress):
     return None
 
 
+def _forwarder_sudo_prefix(progress=None):
+    """Install missing macOS tools as the user, then expose them through sudo."""
+    prefix = ["sudo", "-n", "--"]
+    if sys.platform != "darwin":
+        return prefix
+    missing = [name for name in ("wg", "wireguard-go")
+               if shutil.which(name, path=MACOS_TUNNEL_PATH) is None]
+    if missing:
+        brew = shutil.which("brew", path=MACOS_TUNNEL_PATH)
+        if brew is None:
+            raise CloudExError(
+                "CloudEx requires {} on macOS. Install Homebrew, then retry CloudEx; "
+                "missing WireGuard dependencies will be installed automatically.".format(
+                    ", ".join(missing)
+                )
+            )
+        packages = ["wireguard-tools" if name == "wg" else name for name in missing]
+        if progress:
+            progress.update("Installing missing WireGuard dependencies with Homebrew")
+        environment = dict(os.environ, PATH=MACOS_TUNNEL_PATH)
+        try:
+            result = subprocess.run(
+                [brew, "install", *packages],
+                env=environment, stdin=subprocess.DEVNULL,
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, timeout=600,
+            )
+        except (OSError, subprocess.TimeoutExpired) as exc:
+            raise CloudExError(
+                "Could not install WireGuard dependencies with Homebrew. " + MACOS_WIREGUARD_INSTALL
+            ) from exc
+        if result.returncode:
+            detail = (result.stderr or result.stdout or "Homebrew failed").strip()
+            raise CloudExError("WireGuard dependency installation failed: " + detail[-1024:])
+        missing = [name for name in ("wg", "wireguard-go")
+                   if shutil.which(name, path=MACOS_TUNNEL_PATH) is None]
+        if missing:
+            raise CloudExError(
+                "Homebrew completed but CloudEx still cannot find: {}. {}".format(
+                    ", ".join(missing), MACOS_WIREGUARD_INSTALL
+                )
+            )
+    return prefix + ["/usr/bin/env", "PATH=" + MACOS_TUNNEL_PATH]
+
+
 def connect(profile, store, progress, attempts=3, transport="auto"):
     """Create a session and return its durable local record."""
     from .installer import ensure_forwarder
@@ -561,6 +611,7 @@ def connect(profile, store, progress, attempts=3, transport="auto"):
     existing = _reconcile_existing_connection(profile, store, progress)
     if existing:
         return existing
+    sudo_prefix = _forwarder_sudo_prefix(progress=progress)
     forwarder = ensure_forwarder(progress=progress)
     choices = (["p2p"] * attempts + ["routed"] if transport == "auto"
                else ["routed"] if transport == "turn" else ["p2p"] * attempts)
@@ -610,8 +661,8 @@ def connect(profile, store, progress, attempts=3, transport="auto"):
             config_path.chmod(0o600)
             with log_path.open("x", encoding="utf-8") as log:
                 process = subprocess.Popen(
-                    [
-                        "sudo", "-n", "--", str(forwarder), "session", "--role", "user",
+                    sudo_prefix + [
+                        str(forwarder), "session", "--role", "user",
                         "--config", str(config_path), "--report", str(report_path),
                     ],
                     stdin=subprocess.DEVNULL,

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/discover/discover.py

@@ -5,6 +5,7 @@ import subprocess
 import json
 import time
 import re
+import shutil
 import psutil
 from typing import List, Dict
 from rich.console import Console
@@ -51,6 +52,9 @@ def get_sima_devices_from_arp():
             try:
                 output = subprocess.check_output(["ip", "neigh", "show"], text=True)
             except FileNotFoundError:
+                if not shutil.which("arp"):
+                    console.print("[yellow]ARP lookup unavailable: install iproute2 (ip) or net-tools (arp); continuing with multicast discovery.[/yellow]")
+                    return []
                 output = subprocess.check_output(["arp", "-n"], text=True)
             pattern = re.compile(
                 r"(?P<ip>\d+\.\d+\.\d+\.\d+).*?(?P<mac>(?:[0-9a-f]{1,2}:){5}[0-9a-f]{1,2})",

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/discover/linuxll.py

@@ -11,9 +11,41 @@ import re
 import time
 import shlex
 import subprocess
+import shutil
+import sys
+
+import click
 from sima_cli.utils.env import get_environment_type
 from typing import Optional, Dict
 
+def ensure_discovery_tools():
+    """Provision required Linux discovery tools only after an interactive opt-in."""
+    if shutil.which('ip'):
+        return
+    guidance = (
+        "Device discovery needs 'ip' (package iproute2). "
+        "On Ubuntu/Debian run: sudo apt-get update && sudo apt-get install -y iproute2 ethtool. "
+        "For netboot, pass --devkit-ip <IPv4> to bypass auto-discovery."
+    )
+    if not shutil.which('apt-get') or not sys.stdin.isatty():
+        raise click.ClickException(guidance)
+    packages = ['iproute2']
+    if not shutil.which('ethtool'):
+        packages.append('ethtool')
+    if not click.confirm('Device discovery needs host packages. Install ' + ' '.join(packages) + '?', default=False):
+        raise click.ClickException(guidance)
+    prefix = [] if os.geteuid() == 0 else ['sudo']
+    if prefix and not shutil.which('sudo'):
+        raise click.ClickException(guidance + ' sudo is unavailable; ask an administrator to install them.')
+    try:
+        subprocess.run(prefix + ['apt-get', 'update'], check=True)
+        subprocess.run(prefix + ['apt-get', 'install', '-y', '--no-install-recommends'] + packages, check=True)
+    except (OSError, subprocess.CalledProcessError) as error:
+        raise click.ClickException(f'Device discovery package installation failed: {error}. {guidance}') from error
+    if not shutil.which('ip'):
+        raise click.ClickException(guidance)
+
+
 def _run(cmd: str, check=False, capture=True) -> subprocess.CompletedProcess:
     return subprocess.run(
         shlex.split(cmd),
@@ -24,7 +56,7 @@ def _run(cmd: str, check=False, capture=True) -> subprocess.CompletedProcess:
     )
 
 def _has_nmcli() -> bool:
-    return _run("which nmcli").returncode == 0
+    return shutil.which("nmcli") is not None
 
 
 def _iface_has_ipv4(iface: str) -> bool:
@@ -41,7 +73,7 @@ def _get_mac(iface: str) -> str:
 def _is_usb_ethernet(iface: str) -> bool:
     """Return True if this interface is a USB Ethernet device."""
     dev_path = f"/sys/class/net/{iface}/device"
-    if not os.path.exists(dev_path):
+    if not os.path.exists(dev_path) or not shutil.which("udevadm"):
         return False
 
     cp = _run(f"udevadm info -q property -p {dev_path}", capture=True)
@@ -63,7 +95,7 @@ def _usb_attrs(iface: str) -> Dict[str, str]:
     Returns possibly empty dict.
     """
     dev_path = f"/sys/class/net/{iface}/device"
-    if not os.path.exists(dev_path):
+    if not os.path.exists(dev_path) or not shutil.which("udevadm"):
         return {}
 
     cp = _run(f"udevadm info -q property -p {dev_path}", capture=True)
@@ -100,6 +132,8 @@ def _usb_attrs(iface: str) -> Dict[str, str]:
 
 
 def _driver_info(iface: str) -> Dict[str, str]:
+    if not shutil.which("ethtool"):
+        return {"driver": "", "bus-info": "", "firmware": ""}
     cp = _run(f"ethtool -i {iface}", capture=True)
     info = {}
     for line in cp.stdout.splitlines():
@@ -227,6 +261,7 @@ def suggest_and_switch_to_linklocal():
     envtype, env_subtype = get_environment_type()
 
     if envtype == 'host' and env_subtype == 'linux':
+        ensure_discovery_tools()
         cp = _run("ip -o link", capture=True)
         ifaces = []
         for line in cp.stdout.splitlines():

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/download/downloader.py

@@ -1,4 +1,5 @@
 import os
+import time
 import json
 import hashlib
 import re
@@ -13,6 +14,40 @@ from sima_cli.utils.config import get_auth_token
 from sima_cli.auth.login import login
 from sima_cli.install.github_assets import download_github_asset
 
+# Separate connect and read limits; a cold CDN request can exceed ten seconds.
+_DOWNLOAD_TIMEOUT = (10, 60)
+_DOWNLOAD_ATTEMPTS = 3
+_RETRYABLE_STATUS_CODES = {429, 500, 502, 503, 504}
+
+
+def _request_download(request_fn, url, **kwargs):
+    """Retry transient failures before response headers, never replay a body."""
+    for attempt in range(_DOWNLOAD_ATTEMPTS):
+        response = None
+        try:
+            response = request_fn(url, timeout=_DOWNLOAD_TIMEOUT, **kwargs)
+            response.raise_for_status()
+            return response
+        except requests.exceptions.SSLError:
+            raise
+        except requests.HTTPError:
+            if response is None or response.status_code not in _RETRYABLE_STATUS_CODES:
+                if response is not None:
+                    response.close()
+                raise
+            response.close()
+            if attempt == _DOWNLOAD_ATTEMPTS - 1:
+                raise
+        except (requests.Timeout, requests.ConnectionError):
+            if attempt == _DOWNLOAD_ATTEMPTS - 1:
+                raise
+        delay = 2 ** attempt
+        # Do not print URLs: authenticated downloads can include credentials.
+        print(f"⚠️ Transient download request failure; retrying in {delay}s "
+              f"(attempt {attempt + 2}/{_DOWNLOAD_ATTEMPTS}).")
+        time.sleep(delay)
+
+
 def _list_directory_files(url: str, internal: bool = False) -> List[str]:
     """
     Attempt to list files in a server-hosted directory with index browsing enabled.
@@ -110,7 +145,7 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
             head_fn = session.head            
 
         # Only resume a partial when a strong validator identifies its bytes.
-        head = head_fn(url, headers=headers, timeout=10, allow_redirects=True)
+        head = _request_download(head_fn, url, headers=headers, allow_redirects=True)
         try:
             head.raise_for_status()
             raw_size = head.headers.get('content-length')
@@ -148,7 +183,7 @@ def download_file_from_url(url: str, dest_folder: str = ".", internal: bool = Fa
             headers['Range'] = f'bytes={existing_size}-'
             headers['If-Range'] = etag
 
-        with request_fn(url, stream=True, headers=headers, timeout=30) as r:
+        with _request_download(request_fn, url, stream=True, headers=headers) as r:
             r.raise_for_status()
             if r.headers.get('Content-Encoding', 'identity').lower() != 'identity':
                 raise ValueError("Server ignored identity content encoding")

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/install/metadata_installer.py

@@ -693,11 +693,17 @@ def selectable_resource_handler(metadata):
     - 'Skip' option appended at the end
     - Honors `selected: true` and existing `resources` for preselection
     - Removes unselected items from `selectable-resources` field
+    - Skips opt-in resources when stdin is not a terminal
     """
     selectable = metadata.get("selectable-resources")
     if not selectable:
         return metadata
 
+    if sys.stdin is None or not sys.stdin.isatty():
+        click.echo("Skipping optional resources because stdin is not a terminal.")
+        metadata["selectable-resources"] = []
+        return metadata
+
     # ──────────────────────────────────────────────
     # Build choice list with preselection
     # ──────────────────────────────────────────────
@@ -1430,8 +1436,8 @@ def _run_installation_script(metadata: Dict, extract_path: str = ".", force: boo
     Behavior:
       • Force installs set FORCE_INSTALL=1 in the script environment.
       • macOS / Linux / eLxr:
-          - Run via interactive login shell unless nested inside sima-cli
-          - Safely source the first available RC file among:
+          - Run via non-interactive login shell unless nested inside sima-cli
+          - Nested installs source the first available RC file among:
               ~/.zshrc → ~/.bashrc → ~/.bash_profile → ~/.profile
       • Windows:
           - Run via cmd.exe or PowerShell
@@ -1487,9 +1493,9 @@ def _run_installation_script(metadata: Dict, extract_path: str = ".", force: boo
                 cmd = ["bash", "-c", f"{rc_source}{script}"]
 
             else:
-                # Normal context → interactive login shell
-                shell_name = os.path.basename(shell)
-                cmd = [shell, "-i", "-l", "-c", script]
+                # Load login setup without enabling interactive job control on
+                # the caller's terminal (including when invoked over ssh -t).
+                cmd = [shell, "-l", "-c", script]
 
             result = subprocess.run(cmd, cwd=extract_path, env=env)
             exit_code = result.returncode

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/models/client.py

@@ -23,9 +23,9 @@ from sima_cli.download.parallel import PARALLEL_MIN_SIZE, download_parallel, con
 
 ORGANIZATION = "sima-neat"
 REPOSITORY = "models"
+PRODUCTION_BASE_URL = "https://models-registry.neat.sima.ai"
 STAGING_BASE_URL = "https://models-registry.stg.neat.sima.ai"
 TRANSIENT_STATUS_CODES = (429, 502, 503, 504)
-SUPPORTED_BENCHMARK_SCHEMAS = (1, 2, 3, 4, 5)
 
 
 class ModelRegistryError(RuntimeError):
@@ -51,10 +51,7 @@ def resolve_base_url(staging: bool = False, override: Optional[str] = None) -> s
     production = os.environ.get("SIMA_MODELS_REGISTRY_PRODUCTION_URL")
     if production:
         return normalize_base_url(production)
-    raise ModelRegistryError(
-        "The production Model Registry endpoint is not configured. "
-        "Use --stg or set SIMA_MODELS_REGISTRY_PRODUCTION_URL."
-    )
+    return PRODUCTION_BASE_URL
 
 
 def _new_session() -> requests.Session:
@@ -134,6 +131,17 @@ def latest_runs_by_model_variant(runs: Sequence[Dict[str, Any]]) -> List[Dict[st
     )
 
 
+def _benchmark_fingerprints(model: Dict[str, Any], profile: str, run_ids: Sequence[str]) -> Dict[str, str]:
+    """A fingerprint names the builds it measured, so only a row showing exactly the catalog builds keeps it."""
+    builds = {
+        build.get("run_id") for build in model.get("builds") or []
+        if isinstance(build, dict) and build.get("build_profile_id") == profile
+    }
+    if not run_ids or set(run_ids) != builds:
+        return {}
+    return (model.get("benchmark_fingerprints") or {}).get(profile) or {}
+
+
 def find_latest_run(
     runs: Sequence[Dict[str, Any]], model_id: str, variant_id: str
 ) -> Dict[str, Any]:
@@ -458,7 +466,13 @@ class RegistryClient:
         payload = self._get_json(
             ("v1", "repositories", ORGANIZATION, REPOSITORY, "catalogs", "current"),
             params={"git_ref": f"refs/heads/{branch}"},
+            allow_not_found=True,
         )
+        if payload is None:
+            raise ModelRegistryError(
+                f"No published model catalog for branch {branch!r} at {self.base_url} (HTTP 404). "
+                "Use models branches to find available branches; no fallback was attempted."
+            )
         catalog = payload.get("catalog") if payload else None
         document = catalog.get("document") if isinstance(catalog, dict) else None
         models = document.get("models") if isinstance(document, dict) else None
@@ -513,6 +527,10 @@ class RegistryClient:
                 )
                 artifact_metadata = artifact.get("metadata") or {}
                 model = definitions[model_id]
+                shown_run_ids = (
+                    list((metadata.get("component_run_ids") or {}).values())
+                    if root.get("package_id") else [run["id"]]
+                )
                 searchable = " ".join(str(value) for value in (
                     model_id, profile, model.get("display_name"), model.get("description"),
                     model.get("categories"), branch,
@@ -529,6 +547,7 @@ class RegistryClient:
                     "model_categories": model.get("categories") or {},
                     "size_bytes": artifact_metadata.get("deployment_size_bytes", artifact.get("size_bytes")),
                     "sha256": artifact.get("sha256"),
+                    "benchmark_fingerprints": _benchmark_fingerprints(model, profile, shown_run_ids),
                 })
 
         return sorted(
@@ -607,15 +626,23 @@ class RegistryClient:
         payload = self._get_json(("v1", "runs", run_id, "metrics"))
         return payload or {}
 
-    def benchmark(self, run_id: str) -> Optional[Dict[str, Any]]:
-        return self._get_json(
-            ("v1", "runs", run_id, "benchmarks", "latest"), allow_not_found=True
-        )
-
-    def accuracy(self, run_id: str) -> Optional[Dict[str, Any]]:
-        return self._get_json(
-            ("v1", "runs", run_id, "accuracy", "latest"), allow_not_found=True
+    def whole_model_result(self, stage: str, fingerprint: Optional[str]) -> Optional[Dict[str, Any]]:
+        """Return the model test result of the newest completed run for a benchmark fingerprint."""
+        if not fingerprint:
+            return None
+        resolved = self._get_json(
+            ("v1", "repositories", ORGANIZATION, REPOSITORY, "resolve"),
+            params={"run_type": f"model_{stage}", "fingerprint": fingerprint},
+            allow_not_found=True,
         )
+        run_id = ((resolved or {}).get("run") or {}).get("id")
+        if not run_id:
+            return None
+        results = [
+            result for result in self.test_results(str(run_id)).get("test_results") or []
+            if isinstance(result, dict) and result.get("suite") == stage and result.get("name") == "model"
+        ]
+        return results[-1] if results else None
 
     def taxonomy(self) -> Optional[Dict[str, Any]]:
         return self._get_json(
@@ -629,8 +656,6 @@ class RegistryClient:
             "provenance": self.provenance(run_id),
             "tests": self.test_results(run_id),
             "metrics": self.metrics(run_id),
-            "benchmark": self.benchmark(run_id),
-            "accuracy": self.accuracy(run_id),
         }
 
     def artifact_download(self, run_id: str, name: str) -> Dict[str, Any]:

{sima_cli-2.1.19 → sima_cli-2.1.20}/sima_cli/models/commands.py

@@ -32,7 +32,7 @@ def _staging_option(function):
         "staging",
         is_flag=True,
         default=False,
-        help="Use the staging Model Registry.",
+        help="Use the staging Model Registry unless SIMA_MODELS_REGISTRY_BASE_URL is set.",
     )(function)
 
 
@@ -107,6 +107,7 @@ def _selected_model_detail(
     client: RegistryClient, selected: Dict[str, Any]
 ) -> Dict[str, Any]:
     selected_metadata = selected.get("metadata") or {}
+    fingerprints = selected.get("benchmark_fingerprints") or {}
     component_run_ids = selected_metadata.get("component_run_ids") or {}
     if isinstance(component_run_ids, dict) and component_run_ids:
         components = sorted(
@@ -169,18 +170,30 @@ def _selected_model_detail(
                 for metric in (detail.get("metrics") or {}).get("measurements") or []
             ]
         },
-        "benchmark": next(
-            (detail.get("benchmark") for _, detail in details if detail.get("benchmark")),
-            None,
-        ),
-        "accuracy": next(
-            (detail.get("accuracy") for _, detail in details if detail.get("accuracy")),
-            None,
-        ),
+        "benchmark": client.whole_model_result("performance", fingerprints.get("performance")),
+        "accuracy": client.whole_model_result("accuracy", fingerprints.get("accuracy")),
     }
 
 
-@click.group(name="models", help="Browse and download Model Registry artifacts.", hidden=True)
+@click.group(name="models", hidden=True, help=(
+    "Browse and download Model Registry artifacts from production by default.\n\n"
+    "Uses https://models-registry.neat.sima.ai without AWS credentials. "
+    "This preview command remains hidden from top-level help.\n\n"
+    "SIMA_MODELS_REGISTRY_BASE_URL overrides all CLI endpoint selections, including --stg. "
+    "Otherwise --stg/--staging selects https://models-registry.stg.neat.sima.ai; "
+    "SIMA_MODELS_REGISTRY_PRODUCTION_URL overrides only the production default. "
+    "The Python resolve_base_url helper's explicit override takes precedence over environment variables.\n\n"
+    "Branch listings describe registered runs; listed branches may lack a published catalog. "
+    "Unpublished catalogs report an error; published catalogs with no matching builds return "
+    "an empty models array with --json or a message interactively. "
+    "No fallback to another branch or environment is attempted.\n\n"
+    "Examples (choose a currently published branch and model):\n\n\b\n"
+    "  sima-cli models branches --json\n"
+    "  sima-cli models list --branch BRANCH --json\n"
+    "  sima-cli models download --branch BRANCH --id MODEL --variant VARIANT --output ./models --json\n"
+    "  sima-cli models --stg branches --json\n"
+    "  sima-cli models list --staging --branch develop --json"
+))
 @_staging_option
 @click.pass_context
 def models_group(ctx: click.Context, staging: bool) -> None:
@@ -260,7 +273,7 @@ def list_command(
             echo_json({"branch": branch, "query": query, "models": runs})
             return
         if not runs:
-            click.echo("No completed model builds are available on this branch.")
+            click.echo(f"No completed model builds match branch {branch!r} and the requested query.")
             return
         if not _is_interactive():
             raise ModelRegistryError(