lookout-cli 4.2.1__tar.gz → 5.0.1__tar.gz

{lookout_cli-4.2.1 → lookout_cli-5.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lookout_cli
-Version: 4.2.1
+Version: 5.0.1
 Summary: A CLI for interacting with Lookout+
 Author-email: Greenroom Robotics <team@greenroomrobotics.com>
 Maintainer-email: David Revay <david.revay@greenroomrobotics.com>
@@ -22,6 +22,8 @@ Requires-Dist: python-on-whales
 Requires-Dist: PyYAML
 Requires-Dist: bcrypt
 Requires-Dist: mlflow-skinny<3,>=2.19.0
+Requires-Dist: azure-identity<2,>=1.16
+Requires-Dist: azure-storage-blob<13,>=12.19
 Requires-Dist: tqdm
 
 # Lookout CLI

lookout_cli-5.0.1/lookout_cli/groups/model.py

@@ -0,0 +1,222 @@
+import shutil
+import tempfile
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+
+import click
+from lookout_cli.groups.base import config_dir_option, set_initial_env
+from lookout_cli.helpers import make_dir_set_permission
+from lookout_config import get_config_io
+
+MODEL_NAME = "rtdetrv2"
+DEFAULT_ALIAS = "champion"
+DEFAULT_MLFLOW_URL = "http://gr-nuc-visionai:4242"
+DEFAULT_AZURE_ACCOUNT = "stgrmlmodelsprod"
+DEFAULT_AZURE_CONTAINER = "general"
+
+
+class Source(str, Enum):
+    """Where to pull models from. MLflow (over Tailscale) is being deprecated in
+    favour of Azure Blob (the ML platform's published-models account)."""
+
+    MLFLOW = "mlflow"
+    AZURE = "azure"
+
+
+class SensorType(str, Enum):
+    RGB = "rgb"
+    IR = "ir"
+
+
+@dataclass(frozen=True)
+class Artifact:
+    """A model file: ``suffix`` is appended to the model base name to form the
+    output file; ``mlflow_path`` is where it lives within an MLflow run."""
+
+    suffix: str
+    mlflow_path: str
+    required: bool = False
+
+
+ARTIFACTS = (
+    Artifact(".onnx", "onnx_model_fixed/model.onnx", required=True),
+    Artifact(".int8.onnx", "onnx_model_int8/model.onnx"),
+    Artifact(".calib", "calibration/int8.calib"),
+)
+
+
+def _enum_choices(enum: type[Enum]) -> list[str]:
+    return [member.value for member in enum]
+
+
+def _save(path: Path) -> None:
+    click.echo(click.style(f"Downloaded {path.name}", fg="green"))
+
+
+class Backend(ABC):
+    """Downloads RT-DETR models into a directory. Subclasses implement
+    :meth:`download` for a single model; the base drives the per-sensor loop."""
+
+    def download_all(self, sensors: list[SensorType], dest: Path) -> None:
+        failures: list[str] = []
+        for sensor in sensors:
+            model_name = f"{MODEL_NAME}.{sensor.value}"
+            try:
+                self.download(model_name, dest)
+            except Exception as e:
+                failures.append(model_name)
+                click.echo(click.style(f"Failed to download {model_name}: {e}", fg="red"))
+        if failures:
+            raise click.ClickException(f"Failed to download: {', '.join(failures)}")
+
+    @abstractmethod
+    def download(self, model_name: str, dest: Path) -> None:
+        raise NotImplementedError
+
+
+class MlflowBackend(Backend):
+    """MLflow registry, reached over Tailscale (deprecated)."""
+
+    def __init__(self, alias: str, url: str) -> None:
+        import mlflow
+        from mlflow.tracking import MlflowClient
+
+        mlflow.set_tracking_uri(url)
+        self._client = MlflowClient()
+        self._alias = alias
+
+    def download(self, model_name: str, dest: Path) -> None:
+        version = self._client.get_model_version_by_alias(model_name, self._alias)
+        base_name = f"{model_name}.v{version.version}.{self._alias}"
+        click.echo(click.style(f"Downloading {base_name} to {dest}"))
+
+        with tempfile.TemporaryDirectory() as temp_dir:
+            for artifact in ARTIFACTS:
+                parent = str(Path(artifact.mlflow_path).parent)
+                if not any(
+                    a.path == artifact.mlflow_path
+                    for a in self._client.list_artifacts(version.run_id, parent)
+                ):
+                    if artifact.required:
+                        raise FileNotFoundError(artifact.mlflow_path)
+                    click.echo(click.style(f"Skipping missing {artifact.suffix}", fg="yellow"))
+                    continue
+                local = self._client.download_artifacts(
+                    version.run_id, artifact.mlflow_path, temp_dir
+                )
+                shutil.move(local, output := dest / f"{base_name}{artifact.suffix}")
+                _save(output)
+
+
+class AzureBackend(Backend):
+    """Azure published-models blob account.
+
+    Auth via ``DefaultAzureCredential`` (``az login`` locally, VM managed
+    identity in prod). Blobs live under a ``{model_name}/{alias}/`` prefix and
+    keep their versioned basenames, so the result matches the MLflow backend.
+    """
+
+    def __init__(self, alias: str, account: str, container: str) -> None:
+        from azure.identity import DefaultAzureCredential
+        from azure.storage.blob import ContainerClient
+
+        self._client = ContainerClient(
+            account_url=f"https://{account}.blob.core.windows.net",
+            container_name=container,
+            credential=DefaultAzureCredential(),
+        )
+        self._alias = alias
+        self._location = f"{account}/{container}"
+
+    def download(self, model_name: str, dest: Path) -> None:
+        prefix = f"{model_name}/{self._alias}/"
+        blobs = list(self._client.list_blobs(name_starts_with=prefix))
+        # Match the MLflow contract: a prefix with only stale/optional blobs (no
+        # required model artefact) is not a successful download.
+        if not any(
+            blob.name.endswith(".onnx") and not blob.name.endswith(".int8.onnx") for blob in blobs
+        ):
+            raise FileNotFoundError(f"no model artefact under {self._location}/{prefix}")
+
+        click.echo(click.style(f"Downloading {prefix} from {self._location} to {dest}"))
+        for blob in blobs:
+            with open(output := dest / Path(blob.name).name, "wb") as f:
+                self._client.download_blob(blob.name).readinto(f)
+            _save(output)
+
+
+@click.group(help="ONNX model management commands")
+def model() -> None:
+    pass
+
+
+@click.command(name="download")
+@click.option(
+    "--type",
+    "model_type",
+    type=click.Choice(["all", *_enum_choices(SensorType)]),
+    default="all",
+    show_default=True,
+    help="Sensor model(s) to download.",
+)
+@click.option(
+    "--alias",
+    default=DEFAULT_ALIAS,
+    show_default=True,
+    help="Alias of model to download.",
+)
+@click.option(
+    "--source",
+    type=click.Choice(_enum_choices(Source)),
+    default=Source.MLFLOW.value,
+    show_default=True,
+    help="Where to download models from.",
+)
+@click.option(
+    "--account",
+    default=DEFAULT_AZURE_ACCOUNT,
+    show_default=True,
+    help="Azure storage account (azure source only).",
+)
+@click.option(
+    "--container",
+    default=DEFAULT_AZURE_CONTAINER,
+    show_default=True,
+    help="Azure container (azure source only).",
+)
+@click.option(
+    "--mlflow-url",
+    default=DEFAULT_MLFLOW_URL,
+    show_default=True,
+    help="MLflow tracking URL (mlflow source only).",
+)
+@config_dir_option
+def download(
+    model_type: str,
+    alias: str,
+    source: str,
+    account: str,
+    container: str,
+    mlflow_url: str,
+    config_dir: str,
+) -> None:
+    """Download ONNX models from MLflow (Tailscale) or Azure Blob."""
+    set_initial_env(config_dir)
+
+    dest = Path(get_config_io().read().models_directory).expanduser()
+    make_dir_set_permission(dest)
+
+    sensors = list(SensorType) if model_type == "all" else [SensorType(model_type)]
+    backend: Backend = (
+        AzureBackend(alias, account, container)
+        if Source(source) is Source.AZURE
+        else MlflowBackend(alias, mlflow_url)
+    )
+
+    backend.download_all(sensors, dest)
+    click.echo(click.style("Download complete.", fg="green"))
+
+
+model.add_command(download)

{lookout_cli-4.2.1 → lookout_cli-5.0.1}/lookout_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lookout_cli
-Version: 4.2.1
+Version: 5.0.1
 Summary: A CLI for interacting with Lookout+
 Author-email: Greenroom Robotics <team@greenroomrobotics.com>
 Maintainer-email: David Revay <david.revay@greenroomrobotics.com>
@@ -22,6 +22,8 @@ Requires-Dist: python-on-whales
 Requires-Dist: PyYAML
 Requires-Dist: bcrypt
 Requires-Dist: mlflow-skinny<3,>=2.19.0
+Requires-Dist: azure-identity<2,>=1.16
+Requires-Dist: azure-storage-blob<13,>=12.19
 Requires-Dist: tqdm
 
 # Lookout CLI

{lookout_cli-4.2.1 → lookout_cli-5.0.1}/lookout_cli.egg-info/requires.txt

@@ -7,4 +7,6 @@ python-on-whales
 PyYAML
 bcrypt
 mlflow-skinny<3,>=2.19.0
+azure-identity<2,>=1.16
+azure-storage-blob<13,>=12.19
 tqdm

{lookout_cli-4.2.1 → lookout_cli-5.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lookout_cli"
-version = "4.2.1"
+version = "5.0.1"
 description = "A CLI for interacting with Lookout+"
 readme = "README.md"
 license = {text = "Copyright (C) 2025, Greenroom Robotics"}
@@ -32,6 +32,8 @@ dependencies = [
     "PyYAML",
     "bcrypt",
     "mlflow-skinny>=2.19.0,<3",
+    "azure-identity>=1.16,<2",
+    "azure-storage-blob>=12.19,<13",
     "tqdm"
 ]
 

lookout_cli-4.2.1/lookout_cli/groups/model.py

@@ -1,112 +0,0 @@
-import shutil
-import tempfile
-from pathlib import Path
-
-import click
-import mlflow
-from lookout_cli.groups.base import config_dir_option, set_initial_env
-from lookout_cli.helpers import make_dir_set_permission
-from lookout_config import get_config_io
-from mlflow.tracking import MlflowClient
-
-MLFLOW_URL = "http://gr-nuc-visionai:4242"
-MODEL_NAME = "rtdetrv2"
-
-
-def download_artifact(
-    client: MlflowClient, run_id: str, temp_dir: str, output_path: Path, artifact_path: str
-):
-    local_path = client.download_artifacts(
-        run_id=run_id,
-        path=artifact_path,
-        dst_path=temp_dir,
-    )
-    shutil.move(local_path, output_path)
-    click.echo(click.style(f"Downloaded {output_path.name}", fg="green"))
-
-
-def download_calib(client: MlflowClient, run_id: str, temp_dir: str, output_path: Path):
-    artifact_path = "calibration/int8.calib"
-    artifacts = client.list_artifacts(run_id, path=str(Path(artifact_path).parent))
-    if not any(artifact.path == artifact_path for artifact in artifacts):
-        click.echo(click.style("No int8 calibration file found", fg="red"))
-        return
-
-    download_artifact(client, run_id, temp_dir, output_path, artifact_path)
-
-
-def download_onnx(client: MlflowClient, run_id: str, temp_dir: str, output_path: Path):
-    artifact_path = "onnx_model_fixed/model.onnx"
-    download_artifact(client, run_id, temp_dir, output_path, artifact_path)
-
-
-def download_onnx_int8(client: MlflowClient, run_id: str, temp_dir: str, output_path: Path):
-    artifact_path = "onnx_model_int8/model.onnx"
-    artifacts = client.list_artifacts(run_id, path=str(Path(artifact_path).parent))
-    if not any(artifact.path == artifact_path for artifact in artifacts):
-        click.echo(click.style("No int8 ONNX model found", fg="red"))
-        return
-
-    download_artifact(client, run_id, temp_dir, output_path, artifact_path)
-
-
-@click.group(help="ONNX model management commands")
-def model():
-    pass
-
-
-@click.command(name="download")
-@click.option(
-    "--type",
-    "model_type",
-    type=click.Choice(["all", "rgb", "ir"]),
-    default="all",
-    show_default=True,
-    help="Type of model to download.",
-)
-@click.option(
-    "--alias",
-    type=str,
-    default="champion",
-    show_default=True,
-    help="Alias of model to download.",
-)
-@config_dir_option
-def download(model_type: str, alias: str, config_dir: str):
-    """Download ONNX models from MLflow."""
-    set_initial_env(config_dir)
-
-    config = get_config_io().read()
-    models_directory = Path(config.models_directory).expanduser()
-    make_dir_set_permission(models_directory)
-
-    mlflow.set_tracking_uri(MLFLOW_URL)
-    client = MlflowClient()
-
-    types_to_download: list[str] = ["rgb", "ir"] if model_type == "all" else [model_type]
-
-    for sensor_type in types_to_download:
-        model_name = f"{MODEL_NAME}.{sensor_type}"
-
-        try:
-            model_version = client.get_model_version_by_alias(model_name, alias)
-            run_id = model_version.run_id
-            version = model_version.version
-            base_name = f"{model_name}.v{version}.{alias}"
-
-            click.echo(click.style(f"Downloading {base_name} to {models_directory}"))
-
-            with tempfile.TemporaryDirectory() as temp_dir:
-                download_onnx(client, run_id, temp_dir, models_directory / f"{base_name}.onnx")
-                download_onnx_int8(
-                    client, run_id, temp_dir, models_directory / f"{base_name}.int8.onnx"
-                )
-                download_calib(client, run_id, temp_dir, models_directory / f"{base_name}.calib")
-
-        except Exception as e:
-            click.echo(click.style(f"Failed to download {model_name}: {e}", fg="red"))
-
-    click.echo(click.style("Download complete.", fg="green"))
-
-
-model.add_command(download)