cyclo-manager 1.0.0.dev5__tar.gz → 1.0.0.dev7__tar.gz

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 1.0.0.dev5
+Version: 1.0.0.dev7
 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
@@ -120,16 +120,16 @@ The pip package installs a small **FastAPI** server that listens on a **Unix dom
 |------|------|
 | Socket | `/var/run/robotis/agent_sockets/host/host_agent.sock` |
 | systemd unit | `cyclo_host_agent.service` |
-| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; skipped on root-only devices) |
+| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; `refresh-host-agent` CLI subcommand for UI updates; skipped on root-only devices) |
 
 The API container reaches it at `/agents/host/host_agent.sock` (see bundled `config.yml`).
 
 **Responsibilities:**
 
 - List and update **`~/ROBOTIS-GIT/*`** git repositories (Version Management in the UI)
-- Run **`cyclo_manager update`** when triggered from the UI (`POST /host/update`)
+- Run Cyclo Manager package updates from the UI by delegating to `cyclo_manager update`
 
-`cyclo_manager up` and `cyclo_manager update` both call `_ensure_host_agent()`, which is idempotent — safe to run after upgrades or user changes.
+`cyclo_manager up` installs the `refresh-host-agent` CLI subcommand into sudoers. It is registered as `sys.executable -m cyclo_manager_cli.cli refresh-host-agent` with `SETENV`, so UI-triggered updates can pass the current `PYTHONPATH` to sudo and do not depend on `PATH`. The command is idempotent and refreshes the socket directory, sudoers file, systemd unit, and service state after package upgrades.
 
 Repository scanning uses `CYCLO_HOST_AGENT_WORKSPACE` when set. Otherwise it uses the service user's home directory, except root-only devices with `/data/docker`, where `/data/docker` is used automatically.
 

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/README.md

@@ -106,16 +106,16 @@ The pip package installs a small **FastAPI** server that listens on a **Unix dom
 |------|------|
 | Socket | `/var/run/robotis/agent_sockets/host/host_agent.sock` |
 | systemd unit | `cyclo_host_agent.service` |
-| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; skipped on root-only devices) |
+| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; `refresh-host-agent` CLI subcommand for UI updates; skipped on root-only devices) |
 
 The API container reaches it at `/agents/host/host_agent.sock` (see bundled `config.yml`).
 
 **Responsibilities:**
 
 - List and update **`~/ROBOTIS-GIT/*`** git repositories (Version Management in the UI)
-- Run **`cyclo_manager update`** when triggered from the UI (`POST /host/update`)
+- Run Cyclo Manager package updates from the UI by delegating to `cyclo_manager update`
 
-`cyclo_manager up` and `cyclo_manager update` both call `_ensure_host_agent()`, which is idempotent — safe to run after upgrades or user changes.
+`cyclo_manager up` installs the `refresh-host-agent` CLI subcommand into sudoers. It is registered as `sys.executable -m cyclo_manager_cli.cli refresh-host-agent` with `SETENV`, so UI-triggered updates can pass the current `PYTHONPATH` to sudo and do not depend on `PATH`. The command is idempotent and refreshes the socket directory, sudoers file, systemd unit, and service state after package upgrades.
 
 Repository scanning uses `CYCLO_HOST_AGENT_WORKSPACE` when set. Otherwise it uses the service user's home directory, except root-only devices with `/data/docker`, where `/data/docker` is used automatically.
 

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/cyclo_host_agent/routers/update.py

@@ -19,13 +19,10 @@
 """System-level endpoints for the host agent."""
 
 import asyncio
-import logging
 import sys
 
 from fastapi import APIRouter, HTTPException, status
 
-logger = logging.getLogger(__name__)
-
 router = APIRouter(prefix='/system', tags=['system'])
 
 _update_status: dict = {'phase': 'idle', 'output': '', 'error': ''}
@@ -57,7 +54,7 @@ async def _run_update() -> None:
 
 @router.post('/update')
 async def start_update() -> dict:
-    """Delegate update to cyclo_manager update, which handles containers and host agent restart."""
+    """Run cyclo_manager update in the background."""
     global _update_status
 
     if _update_status.get('phase') == 'updating':

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 1.0.0.dev5
+Version: 1.0.0.dev7
 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
@@ -120,16 +120,16 @@ The pip package installs a small **FastAPI** server that listens on a **Unix dom
 |------|------|
 | Socket | `/var/run/robotis/agent_sockets/host/host_agent.sock` |
 | systemd unit | `cyclo_host_agent.service` |
-| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; skipped on root-only devices) |
+| sudoers | `/etc/sudoers.d/cyclo_manager` (`cp`, `udevadm` for container setup scripts; `refresh-host-agent` CLI subcommand for UI updates; skipped on root-only devices) |
 
 The API container reaches it at `/agents/host/host_agent.sock` (see bundled `config.yml`).
 
 **Responsibilities:**
 
 - List and update **`~/ROBOTIS-GIT/*`** git repositories (Version Management in the UI)
-- Run **`cyclo_manager update`** when triggered from the UI (`POST /host/update`)
+- Run Cyclo Manager package updates from the UI by delegating to `cyclo_manager update`
 
-`cyclo_manager up` and `cyclo_manager update` both call `_ensure_host_agent()`, which is idempotent — safe to run after upgrades or user changes.
+`cyclo_manager up` installs the `refresh-host-agent` CLI subcommand into sudoers. It is registered as `sys.executable -m cyclo_manager_cli.cli refresh-host-agent` with `SETENV`, so UI-triggered updates can pass the current `PYTHONPATH` to sudo and do not depend on `PATH`. The command is idempotent and refreshes the socket directory, sudoers file, systemd unit, and service state after package upgrades.
 
 Repository scanning uses `CYCLO_HOST_AGENT_WORKSPACE` when set. Otherwise it uses the service user's home directory, except root-only devices with `/data/docker`, where `/data/docker` is used automatically.
 

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/cyclo_manager_cli/cli.py

@@ -160,14 +160,23 @@ def _install_sudoers(user: str) -> bool:
     """
     Write sudoers rules for cyclo_manager.
 
-    Grant NOPASSWD for udev operations needed by container.sh
-    (cp to /etc/udev/rules.d/, udevadm control/trigger).
+    Grant NOPASSWD for udev operations and the root-only host-agent refresh command.
     """
-    print('  Installing sudoers rules (cp, udevadm)...')
+    if not sys.executable:
+        print(
+            'Python executable is unknown. '
+            'Run `pip install cyclo-manager` and retry.',
+            file=sys.stderr,
+        )
+        return False
+
+    print('  Installing sudoers rules (cp, udevadm, host-agent refresh command)...')
     sudoers_content = (
         f'{user} ALL=(ALL) NOPASSWD: /usr/bin/cp, '
         f'/usr/bin/udevadm control --reload-rules, '
-        f'/usr/bin/udevadm trigger\n'
+        f'/usr/bin/udevadm trigger, '
+        'SETENV: '
+        f'{sys.executable} -m cyclo_manager_cli.cli refresh-host-agent\n'
     )
     sudoers_file = '/etc/sudoers.d/cyclo_manager'
     try:
@@ -188,7 +197,7 @@ def _install_sudoers(user: str) -> bool:
         return False
 
 
-def _ensure_host_agent() -> int:
+def _ensure_host_agent(restart_no_block: bool = False) -> int:
     """
     Install or refresh cyclo_host_agent: systemd unit, socket dir, and service start.
 
@@ -261,8 +270,11 @@ WantedBy=multi-user.target
             capture_output=True,
         )
         print(f'  Starting {HOST_AGENT_SERVICE}...')
+        restart_cmd = ['systemctl', 'restart', f'{HOST_AGENT_SERVICE}.service']
+        if restart_no_block:
+            restart_cmd.insert(1, '--no-block')
         subprocess.run(
-            _sudo_cmd(['systemctl', 'restart', f'{HOST_AGENT_SERVICE}.service']),
+            _sudo_cmd(restart_cmd),
             check=True,
             capture_output=True,
         )
@@ -276,6 +288,47 @@ WantedBy=multi-user.target
         return 1
 
 
+def _refresh_host_agent_after_update() -> int:
+    """Refresh host agent with the sudoers-registered cyclo_manager command when possible."""
+    if os.geteuid() == 0:
+        return _ensure_host_agent(restart_no_block=True)
+    if not sys.executable:
+        print(
+            'Python executable is unknown; falling back to setup.',
+            file=sys.stderr,
+        )
+        return _ensure_host_agent() if sys.stdin.isatty() else 1
+
+    refresh_command = [sys.executable, '-m', 'cyclo_manager_cli.cli', 'refresh-host-agent']
+    print(f'Refreshing host agent with sudo command: {" ".join(refresh_command)}')
+    pythonpath = os.pathsep.join(dict.fromkeys(path for path in sys.path if path))
+    try:
+        subprocess.run(['sudo', '-n', f'PYTHONPATH={pythonpath}', *refresh_command], check=True)
+        return 0
+    except subprocess.CalledProcessError as e:
+        if sys.stdin.isatty():
+            print(
+                'Warning: sudo refresh command failed; falling back to interactive setup.',
+                file=sys.stderr,
+            )
+            return _ensure_host_agent()
+        print(f'Host-agent refresh command failed: {e}', file=sys.stderr)
+        return e.returncode
+    except FileNotFoundError:
+        if sys.stdin.isatty():
+            return _ensure_host_agent()
+        print('sudo not found; cannot refresh host agent service.', file=sys.stderr)
+        return 1
+
+
+def cmd_refresh_host_agent(args: argparse.Namespace) -> int:
+    """Refresh the host agent from sudoers after a package update."""
+    if os.geteuid() != 0:
+        print('cyclo_manager refresh-host-agent must run as root.', file=sys.stderr)
+        return 1
+    return _ensure_host_agent(restart_no_block=True)
+
+
 def cmd_up(args: argparse.Namespace) -> int:
     """Start API + UI; create zenoh and noVNC containers without starting them."""
     print('--- cyclo_manager up ---')
@@ -445,7 +498,7 @@ def cmd_update(args: argparse.Namespace) -> int:
         return e.returncode
 
     print('Refreshing host agent (unit, socket, sudoers)...')
-    if _ensure_host_agent() != 0:
+    if _refresh_host_agent_after_update() != 0:
         print('Warning: Failed to refresh host agent service.', file=sys.stderr)
         return 1
 
@@ -486,6 +539,12 @@ def main() -> int:
     )
     update_parser.set_defaults(func=cmd_update)
 
+    refresh_parser = sub.add_parser(
+        'refresh-host-agent',
+        help='Refresh cyclo_host_agent service after package update',
+    )
+    refresh_parser.set_defaults(func=cmd_refresh_host_agent)
+
     args = parser.parse_args()
     if not args.command:
         parser.print_help()

{cyclo_manager-1.0.0.dev5 → cyclo_manager-1.0.0.dev7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cyclo-manager"
-version = "1.0.0.dev5"
+version = "1.0.0.dev7"
 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"