cyclo-manager 1.1.0.dev1__tar.gz → 1.1.0.dev3__tar.gz

{cyclo_manager-1.1.0.dev1 → cyclo_manager-1.1.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 1.1.0.dev1
+Version: 1.1.0.dev3
 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
@@ -137,7 +137,7 @@ The API container reaches it at `/agents/host/host_agent.sock` (see bundled `con
 
 `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. Only repositories whose `origin` remote belongs to `ROBOTIS-GIT` are returned by the repo list/update endpoints.
+Repository scanning and the Files UI use `CYCLO_HOST_AGENT_WORKSPACE` when set. Otherwise they use the service user's home directory, except root-only devices with `/data/docker`, where `/data/docker` is used automatically. Only repositories whose `origin` remote belongs to `ROBOTIS-GIT` are returned by the repo list/update endpoints.
 
 ---
 
@@ -147,8 +147,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:1.0.0` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.0.0` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.0.1` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.0.1` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 
@@ -217,8 +217,7 @@ So `/agents/ai_worker/s6_agent.sock` in config corresponds to the host path abov
 | Variable | Set by | Purpose |
 |----------|--------|---------|
 | **`CYCLO_MANAGER_CONFIG_FILE`** | CLI (`up`, `down`, `update`) | Absolute path to bundled `config.yml` on the host; mounted into the API container |
-| **`CYCLO_HOST_AGENT_WORKSPACE`** | User or CLI-generated systemd unit | Workspace scanned by `cyclo_host_agent` for managed git repositories |
-| **`CYCLO_HOST_AGENT_FILE_ROOT`** | User (optional) | Root directory for the Files UI/API. Defaults to the host agent service user's home (`$HOME`, e.g. `/root` when running as root) |
+| **`CYCLO_HOST_AGENT_WORKSPACE`** | User or CLI-generated systemd unit | Workspace scanned by `cyclo_host_agent` for managed git repositories and used as the Files UI/API root |
 | **`HOSTNAME`** | CLI (default: machine hostname) | Passed to API as `HOST_HOSTNAME` |
 | **`CONFIG_FILE`** | Compose (`/app/config.yml`) | Path inside the API container |
 | **`ROS_DOMAIN_ID`** | **Not** set by CLI | Set inside robot containers (e.g. `~/.bashrc`) so DDS matches your fleet |

{cyclo_manager-1.1.0.dev1 → cyclo_manager-1.1.0.dev3}/README.md

@@ -123,7 +123,7 @@ The API container reaches it at `/agents/host/host_agent.sock` (see bundled `con
 
 `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. Only repositories whose `origin` remote belongs to `ROBOTIS-GIT` are returned by the repo list/update endpoints.
+Repository scanning and the Files UI use `CYCLO_HOST_AGENT_WORKSPACE` when set. Otherwise they use the service user's home directory, except root-only devices with `/data/docker`, where `/data/docker` is used automatically. Only repositories whose `origin` remote belongs to `ROBOTIS-GIT` are returned by the repo list/update endpoints.
 
 ---
 
@@ -133,8 +133,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:1.0.0` |
-| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.0.0` |
+| `cyclo_manager` | `cyclo_manager` | **Started** | `robotis/cyclo-manager:1.0.1` |
+| `ui` | `cyclo_manager_ui` | **Started** | `robotis/cyclo-manager-ui:1.0.1` |
 | `rmw_zenoh` | `zenoh_daemon` | **Created only** | `robotis/zenoh-daemon:latest` |
 | `novnc-server` | `novnc-server` | **Created only** | `robotis/novnc-server:latest` |
 
@@ -203,8 +203,7 @@ So `/agents/ai_worker/s6_agent.sock` in config corresponds to the host path abov
 | Variable | Set by | Purpose |
 |----------|--------|---------|
 | **`CYCLO_MANAGER_CONFIG_FILE`** | CLI (`up`, `down`, `update`) | Absolute path to bundled `config.yml` on the host; mounted into the API container |
-| **`CYCLO_HOST_AGENT_WORKSPACE`** | User or CLI-generated systemd unit | Workspace scanned by `cyclo_host_agent` for managed git repositories |
-| **`CYCLO_HOST_AGENT_FILE_ROOT`** | User (optional) | Root directory for the Files UI/API. Defaults to the host agent service user's home (`$HOME`, e.g. `/root` when running as root) |
+| **`CYCLO_HOST_AGENT_WORKSPACE`** | User or CLI-generated systemd unit | Workspace scanned by `cyclo_host_agent` for managed git repositories and used as the Files UI/API root |
 | **`HOSTNAME`** | CLI (default: machine hostname) | Passed to API as `HOST_HOSTNAME` |
 | **`CONFIG_FILE`** | Compose (`/app/config.yml`) | Path inside the API container |
 | **`ROS_DOMAIN_ID`** | **Not** set by CLI | Set inside robot containers (e.g. `~/.bashrc`) so DDS matches your fleet |

cyclo_manager-1.1.0.dev3/cyclo_host_agent/cpu_usage.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+#
+# Copyright 2026 ROBOTIS CO., LTD.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author: Hyungyu Kim
+
+"""Continuous host CPU sampling, independent of HTTP requests."""
+
+from collections import deque
+import logging
+import threading
+
+import psutil
+
+logger = logging.getLogger(__name__)
+
+CPU_SAMPLE_INTERVAL_SECONDS = 1.0
+CPU_AVERAGE_SAMPLES = 3
+
+
+class CpuUsageSampler:
+    """Keep the mean of the latest three consecutive one-second CPU samples."""
+
+    def __init__(self, interval: float = CPU_SAMPLE_INTERVAL_SECONDS) -> None:
+        """Initialize the sampler without starting a background thread."""
+        self._interval = interval
+        self._samples: deque[float] = deque(maxlen=CPU_AVERAGE_SAMPLES)
+        self._lock = threading.Lock()
+        self._stop = threading.Event()
+        self._thread: threading.Thread | None = None
+
+    def start(self) -> None:
+        """Start one sampling thread and discard samples from any previous run."""
+        if self._thread is not None and self._thread.is_alive():
+            return
+        with self._lock:
+            self._samples.clear()
+        self._stop.clear()
+        self._thread = threading.Thread(
+            target=self._run, name='host-cpu-sampler', daemon=True,
+        )
+        self._thread.start()
+
+    def stop(self) -> None:
+        """Wake and join the sampler on application shutdown."""
+        self._stop.set()
+        if self._thread is not None:
+            self._thread.join()
+            self._thread = None
+
+    def average(self) -> float | None:
+        """Return a cached average, or None before the first complete interval."""
+        with self._lock:
+            if not self._samples:
+                return None
+            return round(sum(self._samples) / len(self._samples), 1)
+
+    def _run(self) -> None:
+        while not self._stop.is_set():
+            try:
+                # Prime and read on the same thread. The initial value is not a sample.
+                psutil.cpu_percent(interval=None)
+                while not self._stop.wait(self._interval):
+                    sample = psutil.cpu_percent(interval=None)
+                    with self._lock:
+                        self._samples.append(float(sample))
+            except Exception:
+                # Re-prime after a failure instead of mixing stale measurement intervals.
+                with self._lock:
+                    self._samples.clear()
+                logger.exception('Failed to sample host CPU usage')
+                self._stop.wait(self._interval)

{cyclo_manager-1.1.0.dev1 → cyclo_manager-1.1.0.dev3}/cyclo_host_agent/main.py

@@ -18,6 +18,8 @@
 
 """Cyclo host agent: FastAPI server on Unix Domain Socket for host-level operations."""
 
+import asyncio
+from contextlib import asynccontextmanager
 import logging
 from pathlib import Path
 
@@ -34,10 +36,22 @@ logger = logging.getLogger(__name__)
 
 SOCKET_PATH = '/var/run/robotis/agent_sockets/host/host_agent.sock'
 
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    """Run the shared CPU sampler for the lifetime of the host agent."""
+    system_stats.cpu_sampler.start()
+    try:
+        yield
+    finally:
+        await asyncio.to_thread(system_stats.cpu_sampler.stop)
+
+
 app = FastAPI(
     title='cyclo_host_agent',
     description='Host agent for Cyclo Manager: repo management.',
     version=__version__,
+    lifespan=lifespan,
 )
 
 app.include_router(repos.router)

{cyclo_manager-1.1.0.dev1 → cyclo_manager-1.1.0.dev3}/cyclo_host_agent/models.py

@@ -160,6 +160,7 @@ class FileTreeEntry(BaseModel):
     readonly: bool = False
     hidden: bool = False
     symlink: bool = False
+    git_status: str | None = None
 
 
 class FileTreeResponse(BaseModel):
@@ -170,6 +171,16 @@ class FileTreeResponse(BaseModel):
     entries: list[FileTreeEntry]
 
 
+class FileSearchResponse(BaseModel):
+    """Response for GET /files/search."""
+
+    root_path: str
+    path: str
+    query: str
+    entries: list[FileTreeEntry]
+    truncated: bool = False
+
+
 class FileReadResponse(BaseModel):
     """Response for GET /files/read."""
 
@@ -180,6 +191,15 @@ class FileReadResponse(BaseModel):
     readonly: bool = False
 
 
+class FileDiffResponse(BaseModel):
+    """Response for GET /files/diff."""
+
+    path: str
+    status: str
+    original_content: str
+    current_content: str
+
+
 class FileWriteRequest(BaseModel):
     """Request body for POST /files/write."""
 
@@ -203,6 +223,17 @@ class FileRenameRequest(BaseModel):
     new_name: str
 
 
+class FileUploadResponse(BaseModel):
+    """Response for POST /files/upload."""
+
+    name: str
+    path: str
+    size: int
+    overwritten: bool = False
+    success: bool
+    message: str
+
+
 class FileOperationResponse(BaseModel):
     """Generic file operation response."""