lager-cli 0.4.2__tar.gz → 0.7.0__tar.gz

{lager_cli-0.4.2/lager_cli.egg-info → lager_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lager-cli
-Version: 0.4.2
+Version: 0.7.0
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data LLC

{lager_cli-0.4.2 → lager_cli-0.7.0}/__init__.py

@@ -7,4 +7,4 @@ Lager CLI
 A Command Line Interface for Lager Data
 """
 
-__version__ = '0.4.2'
+__version__ = '0.7.0'

{lager_cli-0.4.2 → lager_cli-0.7.0}/commands/box/boxes.py

@@ -679,6 +679,103 @@ def import_boxes(file, merge, yes):
         click.echo(click.style(f"[OK] Successfully imported {len(import_boxes_data)} box(es) from {file}", fg='green'))
 
 
+@boxes.command('connect')
+@click.option('--box', required=True, help='Name of the box to connect')
+@click.option('--url', default='https://api.stoutdata.ai', help='Control plane URL')
+@click.option('--api-key', required=True, help='API key for control plane authentication')
+@click.option('--heartbeat-interval', default=30, type=int, help='Heartbeat interval in seconds (default: 30)')
+@click.option('--yes', is_flag=True, help='Confirm the action without prompting.')
+def connect(box, url, api_key, heartbeat_interval, yes):
+    """Connect a box to a control plane for heartbeat reporting."""
+    import subprocess
+    import time
+    import requests
+    import shlex
+    from ...box_storage import get_box_ip, get_box_user
+    from ...core.ssh_utils import get_reusable_ssh_command
+
+    # Validate URL
+    from urllib.parse import urlparse
+    parsed = urlparse(url)
+    if parsed.scheme not in ('http', 'https'):
+        click.secho(f"Error: URL scheme must be http or https, got '{parsed.scheme}'", fg='red', err=True)
+        raise click.Abort()
+    if not parsed.hostname:
+        click.secho("Error: URL must include a hostname", fg='red', err=True)
+        raise click.Abort()
+
+    # Warn if control plane is unreachable from this machine (may still work from the box)
+    import requests as _req
+    try:
+        _req.get(f'{url.rstrip("/")}/healthz', timeout=5)
+    except _req.exceptions.RequestException:
+        click.secho(
+            f"Warning: Could not reach {url} from this machine. "
+            "It may still be reachable from the box.",
+            fg='yellow',
+        )
+
+    ip = get_box_ip(box)
+    if not ip:
+        click.secho(f"Error: Box '{box}' not found in configuration", fg='red', err=True)
+        raise click.Abort()
+
+    user = get_box_user(box) or 'lagerdata'
+
+    if not yes:
+        click.echo(f"\nConnect box '{box}' ({ip}) to control plane:")
+        click.echo(f"  URL:       {url}")
+        click.echo(f"  API Key:   {api_key[:8]}...")
+        click.echo(f"  Interval:  {heartbeat_interval}s")
+        click.echo()
+        if not click.confirm("Proceed?", default=False):
+            click.echo("Cancelled.")
+            return
+
+    config = json.dumps({
+        'url': url,
+        'api_key': api_key,
+        'heartbeat_interval_seconds': heartbeat_interval,
+        'enabled': True,
+    })
+
+    # Write config into the lager Docker container (avoids needing sudo on host)
+    click.echo(f"Writing control plane config to {box}...")
+    write_cmd = f'echo {shlex.quote(config)} | docker exec -u root -i lager tee /etc/lager/control_plane.json > /dev/null'
+    ssh_cmd = get_reusable_ssh_command(ip, user=user, command=write_cmd)
+    result = subprocess.run(ssh_cmd, capture_output=True, text=True)
+    if result.returncode != 0:
+        click.secho(f"Error writing config: {result.stderr.strip()}", fg='red', err=True)
+        raise click.Abort()
+
+    # Restart the box container
+    click.echo(f"Restarting lager container on {box}...")
+    ssh_cmd = get_reusable_ssh_command(ip, user=user, command='docker restart lager')
+    result = subprocess.run(ssh_cmd, capture_output=True, text=True)
+    if result.returncode != 0:
+        click.secho(f"Error restarting container: {result.stderr.strip()}", fg='red', err=True)
+        raise click.Abort()
+
+    # Verify the box is healthy
+    click.echo("Waiting for box to come back up...")
+    time.sleep(5)
+    try:
+        resp = requests.get(f'http://{ip}:5000/status', timeout=10)
+        if resp.status_code == 200:
+            data = resp.json()
+            click.secho(f"Box '{box}' connected successfully!", fg='green')
+            click.echo(f"  Healthy: {data.get('healthy')}")
+            click.echo(f"  Version: {data.get('version')}")
+            nets = data.get('nets', [])
+            if nets:
+                click.echo(f"  Nets:    {len(nets)}")
+        else:
+            click.secho(f"Warning: Box returned HTTP {resp.status_code}", fg='yellow')
+    except requests.exceptions.RequestException as e:
+        click.secho(f"Warning: Could not verify box status: {e}", fg='yellow')
+        click.echo("The config was written. The box may still be starting up.")
+
+
 def compare_versions(v1, v2):
     """
     Compare two version strings.

{lager_cli-0.4.2 → lager_cli-0.7.0}/commands/development/devenv.py

@@ -140,7 +140,9 @@ def create(ctx, image, mount_dir, shell):
 @click.option('--entrypoint', help='Container entrypoint', required=False)
 @click.option('--network', help='Network mode', required=False)
 @click.option('--platform', help='Platform', required=False)
-def terminal(ctx, mount, user, group, name, detach, port, entrypoint, network, platform):
+@click.option('--attach', '-a', 'attach_container', help='Attach to a running container by name', required=False, default=None)
+@click.option('--shell', '-s', help='Shell to use when attaching (default: config shell or /bin/bash)', required=False, default=None)
+def terminal(ctx, mount, user, group, name, detach, port, entrypoint, network, platform, attach_container, shell):
     """
     Start interactive terminal
     """
@@ -151,6 +153,16 @@ def terminal(ctx, mount, user, group, name, detach, port, entrypoint, network, p
         ctx.exit(1)
     devenv_config = data['DEVENV']
 
+    if attach_container:
+        shell_cmd = shell or devenv_config.get('shell', '/bin/bash')
+        attach_args = ['docker', 'exec', '-it', attach_container, shell_cmd]
+        try:
+            proc = subprocess.run(attach_args, check=False)
+        except FileNotFoundError:
+            click.secho("Error: Docker is not installed or not in PATH", fg='red', err=True)
+            ctx.exit(1)
+        ctx.exit(proc.returncode)
+
     image = devenv_config.get('image')
     source_dir = os.path.dirname(path)
     mount_dir = devenv_config.get('mount_dir')

{lager_cli-0.4.2 → lager_cli-0.7.0}/commands/development/python.py

@@ -66,7 +66,7 @@ def sigint_handler(kill_python, box_ip, _sig, _frame):
 
     # Now restore original handler and kill remote process
     signal.signal(signal.SIGINT, _ORIGINAL_SIGINT_HANDLER)
-    kill_python(signal.SIGINT)
+    kill_python(signal.SIGTERM)
 
 
 def _do_exit(exit_code, box, session, downloads):
@@ -377,6 +377,19 @@ def run_python_internal(ctx, runnable, box, env, passenv, kill, download, allow_
                     click.echo(resp.text, err=True)
         ctx.exit(1)
 
+    # Handle detached mode: parse JSON response and return immediately
+    if detach:
+        try:
+            data = resp.json()
+            process_id = data.get('lager_process_id', lager_process_id)
+            box_label = dut_name or box_ip
+            click.echo(f'Process detached (Process ID: {process_id})')
+            click.echo(f'To reattach: lager python --reattach {process_id} --box {box_label}')
+            click.echo(f'To kill: lager python --kill {process_id} --box {box_label}')
+        except Exception:
+            click.echo('Process detached.')
+        return
+
     kill_python = functools.partial(session.kill_python, box_ip, lager_process_id)
     handler = functools.partial(sigint_handler, kill_python, box_ip)
     signal.signal(signal.SIGINT, handler)
@@ -414,6 +427,84 @@ def run_python_internal(ctx, runnable, box, env, passenv, kill, download, allow_
         sys.exit(1)
 
 
+def _handle_reattach(ctx, box_ip, process_id, session, dut_name):
+    """
+    Reattach to a detached process and stream its output.
+
+    Ctrl+C kills the process (same as normal lager python).
+    Ctrl+D detaches from the stream without killing the process.
+    """
+    try:
+        resp = session.attach_python(box_ip, process_id)
+    except requests.exceptions.ConnectionError:
+        click.secho(f'Could not connect to box at {box_ip}', fg='red', err=True)
+        ctx.exit(1)
+    except requests.exceptions.Timeout:
+        click.secho(f'Connection to box at {box_ip} timed out', fg='red', err=True)
+        ctx.exit(1)
+
+    if resp.status_code == 404 or resp.status_code == 422:
+        try:
+            error_data = resp.json()
+            click.secho(error_data.get('error', 'Process not found'), fg='red', err=True)
+        except Exception:
+            click.secho(f'Process not found: {process_id}', fg='red', err=True)
+        ctx.exit(1)
+    elif resp.status_code >= 400:
+        click.secho(f'Error: Box returned HTTP {resp.status_code}', fg='red', err=True)
+        ctx.exit(1)
+
+    # Ctrl+C = kill the process (same as normal lager python)
+    kill_python = functools.partial(session.kill_python, box_ip, process_id)
+    handler = functools.partial(sigint_handler, kill_python, box_ip)
+    signal.signal(signal.SIGINT, handler)
+
+    # Ctrl+D = detach (stdin EOF watcher thread)
+    detached_by_user = False
+
+    def watch_stdin_for_detach():
+        nonlocal detached_by_user
+        try:
+            while True:
+                ch = sys.stdin.read(1)
+                if not ch:  # EOF (Ctrl+D)
+                    detached_by_user = True
+                    click.echo('\nDetaching...')
+                    resp.close()
+                    return
+        except (ValueError, OSError):
+            return
+
+    if sys.stdin.isatty():
+        stdin_thread = threading.Thread(target=watch_stdin_for_detach, daemon=True)
+        stdin_thread.start()
+
+    try:
+        for (datatype, content) in stream_python_output(resp):
+            if datatype == StreamDatatypes.EXIT:
+                signal.signal(signal.SIGINT, _ORIGINAL_SIGINT_HANDLER)
+                click.echo(f'Process exited with code {content}')
+                sys.exit(content)
+            elif datatype == StreamDatatypes.STDOUT:
+                click.echo(content.decode("utf-8", errors="ignore"), nl=False)
+            elif datatype == StreamDatatypes.STDERR:
+                click.echo(content.decode("utf-8", errors="ignore"), nl=False, err=True)
+            elif datatype == StreamDatatypes.OUTPUT:
+                click.echo(content)
+    except (BrokenPipeError, requests.exceptions.ChunkedEncodingError):
+        pass
+    except OutputFormatNotSupported:
+        click.secho('Response format not supported. Please upgrade lager-cli', fg='red', err=True)
+        sys.exit(1)
+    finally:
+        signal.signal(signal.SIGINT, _ORIGINAL_SIGINT_HANDLER)
+
+    if detached_by_user:
+        box_label = dut_name or box_ip
+        click.echo(f'To reattach: lager python --reattach {process_id} --box {box_label}')
+        click.echo(f'To kill: lager python --kill {process_id} --box {box_label}')
+
+
 @click.command()
 @click.pass_context
 @click.argument('runnable', required=False, type=click.Path(exists=True))
@@ -424,17 +515,19 @@ def run_python_internal(ctx, runnable, box, env, passenv, kill, download, allow_
 @click.option(
     '--passenv',
     multiple=True, help='Environment variable to inherit')
-@click.option('--kill', is_flag=True, default=False, help='Terminate running script')
+@click.option('--kill', default=None, help='Kill a specific process by process ID')
+@click.option('--kill-all', is_flag=True, default=False, help='Kill all running scripts')
 @click.option('--download', type=click.Path(exists=False, dir_okay=False), multiple=True, help='File to download after completion')
 @click.option('--allow-overwrite', is_flag=True, default=False, help='Overwrite existing files when downloading')
-@click.option('--signal', 'signum', default='SIGTERM', type=_SIGNAL_CHOICES, help='Signal to use with --kill', show_default=True)
+@click.option('--signal', 'signum', default='SIGTERM', type=_SIGNAL_CHOICES, help='Signal to use with --kill/--kill-all', show_default=True)
 @click.option('--timeout', type=click.IntRange(min=0), default=0, required=False, help='Max runtime in seconds (0=no timeout)')
 @click.option('--detach', '-d', is_flag=True, required=False, default=False, help='Detach')
 @click.option('--port', '-p', multiple=True, help='Port forwarding (SRC_PORT[:DST_PORT][/PROTOCOL])', type=PortForwardType())
 @click.option('--org', default=None, hidden=True)
 @click.option('--add-file', type=click.Path(exists=True, dir_okay=False), multiple=True, help='File to upload with script')
+@click.option('--reattach', default=None, help='Reattach to detached process by process ID')
 @click.argument('args', nargs=-1)
-def python(ctx, runnable, box, env, passenv, kill, download, allow_overwrite, signum, timeout, detach, port, org, add_file, args):
+def python(ctx, runnable, box, env, passenv, kill, kill_all, download, allow_overwrite, signum, timeout, detach, port, org, add_file, reattach, args):
     """Run Python script on box"""
     from ...box_storage import resolve_and_validate_box
 
@@ -442,8 +535,36 @@ def python(ctx, runnable, box, env, passenv, kill, download, allow_overwrite, si
     box_name = box
     box_ip = resolve_and_validate_box(ctx, box_name)
 
-    if not runnable and not kill:
-        raise click.UsageError('Please supply a RUNNABLE or the --kill option')
+    if not runnable and not kill and not kill_all and not reattach:
+        raise click.UsageError('Please supply a RUNNABLE, --kill, --kill-all, or --reattach option')
+
+    if kill:
+        session = ctx.obj.get_session_for_box(box_ip, box_name=box_name)
+        signum_val = _get_signal_number(signum)
+        resp = session.kill_python(box_ip, kill, signum_val)
+        if resp.status_code == 422:
+            try:
+                error_data = resp.json()
+                click.secho(error_data.get('error', 'Invalid request'), fg='red', err=True)
+            except Exception:
+                click.secho(f'Invalid process ID: {kill}', fg='red', err=True)
+            ctx.exit(1)
+        resp.raise_for_status()
+        click.echo(f'Process {kill} killed')
+        return
+
+    if kill_all:
+        session = ctx.obj.get_session_for_box(box_ip, box_name=box_name)
+        signum_val = _get_signal_number(signum)
+        resp = session.kill_python(box_ip, None, signum_val)
+        resp.raise_for_status()
+        click.echo('All processes killed')
+        return
+
+    if reattach:
+        session = ctx.obj.get_session_for_box(box_ip, box_name=box_name)
+        _handle_reattach(ctx, box_ip, reattach, session, box_name)
+        return
 
     if not allow_overwrite:
         for filename in download:
@@ -457,4 +578,4 @@ def python(ctx, runnable, box, env, passenv, kill, download, allow_overwrite, si
     if box_name:
         env.append(f'LAGER_BOX={box_name}')
 
-    run_python_internal(ctx, runnable, box_ip, env, passenv, kill, download, allow_overwrite, signum, timeout, detach, port, org, args, add_file, dut_name=box_name)
+    run_python_internal(ctx, runnable, box_ip, env, passenv, False, download, allow_overwrite, signum, timeout, detach, port, org, args, add_file, dut_name=box_name)

{lager_cli-0.4.2 → lager_cli-0.7.0}/commands/utility/__init__.py

@@ -24,7 +24,6 @@ from .logs import logs
 from .webcam import webcam
 from .install import install
 from .uninstall import uninstall
-from .factory import factory
 
 __all__ = [
     "defaults",
@@ -36,5 +35,4 @@ __all__ = [
     "webcam",
     "install",
     "uninstall",
-    "factory",
 ]

{lager_cli-0.4.2 → lager_cli-0.7.0}/commands/utility/update.py

@@ -304,8 +304,8 @@ def update(ctx, box, update_all, yes, skip_restart, version, verbose, force):
             ctx.exit(0)
 
     # Initialize progress bar (only in non-verbose mode)
-    # Total steps: connectivity, repo check, git state check, fetch, checkout/pull, flatten, udev, sudoers, docker stop, [force image removal], docker build, cleanup, /etc/lager, docker start, binaries, jlink, verify, version, factory sync
-    total_steps = 21 if force else 20
+    # Total steps: connectivity, repo check, git state check, fetch, checkout/pull, flatten, udev, sudoers, docker stop, [force image removal], docker build, cleanup, /etc/lager, docker start, binaries, jlink, verify, version
+    total_steps = 20 if force else 19
     progress = None if verbose else ProgressBar(total_steps=total_steps)
 
     if not verbose:
@@ -1206,85 +1206,6 @@ fi
     if box_cli_version and box:
         update_box_version(box, box_cli_version)
 
-    # Step 14: Sync .lager boxes to factory dashboard (if factory is deployed)
-    if progress:
-        progress.update("Syncing factory...")
-    log('Syncing factory dashboard...', nl=False)
-
-    try:
-        # Check if factory directory exists on the host (container was stopped earlier)
-        factory_check = run_ssh_command_with_output(
-            'test -d /home/lagerdata/factory',
-            timeout_secs=10
-        )
-
-        if factory_check.returncode != 0:
-            log_status('Syncing factory dashboard...', 'SKIPPED (no factory)', 'yellow')
-        else:
-            import json as json_mod
-            # Build boxes.json from all saved boxes (dict keyed by box name)
-            saved_boxes = list_boxes()
-            boxes_dict = {}
-            for name, box_info in sorted(saved_boxes.items()):
-                if isinstance(box_info, dict):
-                    ip = box_info.get('ip', '')
-                    user = box_info.get('user', 'lagerdata')
-                else:
-                    ip = box_info
-                    user = 'lagerdata'
-
-                if not ip or ip == 'unknown':
-                    continue
-
-                # For the box being updated, use localhost
-                # so the factory container can reach its own lager container
-                if name == box_name:
-                    entry_ip = '127.0.0.1'
-                else:
-                    entry_ip = ip
-
-                boxes_dict[name] = {
-                    'name': name,
-                    'ip': entry_ip,
-                    'ssh_user': user,
-                    'container': 'lager',
-                }
-
-            boxes_json = json_mod.dumps(boxes_dict, indent=2)
-            # Escape single quotes for shell
-            escaped_json = boxes_json.replace("'", "'\\''")
-
-            # Write boxes.json to the host filesystem
-            write_result = run_ssh_command_with_output(
-                f"echo '{escaped_json}' > /home/lagerdata/factory/webapp/boxes.json",
-                timeout_secs=10
-            )
-
-            if write_result.returncode != 0:
-                log_status('Syncing factory dashboard...', 'FAILED (write)', 'red')
-            else:
-                # Start factory container (it was stopped by the "stop all" step)
-                start_result = run_ssh_command_with_output(
-                    'cd /home/lagerdata/factory && docker compose up -d',
-                    timeout_secs=60
-                )
-                if start_result.returncode != 0:
-                    log_status('Syncing factory dashboard...', 'FAILED (start)', 'red')
-                else:
-                    # Copy boxes.json into the running container and restart
-                    # so it picks up the new config (docker cp works even without bind mounts)
-                    cp_result = run_ssh_command_with_output(
-                        'docker cp /home/lagerdata/factory/webapp/boxes.json factory:/factory/webapp/boxes.json && '
-                        'docker restart factory',
-                        timeout_secs=30
-                    )
-                    if cp_result.returncode == 0:
-                        log_status('Syncing factory dashboard...', f'OK ({len(boxes_dict)} boxes)', 'green')
-                    else:
-                        log_status('Syncing factory dashboard...', 'FAILED (copy)', 'red')
-    except Exception as e:
-        log_status('Syncing factory dashboard...', f'FAILED ({e})', 'red')
-
     # Finish progress bar
     if progress:
         progress.finish(success=True)

{lager_cli-0.4.2 → lager_cli-0.7.0}/context/session.py

@@ -625,7 +625,6 @@ class DirectHTTPSession:
             'lager_process_id': lager_process_id,
             'signal': int(sig)
         })
-        response.raise_for_status()
         return response
 
     def box_hello(self, box):
@@ -643,6 +642,26 @@ class DirectHTTPSession:
         url = f'{self.base_url}/nets'
         return self.session.get(url)
 
+    def attach_python(self, box, lager_process_id):
+        """
+        Reattach to a detached Python process on box.
+
+        Args:
+            box: Box IP (ignored, uses self.box_ip)
+            lager_process_id: Process ID to reattach to
+
+        Returns:
+            requests.Response object with streaming content
+        """
+        url = f'{self.base_url}/python/attach'
+        response = self.session.post(
+            url,
+            json={'lager_process_id': lager_process_id},
+            stream=True,
+            timeout=(7, None),
+        )
+        return response
+
     def download_file(self, box, filename):
         """
         Download a file from box via direct HTTP.

{lager_cli-0.4.2 → lager_cli-0.7.0}/deployment/scripts/setup_and_deploy_box.sh

@@ -302,6 +302,18 @@ else
     fi
 fi
 
+# Always ensure current user is in docker group (handles multi-user scenario)
+print_info "Ensuring ${BOX_USER} is in the docker group..."
+ssh_t "${BOX_USER}@${BOX_IP}" "sudo usermod -aG docker \$USER" 2>/dev/null || true
+
+# Verify docker access works for this user
+if ssh $SSH_OPTS "${BOX_USER}@${BOX_IP}" "docker info >/dev/null 2>&1"; then
+    print_success "${BOX_USER} has docker access"
+else
+    print_warning "Docker group membership may require re-login"
+    print_info "If Docker commands fail, log out and back in to the box, then re-run install"
+fi
+
 # =============================================================================
 # STEP 1: SSH Key Setup
 # =============================================================================

{lager_cli-0.4.2 → lager_cli-0.7.0/lager_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lager-cli
-Version: 0.4.2
+Version: 0.7.0
 Summary: Lager CLI - Box and Docker connectivity
 Home-page: https://github.com/lagerdata/lager
 Author: Lager Data LLC

{lager_cli-0.4.2 → lager_cli-0.7.0}/lager_cli.egg-info/SOURCES.txt

@@ -76,7 +76,6 @@ update_check.py
 ./commands/utility/binaries.py
 ./commands/utility/defaults.py
 ./commands/utility/exec_.py
-./commands/utility/factory.py
 ./commands/utility/install.py
 ./commands/utility/logs.py
 ./commands/utility/pip.py
@@ -276,7 +275,6 @@ commands/utility/__init__.py
 commands/utility/binaries.py
 commands/utility/defaults.py
 commands/utility/exec_.py
-commands/utility/factory.py
 commands/utility/install.py
 commands/utility/logs.py
 commands/utility/pip.py

{lager_cli-0.4.2 → lager_cli-0.7.0}/main.py

@@ -72,7 +72,36 @@ from .commands.measurement.energy import energy
 from .commands.box import hello, boxes, instruments, nets, ssh
 
 # Utility commands (from commands.utility package)
-from .commands.utility import defaults, binaries, update, pip, exec_, logs, webcam, install, uninstall, factory
+from .commands.utility import defaults, binaries, update, pip, exec_, logs, webcam, install, uninstall
+
+def _check_venv_shadowing():
+    """Warn if a system-installed lager is shadowing the venv version."""
+    virtual_env = os.environ.get('VIRTUAL_ENV')
+    if not virtual_env:
+        return
+
+    # If VIRTUAL_ENV is set but sys.prefix doesn't point to it, the
+    # system `lager` entry-point script (with a hardcoded shebang) is
+    # running instead of the venv's copy.  This is the exact shadowing
+    # scenario we want to catch.
+    if os.path.realpath(sys.prefix) == os.path.realpath(virtual_env):
+        return
+
+    click.secho(
+        f"WARNING: Lager CLI v{__version__} is running from a system Python ({sys.prefix}), "
+        f"not from your active virtual environment ({virtual_env}).",
+        fg='yellow', err=True,
+    )
+    click.secho(
+        "This can cause version mismatches. To fix:\n"
+        "  hash -r              # clear shell cache, then retry\n"
+        "  pip install --force-reinstall lager-cli   # if hash -r alone doesn't help\n"
+        "Or uninstall the system version:\n"
+        "  deactivate && pip uninstall lager-cli && source <venv>/bin/activate",
+        fg='yellow', err=True,
+    )
+    click.echo(err=True)
+
 
 def _decode_environment():
     for key in os.environ:
@@ -89,6 +118,8 @@ def cli(ctx=None, see_version=None, debug=False, colorize=False, interpreter=Non
     """
         Lager CLI
     """
+    _check_venv_shadowing()
+
     if os.getenv('LAGER_DECODE_ENV'):
         _decode_environment()
 
@@ -141,7 +172,6 @@ cli.add_command(logs)
 cli.add_command(binaries)
 cli.add_command(install)
 cli.add_command(uninstall)
-cli.add_command(factory)
 cli.add_command(terminal_cmd)
 
 def _schedule_update_check(ctx):

{lager_cli-0.4.2 → lager_cli-0.7.0}/pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools>=45", "wheel"]
+requires = ["setuptools>=45,<78", "wheel"]
 build-backend = "setuptools.build_meta"

lager_cli-0.4.2/commands/utility/factory.py

@@ -1,73 +0,0 @@
-# Copyright 2024-2026 Lager Data LLC
-# SPDX-License-Identifier: Apache-2.0
-
-"""
-lager.commands.utility.factory
-
-Start the Lager Factory webapp.
-"""
-
-import os
-import socket
-import subprocess
-import sys
-
-import click
-
-
-def _get_local_ip():
-    """Best-effort detection of the machine's LAN IP address."""
-    try:
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.settimeout(0)
-        s.connect(('10.254.254.254', 1))
-        ip = s.getsockname()[0]
-        s.close()
-        return ip
-    except Exception:
-        return '127.0.0.1'
-
-
-@click.command('factory')
-@click.option('--port', default=5001, type=int, help='Port number')
-@click.option('--host', default='0.0.0.0', help='Host to bind to')
-def factory(port, host):
-    """Start the Lager Factory."""
-    if port < 0 or port > 65535:
-        click.secho(f'Error: Port must be between 0 and 65535, got {port}.', fg='red', err=True)
-        raise SystemExit(1)
-
-    # Locate webapp directory relative to CLI package
-    cli_dir = os.path.dirname(os.path.dirname(os.path.dirname(
-        os.path.abspath(__file__)
-    )))
-    webapp_dir = os.path.join(os.path.dirname(cli_dir), 'factory', 'webapp')
-
-    if not os.path.isdir(webapp_dir):
-        click.secho(
-            f'Factory webapp not found at {webapp_dir}', fg='red', err=True
-        )
-        raise SystemExit(1)
-
-    run_py = os.path.join(webapp_dir, 'run.py')
-    if not os.path.isfile(run_py):
-        click.secho(
-            f'run.py not found at {run_py}', fg='red', err=True
-        )
-        raise SystemExit(1)
-
-    local_ip = _get_local_ip()
-    click.secho('Lager Factory starting...', fg='green')
-    click.secho(f'  Local:   http://127.0.0.1:{port}')
-    click.secho(f'  Network: http://{local_ip}:{port}')
-
-    env = dict(os.environ, PORT=str(port), HOST=host)
-
-    try:
-        subprocess.run(
-            [sys.executable, 'run.py'],
-            cwd=webapp_dir,
-            env=env,
-        )
-    except KeyboardInterrupt:
-        pass