cyclo-manager 0.2.0.dev0__tar.gz → 0.2.0.dev2__tar.gz

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev0
+Version: 0.2.0.dev2
 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

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/cyclo_host_agent/routers/repos.py

@@ -22,6 +22,7 @@ import asyncio
 import json
 import os
 import re
+import subprocess
 import urllib.request
 from pathlib import Path
 from typing import Optional
@@ -86,20 +87,23 @@ def _fmt_cmd(cmd: str, output: str) -> str:
 
 # ── git helpers ────────────────────────────────────────────────────────────────
 
-async def _git(args: list[str], cwd: Optional[Path] = None) -> tuple[int, str, str]:
-    proc = await asyncio.create_subprocess_exec(
-        'git', *args,
-        cwd=str(cwd) if cwd else None,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.PIPE,
-    )
+def _git_sync(args: list[str], cwd: Optional[Path] = None) -> tuple[int, str, str]:
     try:
-        stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=GIT_TIMEOUT)
-    except asyncio.TimeoutError:
-        proc.kill()
-        await proc.wait()
-        raise
-    return proc.returncode, stdout.decode(), stderr.decode()
+        result = subprocess.run(
+            ['git', *args],
+            cwd=str(cwd) if cwd else None,
+            capture_output=True,
+            timeout=GIT_TIMEOUT,
+        )
+        return result.returncode, result.stdout.decode(), result.stderr.decode()
+    except subprocess.TimeoutExpired:
+        return 1, '', 'git timed out'
+    except Exception as e:
+        return 1, '', str(e)
+
+
+async def _git(args: list[str], cwd: Optional[Path] = None) -> tuple[int, str, str]:
+    return await asyncio.to_thread(_git_sync, args, cwd)
 
 
 async def _repo_info(repo_path: Path) -> RepoInfo:
@@ -279,24 +283,25 @@ async def _update_reset(repo_path: Path, preserve_files: list[str]) -> UpdateRes
 
 # ── container helper ───────────────────────────────────────────────────────────
 
-async def _run_container_sh(repo_path: Path, action: str) -> tuple[bool, str]:
+def _run_container_sh_sync(repo_path: Path, action: str) -> tuple[bool, str]:
     script = repo_path / 'docker' / 'container.sh'
     if not script.exists():
         return False, f'container.sh not found at {script}'
-    proc = await asyncio.create_subprocess_exec(
-        'bash', str(script), action,
-        cwd=str(repo_path / 'docker'),
-        stdin=asyncio.subprocess.PIPE,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.PIPE,
-    )
     try:
-        stdout, stderr = await asyncio.wait_for(proc.communicate(input=b'y\n'), timeout=300.0)
-    except asyncio.TimeoutError:
-        proc.kill()
-        await proc.wait()
+        result = subprocess.run(
+            ['bash', str(script), action],
+            cwd=str(repo_path / 'docker'),
+            input=b'y\n',
+            capture_output=True,
+            timeout=300.0,
+        )
+        return result.returncode == 0, (result.stdout.decode() + result.stderr.decode()).strip()
+    except subprocess.TimeoutExpired:
         return False, 'Timeout waiting for container.sh'
-    return proc.returncode == 0, (stdout.decode() + stderr.decode()).strip()
+
+
+async def _run_container_sh(repo_path: Path, action: str) -> tuple[bool, str]:
+    return await asyncio.to_thread(_run_container_sh_sync, repo_path, action)
 
 
 # ── endpoints ──────────────────────────────────────────────────────────────────

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/cyclo_host_agent/routers/update.py

@@ -42,16 +42,15 @@ def _fmt(cmd: str, out: str) -> str:
     return f'$ {cmd}\n{out.strip()}' if out.strip() else f'$ {cmd}'
 
 
-def _restart_self() -> None:
-    """Restart the host agent after a short delay so new binary takes effect."""
-    time.sleep(2)
+
+def _run_cmd(args: list[str], timeout: float) -> tuple[int, str]:
     try:
-        subprocess.run(
-            ['sudo', 'systemctl', 'restart', f'{HOST_AGENT_SERVICE}.service'],
-            check=True,
-        )
+        result = subprocess.run(args, capture_output=True, timeout=timeout)
+        return result.returncode, (result.stdout.decode() + result.stderr.decode()).strip()
+    except subprocess.TimeoutExpired:
+        return 1, 'timed out'
     except Exception as e:
-        logger.error('Failed to restart host agent: %s', e)
+        return 1, str(e)
 
 
 async def _run_install_and_up(cyclo_exe: str, pip_exe: str) -> None:
@@ -60,50 +59,24 @@ async def _run_install_and_up(cyclo_exe: str, pip_exe: str) -> None:
 
     # pip install -U
     _update_status['phase'] = 'installing'
-    try:
-        proc = await asyncio.create_subprocess_exec(
-            pip_exe, 'install', '-U', PYPI_PACKAGE,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=120)
-        out = (stdout.decode() + stderr.decode()).strip()
-        _update_status['install_output'] = _fmt(f'pip install -U {PYPI_PACKAGE}', out)
-        if proc.returncode != 0:
-            _update_status['phase'] = 'error'
-            _update_status['error'] = f'pip install failed (exit {proc.returncode})'
-            return
-    except asyncio.TimeoutError:
+    rc, out = await asyncio.to_thread(_run_cmd, [pip_exe, 'install', '-U', PYPI_PACKAGE], 120)
+    _update_status['install_output'] = _fmt(f'pip install -U {PYPI_PACKAGE}', out)
+    if rc != 0:
         _update_status['phase'] = 'error'
-        _update_status['error'] = 'pip install timed out'
+        _update_status['error'] = f'pip install failed (exit {rc})'
         return
 
     # cyclo up
     _update_status['phase'] = 'starting'
-    try:
-        proc = await asyncio.create_subprocess_exec(
-            cyclo_exe, 'up',
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=300)
-        out = (stdout.decode() + stderr.decode()).strip()
-        _update_status['up_output'] = _fmt('cyclo_manager up', out)
-        if proc.returncode != 0:
-            _update_status['phase'] = 'error'
-            _update_status['error'] = f'cyclo_manager up failed (exit {proc.returncode})'
-            return
-    except asyncio.TimeoutError:
+    rc, out = await asyncio.to_thread(_run_cmd, [cyclo_exe, 'up'], 300)
+    _update_status['up_output'] = _fmt('cyclo_manager up', out)
+    if rc != 0:
         _update_status['phase'] = 'error'
-        _update_status['error'] = 'cyclo_manager up timed out'
+        _update_status['error'] = f'cyclo_manager up failed (exit {rc})'
         return
 
     _update_status['phase'] = 'done'
 
-    # Restart self so new binary takes effect
-    loop = asyncio.get_event_loop()
-    await loop.run_in_executor(None, _restart_self)
-
 
 @router.post('/update')
 async def start_update() -> dict:
@@ -127,20 +100,9 @@ async def start_update() -> dict:
 
     _update_status = {'phase': 'stopping', 'install_output': '', 'up_output': '', 'error': ''}
 
-    # cyclo down (synchronous — server goes down here)
-    down_output = ''
-    try:
-        proc = await asyncio.create_subprocess_exec(
-            cyclo_exe, 'down',
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        stdout, stderr = await asyncio.wait_for(proc.communicate(), timeout=30)
-        down_output = _fmt('cyclo_manager down', (stdout.decode() + stderr.decode()))
-    except asyncio.TimeoutError:
-        down_output = '$ cyclo_manager down\n(timed out)'
-    except Exception as e:
-        down_output = f'$ cyclo_manager down\n(error: {e})'
+    # cyclo down
+    rc, out = await asyncio.to_thread(_run_cmd, [cyclo_exe, 'down'], 30)
+    down_output = _fmt('cyclo_manager down', out)
 
     # Continue install + up in background
     asyncio.create_task(_run_install_and_up(cyclo_exe, pip_exe))

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.2.0.dev0
+Version: 0.2.0.dev2
 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

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/cyclo_manager_cli/cli.py

@@ -80,7 +80,8 @@ def _create_host_agent() -> int:
         )
         return 1
 
-    user_home = Path.home()
+    current_user = os.environ.get('SUDO_USER') or os.environ.get('USER') or os.getlogin()
+    user_home = Path(f'/home/{current_user}') if current_user else Path.home()
     service_content = f"""\
 [Unit]
 Description=Cyclo Host Agent
@@ -88,6 +89,7 @@ After=network.target
 
 [Service]
 Type=simple
+User={current_user}
 ExecStart={agent_exe}
 Environment=HOME={user_home}
 Restart=always
@@ -121,7 +123,12 @@ WantedBy=multi-user.target
 
 def cmd_up(args: argparse.Namespace) -> int:
     """Start API + UI; create zenoh and noVNC containers without starting them."""
-    if not _check_host_agent():
+    if _check_host_agent():
+        try:
+            subprocess.run(['sudo', 'systemctl', 'restart', f'{HOST_AGENT_SERVICE}.service'], check=True)
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            print('Warning: Failed to restart host agent service.', file=sys.stderr)
+    else:
         if _create_host_agent() != 0:
             print('Warning: Failed to install host agent service.')
 
@@ -230,6 +237,15 @@ def cmd_update(args: argparse.Namespace) -> int:
     except subprocess.CalledProcessError as e:
         return e.returncode
 
+    print('Restarting host agent...')
+    try:
+        subprocess.run(
+            ['sudo', 'systemctl', 'restart', f'{HOST_AGENT_SERVICE}.service'],
+            check=True,
+        )
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        print('Warning: Failed to restart host agent service.', file=sys.stderr)
+
     print('cyclo_manager update completed.')
     return 0
 

{cyclo_manager-0.2.0.dev0 → cyclo_manager-0.2.0.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cyclo-manager"
-version = "0.2.0.dev0"
+version = "0.2.0.dev2"
 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.dev0 → cyclo_manager-0.2.0.dev2}/setup.cfg

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