lookout-cli 3.2.0__tar.gz → 3.3.0__tar.gz

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lookout_cli
-Version: 3.2.0
+Version: 3.3.0
 Summary: A CLI for interacting with Lookout+
 Author-email: Greenroom Robotics <team@greenroomrobotics.com>
 Maintainer-email: David Revay <david.revay@greenroomrobotics.com>

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/lookout_cli/cli.py

@@ -24,6 +24,9 @@ def cli():
     lookout_cli.add_command(base.upgrade)
     lookout_cli.add_command(base.down)
     lookout_cli.add_command(base.up)
+    lookout_cli.add_command(base.logs)
+    lookout_cli.add_command(base.restart)
+    lookout_cli.add_command(base.install)
     lookout_cli.add_command(base.configure)
     base.configure.add_command(base.configure_all)
     base.configure.add_command(base.configure_auth)

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/lookout_cli/docker/docker-compose.yaml

@@ -53,6 +53,7 @@ services:
       - /tmp:/tmp
       - ~/.config/greenroom:/home/ros/.config/greenroom
       - ${LOOKOUT_LOG_DIR:-/tmp/log}:/home/ros/.ros/log
+      - ${LOOKOUT_RECORDING_DIR:-/tmp/rosbags}:/home/ros/rosbags
     command: ${LOOKOUT_GREENSTREAM_COMMAND:-tail -f /dev/null}
     privileged: true
     ipc: host

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/lookout_cli/groups/base.py

@@ -16,12 +16,12 @@ from lookout_cli.helpers import (
     get_installer,
     get_project_root,
     get_version,
+    is_dev_version,
     make_dir_set_permission,
+    maybe_ignore_prod,
 )
 from lookout_config import get_config_io
 from lookout_config.types import (
-    Discovery,
-    DiscoverySimple,
     GeolocationMode,
     LogLevel,
     LookoutConfig,
@@ -131,15 +131,6 @@ def log_config(config: LookoutConfig):
         )
 
 
-def get_discovery_range(discovery: Discovery) -> str:
-    if isinstance(discovery, DiscoverySimple):
-        if discovery.discovery_range == "localhost":
-            return "LOCALHOST"
-        elif discovery.discovery_range == "subnet":
-            return "SUBNET"
-    return "SYSTEM_DEFAULT"
-
-
 def set_initial_env(config_dir: str):
     version = get_version()
     os.environ["LOOKOUT_CONFIG_DIR"] = config_dir
@@ -162,17 +153,11 @@ def set_env_from_config(config: LookoutConfig):
     os.environ["LOOKOUT_PROXY_HTTPS_PORT"] = str(config.proxy.https_port)
 
     # Middleware settings
-    os.environ["ROS_DOMAIN_ID"] = (
-        str(config.discovery.ros_domain_id) if config.discovery.type in ["simple", "easy"] else "0"
-    )
-    os.environ["ROS_AUTOMATIC_DISCOVERY_RANGE"] = get_discovery_range(config.discovery)
+    os.environ["ROS_DOMAIN_ID"] = str(config.discovery.ros_domain_id)
+    os.environ["ROS_AUTOMATIC_DISCOVERY_RANGE"] = "SUBNET"
     os.environ["RMW_IMPLEMENTATION"] = (
         "rmw_zenoh_cpp" if config.discovery.type == "zenoh" else "rmw_fastrtps_cpp"
     )
-    if config.discovery.type == "zenoh":
-        os.environ[
-            "ZENOH_CONFIG_OVERRIDE"
-        ] = f'connect/endpoints=["tcp/{config.discovery.discovery_server_ip}:7447"]'
 
     # Launch commands
     if config.prod:
@@ -197,11 +182,6 @@ def set_env_from_config(config: LookoutConfig):
     is_flag=True,
     help="Should we rebuild the docker containers? Default: False",
 )
-@click.option(
-    "--pull",
-    help="Should we do a docker pull",
-    is_flag=True,
-)
 @config_dir_option
 @click.argument(
     "services",
@@ -211,14 +191,15 @@ def set_env_from_config(config: LookoutConfig):
 )
 def up(
     build: bool,
-    pull: bool,
     config_dir: str,
     services: List[str],
 ):
     """Starts lookout"""
     set_initial_env(config_dir)
+    dev_mode = is_dev_version()
 
     config = get_config_io().read()
+    config.prod = maybe_ignore_prod(dev_mode, config.prod)
     log_config(config)
 
     if config.prod and build:
@@ -242,9 +223,7 @@ def up(
     services_list = list(services) if services else None
 
     docker = _get_docker_client(prod=config.prod, proxy=config.proxy.enabled)
-    docker.compose.up(
-        services_list, detach=True, build=build, pull="always" if pull else "missing"
-    )
+    docker.compose.up(services_list, detach=True, build=build)
 
     ui_host = (
         f"https://localhost:{config.proxy.https_port} and http://localhost:{config.proxy.http_port}"
@@ -260,11 +239,97 @@ def up(
 def down(config_dir: str, args: List[str]):
     """Stops lookout"""
     set_initial_env(config_dir)
+    dev_mode = is_dev_version()
+
+    config = get_config_io().read()
+    config.prod = maybe_ignore_prod(dev_mode, config.prod)
+
+    docker = _get_docker_client(prod=config.prod, proxy=config.proxy.enabled)
+    docker.compose.down(timeout=20)
+
+
+@click.command(name="logs")
+@click.option("--tail", "-n", type=int, default=None, help="Number of lines to show from the end")
+@click.option("--timestamps", "-t", is_flag=True, help="Show timestamps")
+@click.option(
+    "--since",
+    type=str,
+    default=None,
+    help="Show logs since timestamp (e.g. 2021-01-01T00:00:00) or relative (e.g. 42m for 42 minutes)",
+)
+@config_dir_option
+@click.argument(
+    "services",
+    required=False,
+    nargs=-1,
+    type=click.Choice(SERVICES),
+)
+def logs(tail: int, timestamps: bool, since: str, config_dir: str, services: List[str]):
+    """Follow log output from containers"""
+    set_initial_env(config_dir)
+    config = get_config_io().read()
+    docker = _get_docker_client(prod=config.prod, proxy=config.proxy.enabled)
+    services_list = list(services)
+
+    output = docker.compose.logs(
+        services=services_list,
+        follow=True,
+        tail=str(tail) if tail else "all",
+        timestamps=timestamps,
+        since=since,
+        stream=True,
+    )
+    for _, stream_content in output:
+        print(stream_content.decode("utf-8"), end="", flush=True)  # type: ignore
+
+
+@click.command(name="restart")
+@click.option("--timeout", "-t", type=int, default=20, help="Timeout in seconds (default: 20)")
+@config_dir_option
+@click.argument(
+    "services",
+    required=False,
+    nargs=-1,
+    type=click.Choice(SERVICES),
+)
+def restart(timeout: int, config_dir: str, services: List[str]):
+    """Restart containers"""
+    set_initial_env(config_dir)
+    config = get_config_io().read()
+    docker = _get_docker_client(prod=config.prod, proxy=config.proxy.enabled)
+    services_list = list(services) or None
+    docker.compose.restart(services=services_list, timeout=timeout)
+
+
+@click.command(name="install")
+@config_dir_option
+def install(config_dir: str):
+    """Install Lookout (pull Docker images)"""
+    set_initial_env(config_dir)
+    dev_mode = is_dev_version()
 
     config = get_config_io().read()
+    config.prod = maybe_ignore_prod(dev_mode, config.prod)
+    set_env_from_config(config)
 
     docker = _get_docker_client(prod=config.prod, proxy=config.proxy.enabled)
-    docker.compose.down()
+    try:
+        docker.compose.pull(
+            [
+                "lookout_core",
+                "lookout_ui",
+                "lookout_greenstream",
+                "lookout_docs",
+                "lookout_proxy",
+            ]
+        )
+    except Exception:
+        click.echo(
+            click.style(
+                "Failed to pull Lookout images. Have you run `lookout authenticate`?",
+                fg="yellow",
+            )
+        )
 
 
 @click.command(name="build")
@@ -357,9 +422,7 @@ def generate(config_dir: str, launch_parameters: bool):
     set_initial_env(config_dir)
     config = get_config_io().read()
 
-    os.environ["ROS_DOMAIN_ID"] = (
-        str(config.discovery.ros_domain_id) if config.discovery.type in ["simple", "easy"] else "0"
-    )
+    os.environ["ROS_DOMAIN_ID"] = str(config.discovery.ros_domain_id)
     docker = _get_docker_client()
     if launch_parameters:
         click.echo(click.style("Generating models from launch params...", fg="green"))
@@ -414,6 +477,7 @@ def upgrade(version: str):
         call(f"{installer} install --upgrade lookout-cli")
 
     click.echo(click.style("Upgrade of Lookout CLI complete.", fg="green"))
+    click.echo(click.style("Run `lookout install` to pull updated Docker images.", fg="green"))
 
 
 @click.command(name="authenticate")

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/lookout_cli/helpers.py

@@ -5,8 +5,8 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 import click
-import pkg_resources
 import yaml
+from importlib.metadata import version as pkg_version
 from python_on_whales.utils import ValidPath
 
 
@@ -26,10 +26,10 @@ def make_dir_set_permission(path: Path, permission=0o777) -> Path:
 
 def get_version():
     """version is latest if it is a dev version otherwise it is the CLI version"""
-    version = pkg_resources.require("lookout-cli")[0].version
-    if version == "0.0.0":
-        version = "latest"
-    return version
+    v = pkg_version("lookout-cli")
+    if v == "0.0.0":
+        return "latest"
+    return v
 
 
 def is_dev_version():
@@ -38,7 +38,7 @@ def is_dev_version():
 
     if os.environ.get("LOOKOUT_CLI_DEV_MODE") == "true":
         return True
-    return pkg_resources.require("lookout_cli")[0].version == "0.0.0"
+    return pkg_version("lookout-cli") == "0.0.0"
 
 
 def docker_compose_path(path: str) -> Path:
@@ -180,6 +180,18 @@ def docker_manifest(
         click.echo(click.style(f"✓ Created manifests for {image}", fg="green"))
 
 
+def maybe_ignore_prod(dev_mode: bool, prod: bool):
+    """Raise an error if prod=false in non-dev mode"""
+    if dev_mode:
+        return prod
+    if prod is False:
+        raise click.ClickException(
+            "prod=false is not supported in production installs. Source code is required for "
+            "development mode. Please update your config file to set prod: true."
+        )
+    return True
+
+
 def generate_sboms(
     version: str,
     images: List[str],

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/lookout_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lookout_cli
-Version: 3.2.0
+Version: 3.3.0
 Summary: A CLI for interacting with Lookout+
 Author-email: Greenroom Robotics <team@greenroomrobotics.com>
 Maintainer-email: David Revay <david.revay@greenroomrobotics.com>

{lookout_cli-3.2.0 → lookout_cli-3.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lookout_cli"
-version = "3.2.0"
+version = "3.3.0"
 description = "A CLI for interacting with Lookout+"
 readme = "README.md"
 license = {text = "Copyright (C) 2025, Greenroom Robotics"}