cyclo-manager 0.2.0.dev12__tar.gz → 0.2.1__tar.gz

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev12
+Version: 0.2.1
 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
@@ -67,12 +67,6 @@ From **PyPI**:
 pip install cyclo-manager
 ```
 
-Pre-release versions:
-
-```bash
-pip install --pre cyclo-manager==0.2.0.dev0
-```
-
 If `cyclo_manager` is not on `PATH`, add the user script directory:
 
 ```bash
@@ -96,7 +90,8 @@ 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 up` + create optional services, then **refresh host agent** (unit, socket, sudoers). Optional `--pull` pulls images before the final `up`. |
+| `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 --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 **`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`.
@@ -144,8 +139,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image (example) |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.0` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.0` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.1` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.1` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 
@@ -177,7 +172,7 @@ robot_container: ai_worker
 
 sockets:
   ai_worker: "/agents/ai_worker/s6_agent.sock"
-  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  cyclo_intelligence: "/agents/cyclo_intelligence/s6_agent.sock"
   host_agent: "/agents/host/host_agent.sock"
 ```
 
@@ -198,7 +193,7 @@ On the host, sockets typically live under:
 ```text
 /var/run/robotis/agent_sockets/
 ├── ai_worker/s6_agent.sock
-├── physical_ai_server/s6_agent.sock
+├── cyclo_intelligence/s6_agent.sock
 └── host/host_agent.sock          ← created by cyclo_manager up
 ```
 

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/README.md

@@ -53,12 +53,6 @@ From **PyPI**:
 pip install cyclo-manager
 ```
 
-Pre-release versions:
-
-```bash
-pip install --pre cyclo-manager==0.2.0.dev0
-```
-
 If `cyclo_manager` is not on `PATH`, add the user script directory:
 
 ```bash
@@ -82,7 +76,8 @@ 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 up` + create optional services, then **refresh host agent** (unit, socket, sudoers). Optional `--pull` pulls images before the final `up`. |
+| `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 --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 **`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`.
@@ -130,8 +125,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image (example) |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.0` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.0` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.1` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.1` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 
@@ -163,7 +158,7 @@ robot_container: ai_worker
 
 sockets:
   ai_worker: "/agents/ai_worker/s6_agent.sock"
-  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  cyclo_intelligence: "/agents/cyclo_intelligence/s6_agent.sock"
   host_agent: "/agents/host/host_agent.sock"
 ```
 
@@ -184,7 +179,7 @@ On the host, sockets typically live under:
 ```text
 /var/run/robotis/agent_sockets/
 ├── ai_worker/s6_agent.sock
-├── physical_ai_server/s6_agent.sock
+├── cyclo_intelligence/s6_agent.sock
 └── host/host_agent.sock          ← created by cyclo_manager up
 ```
 

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_host_agent/main.py

@@ -21,10 +21,10 @@
 import logging
 from pathlib import Path
 
-import uvicorn
-from fastapi import FastAPI
-
 from cyclo_host_agent.routers import repos, update
+from cyclo_manager_cli import __version__
+from fastapi import FastAPI
+import uvicorn
 
 logging.basicConfig(
     level=logging.INFO,
@@ -37,7 +37,7 @@ SOCKET_PATH = '/var/run/robotis/agent_sockets/host/host_agent.sock'
 app = FastAPI(
     title='cyclo_host_agent',
     description='Host agent for Cyclo Manager: repo management.',
-    version='0.2.0',
+    version=__version__,
 )
 
 app.include_router(repos.router)

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_host_agent/models.py

@@ -71,6 +71,14 @@ class RepoStatusResponse(BaseModel):
     has_changes: bool
 
 
+class RepoBranchCheckResponse(BaseModel):
+    """Response for GET /repos/{name}/branch."""
+
+    name: str
+    branch: Optional[str] = None
+    allowed: bool
+
+
 class UpdateRequest(BaseModel):
     """Request body for POST /repos/{name}/update."""
 

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_host_agent/routers/repos.py

@@ -20,23 +20,23 @@
 
 import asyncio
 import os
-import re
 from pathlib import Path
+import re
 from typing import Optional
 
-from fastapi import APIRouter, HTTPException, status
-
 from cyclo_host_agent.models import (
     ContainerScriptResponse,
     FileChange,
+    RepoBranchCheckResponse,
     RepoInfo,
     RepoListResponse,
     RepoStatusResponse,
-    RepoUpdateStatus,
     RepoUpdatesResponse,
+    RepoUpdateStatus,
     UpdateRequest,
     UpdateResponse,
 )
+from fastapi import APIRouter, HTTPException, status
 
 router = APIRouter(prefix='/repos', tags=['repos'])
 
@@ -109,12 +109,12 @@ async def _ensure_allowed_branch(repo_path: Path) -> None:
     allowed = ', '.join(sorted(ALLOWED_UPDATE_BRANCHES))
     if branch:
         detail = (
-            f"Updates are only allowed on branches: {allowed}. "
+            f'Updates are only allowed on branches: {allowed}. '
             f"Current branch is '{branch}'."
         )
     else:
         detail = (
-            f"Updates are only allowed on branches: {allowed}. "
+            f'Updates are only allowed on branches: {allowed}. '
             'Could not determine the current branch (detached HEAD?).'
         )
     raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=detail)
@@ -221,7 +221,12 @@ async def _repo_update_status(repo_path: Path) -> Optional[RepoUpdateStatus]:
 
     latest = await _fetch_latest_tag(remote_url)
     if not latest:
-        return RepoUpdateStatus(name=repo_path.name, branch=branch, current_version=current, has_update=False)
+        return RepoUpdateStatus(
+            name=repo_path.name,
+            branch=branch,
+            current_version=current,
+            has_update=False,
+        )
 
     return RepoUpdateStatus(
         name=repo_path.name,
@@ -356,6 +361,17 @@ async def list_repos() -> RepoListResponse:
     return RepoListResponse(repos=repos, workspace_path=str(WORKSPACE_PATH))
 
 
+@router.get('/{name}/branch', response_model=RepoBranchCheckResponse)
+async def get_repo_branch(name: str) -> RepoBranchCheckResponse:
+    repo_path = _get_repo(name)
+    branch = await _current_branch(repo_path)
+    return RepoBranchCheckResponse(
+        name=name,
+        branch=branch,
+        allowed=branch in ALLOWED_UPDATE_BRANCHES,
+    )
+
+
 @router.get('/{name}/status', response_model=RepoStatusResponse)
 async def get_repo_status(name: str) -> RepoStatusResponse:
     repo_path = _get_repo(name)

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_host_agent/routers/update.py

@@ -62,6 +62,10 @@ async def start_update() -> dict:
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
                             detail='cyclo_manager command not found')
 
+    if _update_status.get('phase') == 'updating':
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT,
+                            detail='Update already in progress')
+
     _update_status = {'phase': 'updating', 'output': '', 'error': ''}
     asyncio.create_task(_run_update(cyclo_exe))
     return {'status': 'update started'}
@@ -71,5 +75,3 @@ async def start_update() -> dict:
 async def get_update_status() -> dict:
     """Return the current update phase and stored outputs."""
     return _update_status
-
-

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev12
+Version: 0.2.1
 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
@@ -67,12 +67,6 @@ From **PyPI**:
 pip install cyclo-manager
 ```
 
-Pre-release versions:
-
-```bash
-pip install --pre cyclo-manager==0.2.0.dev0
-```
-
 If `cyclo_manager` is not on `PATH`, add the user script directory:
 
 ```bash
@@ -96,7 +90,8 @@ 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 up` + create optional services, then **refresh host agent** (unit, socket, sudoers). Optional `--pull` pulls images before the final `up`. |
+| `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 --no-pull` | Same as `update`, but skip image pull (use locally cached images). |
 | `cyclo_manager --help` | Subcommand overview |
 
 **`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`.
@@ -144,8 +139,8 @@ Defined in [`cyclo_manager_cli/docker/docker-compose.yml`](cyclo_manager_cli/doc
 
 | Compose service | Container name | `cyclo_manager up` | Image (example) |
 |-----------------|----------------|--------------------|-----------------|
-| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.0` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.0` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:0.2.1` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:0.2.1` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 
@@ -177,7 +172,7 @@ robot_container: ai_worker
 
 sockets:
   ai_worker: "/agents/ai_worker/s6_agent.sock"
-  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  cyclo_intelligence: "/agents/cyclo_intelligence/s6_agent.sock"
   host_agent: "/agents/host/host_agent.sock"
 ```
 
@@ -198,7 +193,7 @@ On the host, sockets typically live under:
 ```text
 /var/run/robotis/agent_sockets/
 ├── ai_worker/s6_agent.sock
-├── physical_ai_server/s6_agent.sock
+├── cyclo_intelligence/s6_agent.sock
 └── host/host_agent.sock          ← created by cyclo_manager up
 ```
 

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_manager_cli/__init__.py

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

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_manager_cli/cli.py

@@ -95,7 +95,7 @@ def _setup_socket_dir(user: str) -> bool:
             check=True,
             capture_output=True,
         )
-        print(f'  [3/3] Removing stale socket file (if any)...')
+        print('  [3/3] Removing stale socket file (if any)...')
         subprocess.run(
             ['sudo', 'rm', '-f', HOST_AGENT_SOCKET],
             check=True,
@@ -109,8 +109,10 @@ def _setup_socket_dir(user: str) -> bool:
 
 def _install_sudoers(user: str) -> bool:
     """
-    Write /etc/sudoers.d/cyclo_manager granting NOPASSWD for udev operations
-    needed by container.sh (cp to /etc/udev/rules.d/, udevadm control/trigger).
+    Write sudoers rules for cyclo_manager.
+
+    Grant NOPASSWD for udev operations needed by container.sh
+    (cp to /etc/udev/rules.d/, udevadm control/trigger).
     """
     print('  Installing sudoers rules (cp, udevadm)...')
     sudoers_content = (
@@ -272,7 +274,10 @@ def _teardown_host_agent() -> None:
     steps = [
         (['sudo', 'systemctl', 'stop', f'{HOST_AGENT_SERVICE}.service'], 'stop service'),
         (['sudo', 'systemctl', 'disable', f'{HOST_AGENT_SERVICE}.service'], 'disable service'),
-        (['sudo', 'rm', '-f', f'/etc/systemd/system/{HOST_AGENT_SERVICE}.service'], 'remove unit file'),
+        (
+            ['sudo', 'rm', '-f', f'/etc/systemd/system/{HOST_AGENT_SERVICE}.service'],
+            'remove unit file',
+        ),
         (['sudo', 'systemctl', 'daemon-reload'], 'daemon-reload'),
         (['sudo', 'rm', '-f', '/etc/sudoers.d/cyclo_manager'], 'remove sudoers'),
         (['sudo', 'rm', '-rf', HOST_AGENT_SOCKET_DIR], 'remove socket dir'),
@@ -356,10 +361,19 @@ def cmd_update(args: argparse.Namespace) -> int:
         print('pip install timed out.', 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,
+            )
+
     print('Starting containers...')
     try:
-        if getattr(args, 'pull', False):
-            subprocess.run([*base, 'pull'], env=env, check=True)
         subprocess.run([*base, 'up', '-d', *COMPOSE_SERVICES_UP], env=env, check=True)
         subprocess.run(
             [*base, 'create', '--no-recreate', *COMPOSE_SERVICES_CREATE_ONLY],
@@ -370,7 +384,9 @@ def cmd_update(args: argparse.Namespace) -> int:
         return e.returncode
 
     print('Refreshing host agent (unit, socket, sudoers)...')
-    _ensure_host_agent()
+    if _ensure_host_agent() != 0:
+        print('Warning: Failed to refresh host agent service.', file=sys.stderr)
+        return 1
 
     print('cyclo_manager update completed.')
     return 0
@@ -400,12 +416,12 @@ def main() -> int:
 
     update_parser = sub.add_parser(
         'update',
-        help='Down containers, pip install -U cyclo-manager, then up again',
+        help='Down containers, pip install -U cyclo-manager, pull images, then up again',
     )
     update_parser.add_argument(
-        '--pull',
+        '--no-pull',
         action='store_true',
-        help='Always pull images when running cyclo_manager up',
+        help='Skip docker compose pull before starting containers (use cached images only)',
     )
     update_parser.set_defaults(func=cmd_update)
 

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_manager_cli/config/config.yml

@@ -4,5 +4,5 @@ robot_container: ai_worker
 
 sockets:
   ai_worker: "/agents/ai_worker/s6_agent.sock"
-  physical_ai_server: "/agents/physical_ai_server/s6_agent.sock"
+  cyclo_intelligence: "/agents/cyclo_intelligence/s6_agent.sock"
   host_agent: "/agents/host/host_agent.sock"

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/cyclo_manager_cli/docker/docker-compose.yml

@@ -11,7 +11,7 @@ services:
 
   cyclo_manager:
     container_name: cyclo_manager
-    image: robotis/cyclo-manager:0.2.0
+    image: robotis/cyclo-manager:0.2.1
     restart: always
     network_mode: host
     volumes:
@@ -27,7 +27,7 @@ services:
 
   ui:
     container_name: cyclo_manager_ui
-    image: robotis/cyclo-manager-ui:0.2.0
+    image: robotis/cyclo-manager-ui:0.2.1
     restart: always
     network_mode: host
     environment:

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/pyproject.toml

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

{cyclo_manager-0.2.0.dev12 → cyclo_manager-0.2.1}/setup.cfg

@@ -1,6 +1,5 @@
 [metadata]
 name = cyclo-manager
-version = 0.2.0
 
 [egg_info]
 egg_base = .