cyclo-manager 1.2.1__tar.gz → 1.2.2.dev0__tar.gz

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 1.2.1
+Version: 1.2.2.dev0
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -54,7 +54,7 @@ For the full monorepo (API source, UI source, dev compose), see the [repository
 - **Python 3.10+**
 - **systemd**: required for the managed `cyclo_host_agent.service`
 - **`sudo`** — required on normal-user hosts to install the host agent systemd unit, socket directory permissions, and sudoers rules
-- For **`cyclo_manager update`:** **`pip`** or **`pip3`** on `PATH`
+- For **`cyclo_manager update`:** **`pip`** in the Python environment running the CLI/host agent
 - **Root shell handling** — `cyclo_manager up` rejects direct root execution when a normal login user exists. On root-only devices, the host agent is installed as root.
 - **Agent sockets** on the host under `/var/run/robotis/agent_sockets/` (robot containers and host agent). The bundled Compose file bind-mounts this tree into the API container as `/agents/`.
 
@@ -91,13 +91,21 @@ python3 -m cyclo_manager_cli.cli up
 | `cyclo_manager up` | Install/refresh **cyclo_host_agent** (systemd unit, socket dir, sudoers), then `docker compose up -d` for **API + UI**, then `docker compose create --no-recreate` for **Zenoh** and **noVNC** (created but **not started**). Sets **`CYCLO_MANAGER_CONFIG_FILE`** to the bundled config. |
 | `cyclo_manager up --pull` | `docker compose pull` first, then the same as `up`. |
 | `cyclo_manager down` | **Tear down host agent** (stop/disable service, remove unit, sudoers, socket dir), then `docker compose down` for all services in the bundled compose file. |
-| `cyclo_manager update` | `docker compose down` (containers only — **host agent stays installed**), `pip install -U cyclo-manager`, **`docker compose pull`**, then `docker compose up` + create optional services, then **refresh host agent** (unit, socket, sudoers). |
+| `cyclo_manager update` | Update the package and pull images before restarting the Docker stack and refreshing the host agent. |
 | `cyclo_manager update --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 The CLI also has an internal `refresh-host-agent` subcommand. It is used by the sudoers rule and should normally not be invoked by users directly.
 
-**`down` vs `update`:** `down` removes the host agent entirely. `update` only stops Docker containers, upgrades the pip package, restarts the stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+**`down` vs `update`:** `down` removes the host agent entirely. `update` prepares the package and images, restarts the Docker stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+
+Updates use the running Python's pip and add `--break-system-packages` only when
+required and supported. Package installation or image download failures leave
+existing containers running; package changes are not automatically rolled back.
+
+**Older installations:** once this fix is released, manually upgrade the package
+once using your installation's Python, then run `cyclo_manager up --pull`.
+Add `--break-system-packages` to the pip command only if pip requests it.
 
 ---
 
@@ -152,8 +160,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image in this checkout |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.1` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.1` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.2` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.2` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/README.md

@@ -41,7 +41,7 @@ For the full monorepo (API source, UI source, dev compose), see the [repository
 - **Python 3.10+**
 - **systemd**: required for the managed `cyclo_host_agent.service`
 - **`sudo`** — required on normal-user hosts to install the host agent systemd unit, socket directory permissions, and sudoers rules
-- For **`cyclo_manager update`:** **`pip`** or **`pip3`** on `PATH`
+- For **`cyclo_manager update`:** **`pip`** in the Python environment running the CLI/host agent
 - **Root shell handling** — `cyclo_manager up` rejects direct root execution when a normal login user exists. On root-only devices, the host agent is installed as root.
 - **Agent sockets** on the host under `/var/run/robotis/agent_sockets/` (robot containers and host agent). The bundled Compose file bind-mounts this tree into the API container as `/agents/`.
 
@@ -78,13 +78,21 @@ python3 -m cyclo_manager_cli.cli up
 | `cyclo_manager up` | Install/refresh **cyclo_host_agent** (systemd unit, socket dir, sudoers), then `docker compose up -d` for **API + UI**, then `docker compose create --no-recreate` for **Zenoh** and **noVNC** (created but **not started**). Sets **`CYCLO_MANAGER_CONFIG_FILE`** to the bundled config. |
 | `cyclo_manager up --pull` | `docker compose pull` first, then the same as `up`. |
 | `cyclo_manager down` | **Tear down host agent** (stop/disable service, remove unit, sudoers, socket dir), then `docker compose down` for all services in the bundled compose file. |
-| `cyclo_manager update` | `docker compose down` (containers only — **host agent stays installed**), `pip install -U cyclo-manager`, **`docker compose pull`**, then `docker compose up` + create optional services, then **refresh host agent** (unit, socket, sudoers). |
+| `cyclo_manager update` | Update the package and pull images before restarting the Docker stack and refreshing the host agent. |
 | `cyclo_manager update --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 The CLI also has an internal `refresh-host-agent` subcommand. It is used by the sudoers rule and should normally not be invoked by users directly.
 
-**`down` vs `update`:** `down` removes the host agent entirely. `update` only stops Docker containers, upgrades the pip package, restarts the stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+**`down` vs `update`:** `down` removes the host agent entirely. `update` prepares the package and images, restarts the Docker stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+
+Updates use the running Python's pip and add `--break-system-packages` only when
+required and supported. Package installation or image download failures leave
+existing containers running; package changes are not automatically rolled back.
+
+**Older installations:** once this fix is released, manually upgrade the package
+once using your installation's Python, then run `cyclo_manager up --pull`.
+Add `--break-system-packages` to the pip command only if pip requests it.
 
 ---
 
@@ -139,8 +147,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image in this checkout |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.1` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.1` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.2` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.2` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 1.2.1
+Version: 1.2.2.dev0
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -54,7 +54,7 @@ For the full monorepo (API source, UI source, dev compose), see the [repository
 - **Python 3.10+**
 - **systemd**: required for the managed `cyclo_host_agent.service`
 - **`sudo`** — required on normal-user hosts to install the host agent systemd unit, socket directory permissions, and sudoers rules
-- For **`cyclo_manager update`:** **`pip`** or **`pip3`** on `PATH`
+- For **`cyclo_manager update`:** **`pip`** in the Python environment running the CLI/host agent
 - **Root shell handling** — `cyclo_manager up` rejects direct root execution when a normal login user exists. On root-only devices, the host agent is installed as root.
 - **Agent sockets** on the host under `/var/run/robotis/agent_sockets/` (robot containers and host agent). The bundled Compose file bind-mounts this tree into the API container as `/agents/`.
 
@@ -91,13 +91,21 @@ python3 -m cyclo_manager_cli.cli up
 | `cyclo_manager up` | Install/refresh **cyclo_host_agent** (systemd unit, socket dir, sudoers), then `docker compose up -d` for **API + UI**, then `docker compose create --no-recreate` for **Zenoh** and **noVNC** (created but **not started**). Sets **`CYCLO_MANAGER_CONFIG_FILE`** to the bundled config. |
 | `cyclo_manager up --pull` | `docker compose pull` first, then the same as `up`. |
 | `cyclo_manager down` | **Tear down host agent** (stop/disable service, remove unit, sudoers, socket dir), then `docker compose down` for all services in the bundled compose file. |
-| `cyclo_manager update` | `docker compose down` (containers only — **host agent stays installed**), `pip install -U cyclo-manager`, **`docker compose pull`**, then `docker compose up` + create optional services, then **refresh host agent** (unit, socket, sudoers). |
+| `cyclo_manager update` | Update the package and pull images before restarting the Docker stack and refreshing the host agent. |
 | `cyclo_manager update --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 The CLI also has an internal `refresh-host-agent` subcommand. It is used by the sudoers rule and should normally not be invoked by users directly.
 
-**`down` vs `update`:** `down` removes the host agent entirely. `update` only stops Docker containers, upgrades the pip package, restarts the stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+**`down` vs `update`:** `down` removes the host agent entirely. `update` prepares the package and images, restarts the Docker stack, and refreshes the host agent — it does **not** call `cyclo_manager down`.
+
+Updates use the running Python's pip and add `--break-system-packages` only when
+required and supported. Package installation or image download failures leave
+existing containers running; package changes are not automatically rolled back.
+
+**Older installations:** once this fix is released, manually upgrade the package
+once using your installation's Python, then run `cyclo_manager up --pull`.
+Add `--break-system-packages` to the pip command only if pip requests it.
 
 ---
 
@@ -152,8 +160,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image in this checkout |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.1` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.1` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.2.2` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.2.2` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/cyclo_manager_cli/__init__.py

@@ -18,4 +18,4 @@
 
 """cyclo_manager CLI - pip-installable launcher for cyclo_manager server and UI containers."""
 
-__version__ = '1.2.1'
+__version__ = '1.2.2.dev0'

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/cyclo_manager_cli/cli.py

@@ -31,6 +31,7 @@ import shutil
 import socket
 import subprocess
 import sys
+import sysconfig
 
 PYPI_PACKAGE = 'cyclo-manager'
 HOST_AGENT_SERVICE = 'cyclo_host_agent'
@@ -443,54 +444,105 @@ def cmd_down(args: argparse.Namespace) -> int:
     return 0
 
 
-def cmd_update(args: argparse.Namespace) -> int:
-    """Bring containers down, pip install -U, bring containers back up, restart host agent."""
-    pip_exe = shutil.which('pip3') or shutil.which('pip')
-    if not pip_exe:
-        print('pip not found; cannot update package.', file=sys.stderr)
-        return 1
+def _package_update_command() -> list[str]:
+    """Use this interpreter's pip, overriding PEP 668 only when required and supported."""
+    if not sys.executable:
+        raise RuntimeError('Python executable is unknown; cannot update package.')
 
-    compose_path = _docker_dir() / 'docker-compose.yml'
-    if not compose_path.is_file():
-        print(f'Compose file not found: {compose_path}', file=sys.stderr)
+    pip_command = [sys.executable, '-m', 'pip']
+    # Also checks that pip exists in this Python, without installing anything.
+    help_result = subprocess.run(
+        [*pip_command, 'install', '--help'],
+        check=True, capture_output=True, text=True, timeout=10,
+    )
+    command = [*pip_command, 'install', '-U', PYPI_PACKAGE]
+    in_venv = sys.prefix != sys.base_prefix or hasattr(sys, 'real_prefix')
+    marker = Path(sysconfig.get_path('stdlib')) / 'EXTERNALLY-MANAGED'
+    if not in_venv and marker.is_file():
+        if '--break-system-packages' not in help_result.stdout:
+            raise RuntimeError(
+                f'{sys.executable} is externally managed, but its pip does not support '
+                '--break-system-packages. Use a virtual environment or install a '
+                'compatible pip through the OS package manager.'
+            )
+        command.append('--break-system-packages')
+        print('System Python is externally managed; using --break-system-packages.', flush=True)
+    else:
+        print('Using pip without --break-system-packages.', flush=True)
+    return command
+
+
+def _updated_package_dir() -> Path:
+    """Resolve the installed package in a fresh Python after pip may have moved it."""
+    result = subprocess.run(
+        [sys.executable, '-c',
+         'from pathlib import Path; import cyclo_manager_cli; '
+         'print(Path(cyclo_manager_cli.__file__).resolve().parent)'],
+        check=True, capture_output=True, text=True, timeout=10,
+    )
+    package_dir = Path(result.stdout.strip())
+    if not package_dir.is_absolute():
+        raise RuntimeError('Cannot determine the updated package directory.')
+    return package_dir
+
+
+def cmd_update(args: argparse.Namespace) -> int:
+    """Prepare the package and images before stopping containers and refreshing the agent."""
+    if not shutil.which('docker'):
+        print('Docker not found.', file=sys.stderr)
         return 1
-    env = os.environ.copy()
-    env['CYCLO_MANAGER_CONFIG_FILE'] = str(_packaged_config_path())
-    env.setdefault('HOSTNAME', socket.gethostname())
-    base = ['docker', 'compose', '-f', str(compose_path)]
 
-    print('Stopping containers...')
+    print(f'Checking pip for Python: {sys.executable}', flush=True)
     try:
-        subprocess.run([*base, 'down'], env=env, check=True)
+        update_command = _package_update_command()
     except subprocess.CalledProcessError as e:
+        print(f'Cannot use pip in {sys.executable}: {e.stderr or e}', file=sys.stderr)
         return e.returncode
-    except FileNotFoundError:
-        print('Docker not found.', file=sys.stderr)
+    except (OSError, RuntimeError, subprocess.TimeoutExpired) as e:
+        print(f'Cannot prepare package update: {e}', file=sys.stderr)
         return 1
 
-    print(f'Updating {PYPI_PACKAGE} (pip install -U)...')
+    print(f'Updating {PYPI_PACKAGE} with {sys.executable} -m pip...', flush=True)
     try:
-        subprocess.run([pip_exe, 'install', '-U', PYPI_PACKAGE], check=True, timeout=120)
+        subprocess.run(update_command, check=True, timeout=120)
     except subprocess.CalledProcessError as e:
         print(f'pip install -U {PYPI_PACKAGE} failed.', file=sys.stderr)
         return e.returncode
     except subprocess.TimeoutExpired:
         print('pip install timed out.', file=sys.stderr)
         return 1
+    except OSError as e:
+        print(f'Failed to start pip: {e}', file=sys.stderr)
+        return 1
 
-    if not getattr(args, 'no_pull', False):
-        print('Pulling latest images...')
-        try:
-            subprocess.run([*base, 'pull'], env=env, check=True)
-        except subprocess.CalledProcessError as e:
-            print(
-                f'Warning: docker compose pull failed (exit {e.returncode}); '
-                'continuing with cached images.',
-                file=sys.stderr,
-            )
+    try:
+        package_dir = _updated_package_dir()
+    except subprocess.CalledProcessError as e:
+        print(f'Cannot locate updated package: {e.stderr or e}', file=sys.stderr)
+        return e.returncode
+    except (OSError, RuntimeError, subprocess.TimeoutExpired) as e:
+        print(f'Cannot locate updated package: {e}', file=sys.stderr)
+        return 1
+
+    compose_path = package_dir / 'docker/docker-compose.yml'
+    config_path = package_dir / 'config/config.yml'
+    for path in (compose_path, config_path):
+        if not path.is_file():
+            print(f'Updated package file not found: {path}', file=sys.stderr)
+            return 1
+    env = os.environ.copy()
+    env['CYCLO_MANAGER_CONFIG_FILE'] = str(config_path)
+    env.setdefault('HOSTNAME', socket.gethostname())
+    base = ['docker', 'compose', '-f', str(compose_path)]
 
-    print('Starting containers...')
     try:
+        if not getattr(args, 'no_pull', False):
+            print('Pulling images before stopping containers...', flush=True)
+            subprocess.run([*base, 'pull'], env=env, check=True)
+
+        print('Stopping containers...', flush=True)
+        subprocess.run([*base, 'down'], env=env, check=True)
+        print('Starting containers...', flush=True)
         subprocess.run([*base, 'up', '-d', *COMPOSE_SERVICES_UP], env=env, check=True)
         subprocess.run(
             [*base, 'create', '--no-recreate', *COMPOSE_SERVICES_CREATE_ONLY],
@@ -498,7 +550,11 @@ def cmd_update(args: argparse.Namespace) -> int:
             check=True,
         )
     except subprocess.CalledProcessError as e:
+        print(f'Docker update command failed: {e}', file=sys.stderr)
         return e.returncode
+    except OSError as e:
+        print(f'Failed to run Docker: {e}', file=sys.stderr)
+        return 1
 
     print('Refreshing host agent (unit, socket, sudoers)...')
     if _refresh_host_agent_after_update() != 0:
@@ -533,7 +589,7 @@ def main() -> int:
 
     update_parser = sub.add_parser(
         'update',
-        help='Down containers, pip install -U cyclo-manager, pull images, then up again',
+        help='Update the package and pull images before restarting containers and the host agent',
     )
     update_parser.add_argument(
         '--no-pull',

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/cyclo_manager_cli/docker/docker-compose.yml

@@ -11,7 +11,7 @@ services:
 
   cyclo_manager:
     container_name: cyclo_manager
-    image: robotis/cyclo-manager:1.2.1
+    image: robotis/cyclo-manager:1.2.2
     restart: always
     network_mode: host
     volumes:
@@ -29,7 +29,7 @@ services:
 
   ui:
     container_name: cyclo_manager_ui
-    image: robotis/cyclo-manager-ui:1.2.1
+    image: robotis/cyclo-manager-ui:1.2.2
     restart: always
     network_mode: host
     environment:

{cyclo_manager-1.2.1 → cyclo_manager-1.2.2.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cyclo-manager"
-version = "1.2.1"
+version = "1.2.2.dev0"
 description = "cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack."
 readme = "README.md"
 license = "Apache-2.0"