devops-bot-sdk 1.4.141__tar.gz → 1.4.145__tar.gz

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.141
+Version: 1.4.145
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/devops_bot_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.141
+Version: 1.4.145
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/devops_bot_sdk.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ sdk/models/snapshots.py
 sdk/ui/__init__.py
 sdk/ui/api.py
 sdk/ui/dashboard.py
+sdk/ui/health.py
 sdk/ui/ip_allowlist.py
 sdk/ui/jobs.py
 sdk/ui/models.py
@@ -87,4 +88,6 @@ sdk/ui/static/tickets.html
 tests/test_agent_chat_features.py
 tests/test_agent_prompt_models.py
 tests/test_agents_connectors_builder.py
-tests/test_git_action.py
+tests/test_git_action.py
+tests/test_health.py
+tests/test_updater_extras.py

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.4.141
+Version: 1.4.145
 
 Public surface:
   BackendClient.from_config()        — create client from ~/.agentos/config.toml
@@ -30,7 +30,7 @@ Rules:
   - All data egress through submit_webhook only
 """
 
-__version__ = "1.4.141"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
+__version__ = "1.4.145"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
 __author__  = "AgentOS"   # sdk.client.SDK_VERSION and the UI server version all read this.
 
 from sdk.client import BackendClient

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/sdk/client.py

@@ -1227,6 +1227,22 @@ class BackendClient:
         _check_status(resp.status_code, self._base_url)
         return resp.json().get("agents", [])
 
+    async def list_product_agents(self, product_id: str) -> dict:
+        """GET /api/v1/product/agents?product_id=… — a product's custom agents.
+
+        The backend resolves the product's VPS IP from ``product_id`` and proxies
+        to the product's ``/orchestrator/agents`` endpoint, returning the purified
+        ``{response, product_id}`` shape. Used by the product-mode agents page.
+        """
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            resp = await client.get(
+                self._url("/api/v1/product/agents"),
+                params={"product_id": product_id},
+                headers=self._headers,
+            )
+        _check_status(resp.status_code, self._base_url)
+        return resp.json()
+
     async def get_custom_agents(self) -> list[CustomAgent]:
         """GET /api/v1/agents → parsed :class:`CustomAgent` rows.
 

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/sdk/run_auto.py

@@ -572,10 +572,16 @@ def main() -> None:
             try:
                 from sdk.ui import service as ui_service
                 ok, msg = ui_service.restart()
+                if not ok:
+                    # No managed service yet (panel was started by hand) — install one
+                    # so the panel comes up now AND after every reboot/update, on Linux
+                    # (systemd), Windows (Scheduled Task) and macOS (launchd). This is
+                    # what removes the manual "install + up agentos-ui" step.
+                    ok, msg = ui_service.install()
                 print(f"  control panel: {msg}" if ok
-                      else f"  control panel: not reloaded — {msg}")
+                      else f"  control panel: not started — {msg}")
             except Exception as exc:  # noqa: BLE001 — never fail the update on this
-                print(f"  control panel: not reloaded ({exc})")
+                print(f"  control panel: not started ({exc})")
             pid = _daemon_running()
             if pid:
                 print("note: a background loop is running the OLD version — "

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/sdk/ui/api.py

@@ -94,6 +94,20 @@ async def status() -> dict:
     }
 
 
+@router.get("/health", dependencies=[_auth])
+async def health() -> dict:
+    """VPS health snapshot — live CPU/RAM/disk/uptime + auto-loop state + version.
+
+    The backend pings this (``GET /api/v1/vps/health`` → this endpoint) to report
+    on each VPS. Resource metrics need the ``[process]`` extra (psutil); without
+    it ``resources.available`` is False rather than an error. Token-gated + IP-
+    allowlisted like every other ``/api/ui/*`` route.
+    """
+    from sdk.ui.health import collect_health
+
+    return collect_health()
+
+
 # ── IP allowlist management ─────────────────────────────────────────────────
 # Whitelist a client IP for THIS SDK. A whitelisted IP passes the IP gate for
 # EVERY path (all /api/ui/* endpoints + the UI + /docs); data endpoints still
@@ -314,6 +328,24 @@ async def connectors() -> dict:
     }
 
 
+@router.get("/product-agents", dependencies=[_auth])
+async def product_agents(product_id: str = Query(...)) -> dict:
+    """A product's custom agents, for the product-mode agents page.
+
+    Given ``product_id``, the backend resolves the product's VPS IP (from
+    ``products_vps``) and proxies to the product's ``/orchestrator/agents``,
+    returning ``{response, product_id}`` (``response`` holds the agents). Product
+    mode is the either/or alternative to the custom+default page — never both.
+    Best-effort: on backend error returns ``{response: [], product_id, error}``.
+    """
+    from sdk.client import BackendClient
+
+    try:
+        return await BackendClient.from_config().list_product_agents(product_id)
+    except Exception as exc:  # noqa: BLE001 — degrade to empty, surface the reason
+        return {"response": [], "product_id": product_id, "error": str(exc)}
+
+
 @router.get("/agents", dependencies=[_auth])
 async def agents() -> dict:
     """The caller's custom agents (``relation_type=person``) from the backend.

devops_bot_sdk-1.4.145/sdk/ui/health.py

@@ -0,0 +1,80 @@
+"""VPS health snapshot for ``GET /api/ui/health``.
+
+Gathers live host metrics (CPU / RAM / disk / uptime) plus the auto-loop state and
+SDK version, so the backend can ping each VPS for reporting/monitoring. Resource
+metrics use ``psutil`` when available (the ``[process]`` extra) and degrade
+gracefully — ``resources.available=False`` — when it isn't, rather than erroring.
+"""
+from __future__ import annotations
+
+import platform
+import socket
+import time
+from datetime import datetime, timezone
+
+
+def _resources() -> dict:
+    """CPU/RAM/disk/uptime via psutil; ``{"available": False}`` when psutil absent."""
+    try:
+        import psutil
+    except Exception:  # noqa: BLE001 — psutil optional ([process] extra)
+        return {"available": False, "reason": "psutil not installed (pip install 'devops-bot-sdk[process]')"}
+
+    out: dict = {"available": True}
+    try:
+        out["cpu_percent"] = round(float(psutil.cpu_percent(interval=0.1)), 2)
+    except Exception:  # noqa: BLE001
+        out["cpu_percent"] = None
+    try:
+        vm = psutil.virtual_memory()
+        out["ram"] = {
+            "used_mb": round(vm.used / 1048576, 1),
+            "total_mb": round(vm.total / 1048576, 1),
+            "percent": round(float(vm.percent), 2),
+        }
+    except Exception:  # noqa: BLE001
+        out["ram"] = None
+    try:
+        du = psutil.disk_usage("/")
+        out["disk"] = {
+            "used_gb": round(du.used / 1073741824, 2),
+            "total_gb": round(du.total / 1073741824, 2),
+            "percent": round(float(du.percent), 2),
+        }
+    except Exception:  # noqa: BLE001
+        out["disk"] = None
+    try:
+        out["uptime_seconds"] = int(time.time() - psutil.boot_time())
+    except Exception:  # noqa: BLE001
+        out["uptime_seconds"] = None
+    return out
+
+
+def collect_health() -> dict:
+    """Full health snapshot: host, live resources, auto-loop state, SDK version."""
+    import sdk as _sdk
+
+    # Loop state — best-effort (never fail the health probe on it).
+    try:
+        from sdk.ui.runner import loop_state
+        loop = loop_state()
+    except Exception as exc:  # noqa: BLE001
+        loop = {"error": str(exc)}
+
+    try:
+        hostname = socket.gethostname()
+    except Exception:  # noqa: BLE001
+        hostname = ""
+
+    return {
+        "status": "ok",
+        "timestamp": datetime.now(timezone.utc).isoformat(),
+        "sdk_version": getattr(_sdk, "__version__", "0.0.0"),
+        "host": {
+            "hostname": hostname,
+            "os": platform.platform(),
+            "python": platform.python_version(),
+        },
+        "resources": _resources(),
+        "loop": loop,
+    }

{devops_bot_sdk-1.4.141 → devops_bot_sdk-1.4.145}/sdk/updater.py

@@ -20,11 +20,31 @@ import subprocess
 import sys
 
 _DIST        = "devops-bot-sdk"
+_EXTRAS      = "[ui]"   # control-panel deps (fastapi/uvicorn/starlette) — keep on every self-update
 _GITHUB_REPO = "consultancy-outfit/DevOpsBot-SDK"
 _GITHUB_SSH  = f"git+ssh://git@github.com/{_GITHUB_REPO}.git"
 _PYPI_JSON   = f"https://pypi.org/pypi/{_DIST}/json"
 
 
+def _with_extras(target: str) -> str:
+    """Attach the ``[ui]`` extra so a self-update never drops the control-panel
+    deps — the reason ``agentos-ui`` broke (``No module named 'starlette'``) after
+    each upgrade. Cross-platform: the pip target syntax is identical on Linux and
+    Windows.
+
+      * bare dist name        →  ``devops-bot-sdk[ui]``
+      * git+/URL direct ref   →  ``devops-bot-sdk[ui] @ git+…``   (PEP 508)
+    Already-tagged targets are returned unchanged.
+    """
+    if _EXTRAS in target:
+        return target
+    if "://" in target:                    # a VCS/URL install (git+ssh / git+https)
+        return f"{_DIST}{_EXTRAS} @ {target}"
+    if target == _DIST:                     # bare PyPI dist
+        return f"{_DIST}{_EXTRAS}"
+    return target
+
+
 # ── Platform helpers ──────────────────────────────────────────────────────────
 
 def _pip_flags() -> list[str]:
@@ -197,7 +217,9 @@ def _install_candidates() -> list[str]:
     if gh_token:
         cands.append(f"git+https://{gh_token}@github.com/{_GITHUB_REPO}.git@{branch}")
     cands.append(_DIST)
-    return cands
+    # Every target carries the [ui] extra so the control-panel deps are reinstalled
+    # on each upgrade (previously they were dropped, breaking `agentos-ui`).
+    return _unique([_with_extras(c) for c in cands])
 
 
 def _pip_install(url: str, *, force: bool = False) -> bool:
@@ -316,7 +338,7 @@ def auto_update_and_reexec(module: str, argv: list[str]) -> None:
                 "error: the SDK self-update left the install broken and auto-repair "
                 "failed.\n       reinstall it manually, then re-run agentos-auto:\n"
                 f'         "{sys.executable}" -m pip install --force-reinstall '
-                f'"git+https://github.com/{_GITHUB_REPO}.git@{_sdk_branch()}"'
+                f'"devops-bot-sdk[ui] @ git+https://github.com/{_GITHUB_REPO}.git@{_sdk_branch()}"'
             )
             sys.exit(1)
         print("✓ repaired.")

devops_bot_sdk-1.4.145/tests/test_health.py

@@ -0,0 +1,53 @@
+"""SDK VPS health — collect_health() + GET /api/ui/health.
+
+Resource metrics degrade gracefully when psutil is absent (resources.available
+False), and the route is token-gated like every /api/ui/* endpoint.
+"""
+from __future__ import annotations
+
+import sys
+from unittest.mock import patch
+
+import pytest
+
+from sdk.ui.health import collect_health
+
+
+class TestCollectHealth:
+    def test_shape(self):
+        h = collect_health()
+        assert h["status"] == "ok"
+        assert h["sdk_version"] and "host" in h and "resources" in h and "loop" in h
+        assert "os" in h["host"] and "python" in h["host"]
+
+    def test_resources_degrade_without_psutil(self):
+        # Simulate psutil missing → resources.available False, no crash.
+        with patch.dict(sys.modules, {"psutil": None}):
+            h = collect_health()
+        assert h["resources"]["available"] is False
+
+    def test_loop_never_breaks_probe(self):
+        with patch("sdk.ui.runner.loop_state", side_effect=RuntimeError("boom")):
+            h = collect_health()
+        assert "error" in h["loop"]
+
+
+fastapi = pytest.importorskip("fastapi")
+from fastapi.testclient import TestClient  # noqa: E402
+
+from sdk.ui.api import require_token, router  # noqa: E402
+
+
+def _client():
+    app = fastapi.FastAPI()
+    app.include_router(router)
+    app.dependency_overrides[require_token] = lambda: None
+    return TestClient(app)
+
+
+class TestHealthRoute:
+    def test_returns_health(self):
+        resp = _client().get("/api/ui/health")
+        assert resp.status_code == 200
+        body = resp.json()
+        assert body["status"] == "ok" and "resources" in body and "loop" in body

devops_bot_sdk-1.4.145/tests/test_updater_extras.py

@@ -0,0 +1,49 @@
+"""Regression: self-update must keep the ``[ui]`` extra so the control panel's
+web deps (fastapi/uvicorn/starlette) are reinstalled on every upgrade.
+
+Before this, ``agentos-auto update`` reinstalled ``devops-bot-sdk`` WITHOUT the
+extra, so ``agentos-ui`` broke with ``No module named 'starlette'`` after each
+update and had to be `pip install`ed by hand.
+"""
+from __future__ import annotations
+
+from unittest.mock import patch
+
+from sdk import updater
+
+
+class TestWithExtras:
+    def test_bare_dist_gets_extra(self):
+        assert updater._with_extras("devops-bot-sdk") == "devops-bot-sdk[ui]"
+
+    def test_git_ssh_uses_pep508_direct_ref(self):
+        url = "git+ssh://git@github.com/consultancy-outfit/DevOpsBot-SDK.git@main"
+        assert updater._with_extras(url) == f"devops-bot-sdk[ui] @ {url}"
+
+    def test_git_https_token_preserved(self):
+        url = "git+https://TOKEN@github.com/consultancy-outfit/DevOpsBot-SDK.git@main"
+        assert updater._with_extras(url) == f"devops-bot-sdk[ui] @ {url}"
+
+    def test_idempotent_bare(self):
+        assert updater._with_extras("devops-bot-sdk[ui]") == "devops-bot-sdk[ui]"
+
+    def test_idempotent_url(self):
+        tagged = "devops-bot-sdk[ui] @ git+ssh://git@github.com/x/y.git"
+        assert updater._with_extras(tagged) == tagged
+
+
+class TestInstallCandidates:
+    def test_every_candidate_carries_the_ui_extra(self):
+        # No GitHub token → the SSH + detected + PyPI candidates only.
+        with patch.object(updater, "_fetch_github_token", return_value=None), \
+             patch.object(updater, "_detect_install_url", return_value=updater._DIST):
+            cands = updater._install_candidates()
+        assert cands, "expected at least one install candidate"
+        assert all("[ui]" in c for c in cands), cands
+
+    def test_token_https_candidate_also_tagged(self):
+        with patch.object(updater, "_fetch_github_token", return_value="gho_x"), \
+             patch.object(updater, "_detect_install_url", return_value=updater._DIST):
+            cands = updater._install_candidates()
+        https = [c for c in cands if "https://gho_x@" in c]
+        assert https and all(c.startswith("devops-bot-sdk[ui] @ ") for c in https), cands