devops-bot-sdk 1.6.51__tar.gz → 1.6.52__tar.gz

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/PKG-INFO

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

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/devops_bot_sdk.egg-info/PKG-INFO

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

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/devops_bot_sdk.egg-info/SOURCES.txt

@@ -213,6 +213,7 @@ tests/test_ui_gate.py
 tests/test_ui_lifespan.py
 tests/test_update_timer.py
 tests/test_updater_extras.py
+tests/test_updater_pep668.py
 tests/test_updater_reports_the_truth.py
 tests/test_url_access.py
 tests/test_vps_health.py

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.6.51
+Version: 1.6.52
 
 Public surface:
   BackendClient.from_config()        — create client from ~/.agentos/config.toml
@@ -34,7 +34,7 @@ Rules:
   - All data egress through submit_webhook only
 """
 
-__version__ = "1.6.51"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
+__version__ = "1.6.52"   # 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.6.51 → devops_bot_sdk-1.6.52}/sdk/ui/setup_manager.py

@@ -102,9 +102,12 @@ async def reinstall_sdk(upgrade: bool = True):
     which is the managed ``agentsystem`` venv in normal operation. Used by
     ``/setup`` for a repair/reinstall.
     """
+    from sdk.updater import _pip_flags
+
     argv = [sys.executable, "-m", "pip", "install"]
     if upgrade:
         argv.append("--upgrade")
+    argv += _pip_flags()
     argv.append(SDK_GIT_SPEC)
 
     yield f"$ {' '.join(argv)}\n"

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/sdk/updater.py

@@ -8,7 +8,8 @@ Upgrade priority:
      (backend returns the user's stored GitHub OAuth token — no extra config)
   4. PyPI dist name as last resort
 
-Adds --break-system-packages automatically on Linux (Ubuntu 22.04+/Debian 12+).
+Adds --break-system-packages automatically on any externally-managed Python
+(PEP 668: Ubuntu 22.04+/Debian 12+, Homebrew Python on macOS).
 Disable entirely with AGENTOS_NO_UPDATE=1.
 """
 from __future__ import annotations
@@ -54,9 +55,35 @@ def _with_extras(target: str) -> str:
 
 # ── Platform helpers ──────────────────────────────────────────────────────────
 
+def _externally_managed() -> bool:
+    """True when pip will refuse this interpreter under PEP 668.
+
+    The marker is an ``EXTERNALLY-MANAGED`` file in the stdlib directory, and a
+    venv is exempt. Checking for it, rather than the OS, is what covers Homebrew
+    Python on macOS: a Mac VPS on ``/opt/homebrew/.../python3.14`` was refused on
+    every upgrade attempt and stayed on an old version indefinitely, because the
+    flag below used to be added on Linux only.
+    """
+    if sys.prefix != getattr(sys, "base_prefix", sys.prefix):
+        return False
+    try:
+        import sysconfig
+        return os.path.isfile(
+            os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))
+    except Exception:  # noqa: BLE001 — an unreadable layout is not "managed"
+        return False
+
+
 def _pip_flags() -> list[str]:
-    """--break-system-packages on Linux (PEP 668); empty elsewhere."""
-    return ["--break-system-packages"] if platform.system() == "Linux" else []
+    """--break-system-packages where PEP 668 applies; empty elsewhere.
+
+    Linux keeps the flag unconditionally, as before (every supported distro pip
+    accepts it). Elsewhere it is added only when the marker is present, since an
+    old pip that predates PEP 668 rejects the option outright.
+    """
+    if platform.system() == "Linux" or _externally_managed():
+        return ["--break-system-packages"]
+    return []
 
 
 def _vtuple(v: str) -> tuple:
@@ -589,7 +616,7 @@ def _report(result: UpgradeResult, latest: str | None) -> None:
             _say(f"    pip said: {result.detail}")
         _say("    fix it by hand with:\n"
              f'      "{sys.executable}" -m pip install --upgrade --force-reinstall '
-             f'--no-cache-dir "{_DIST}{_EXTRAS}"')
+             f'--no-cache-dir {" ".join(_pip_flags() + [""])}"{_DIST}{_EXTRAS}"')
         return
 
     if result.ran:

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/sdk/vps_health.py

@@ -33,6 +33,7 @@ ping just waits for the next tick.
 from __future__ import annotations
 
 import asyncio
+import ipaddress
 import logging
 import os
 import socket
@@ -120,6 +121,21 @@ def _outbound_ip() -> str:
                 pass
 
 
+def _is_public(ip: str) -> bool:
+    """Only a globally-routable address may overwrite the allocation's IP.
+
+    Behind NAT (an AWS instance, a laptop on Wi-Fi) the route-to-internet address
+    is private — ``172.31.x.x``, ``192.168.x.x`` — and sending it replaced the
+    VPS's real public IP on ``contabo_allocation``, after which the backend could
+    no longer reach the panel at all. Omitting the key leaves the stored value
+    alone, the same rule every other unavailable metric here follows.
+    """
+    try:
+        return bool(ip) and ipaddress.ip_address(ip).is_global
+    except ValueError:
+        return False
+
+
 def _bandwidth_used_mb() -> float | None:
     """Total bytes in+out since boot, in MB. None when psutil is unavailable.
 
@@ -183,7 +199,7 @@ def build_payload(health: dict | None = None) -> dict:
         payload["bandwidthUsed"] = bw                                      # MB, cumulative
 
     ip = _outbound_ip()
-    if ip:
+    if _is_public(ip):
         payload["ipAddress"] = ip
 
     return payload

devops_bot_sdk-1.6.52/tests/test_updater_pep668.py

@@ -0,0 +1,53 @@
+"""PEP 668 is a property of the interpreter, not of Linux.
+
+Homebrew Python on macOS ships an EXTERNALLY-MANAGED marker, and the updater
+used to add --break-system-packages on Linux only — so a Mac VPS was refused on
+every upgrade path and stayed on an old SDK indefinitely.
+"""
+from __future__ import annotations
+
+import sys
+
+from sdk import updater
+
+
+def _stdlib(monkeypatch, tmp_path, *, marker: bool, venv: bool = False):
+    import sysconfig
+    if marker:
+        (tmp_path / "EXTERNALLY-MANAGED").write_text("[externally-managed]\n")
+    monkeypatch.setattr(sysconfig, "get_path", lambda name: str(tmp_path))
+    monkeypatch.setattr(sys, "base_prefix", "/base" if venv else sys.prefix)
+
+
+def test_homebrew_macos_gets_the_flag(monkeypatch, tmp_path):
+    monkeypatch.setattr(updater.platform, "system", lambda: "Darwin")
+    _stdlib(monkeypatch, tmp_path, marker=True)
+    assert updater._pip_flags() == ["--break-system-packages"]
+
+
+def test_unmanaged_macos_python_does_not(monkeypatch, tmp_path):
+    """An old pip that predates PEP 668 rejects the option outright."""
+    monkeypatch.setattr(updater.platform, "system", lambda: "Darwin")
+    _stdlib(monkeypatch, tmp_path, marker=False)
+    assert updater._pip_flags() == []
+
+
+def test_a_venv_is_exempt(monkeypatch, tmp_path):
+    monkeypatch.setattr(updater.platform, "system", lambda: "Windows")
+    _stdlib(monkeypatch, tmp_path, marker=True, venv=True)
+    assert updater._pip_flags() == []
+
+
+def test_linux_keeps_the_flag_unconditionally(monkeypatch, tmp_path):
+    monkeypatch.setattr(updater.platform, "system", lambda: "Linux")
+    _stdlib(monkeypatch, tmp_path, marker=False)
+    assert updater._pip_flags() == ["--break-system-packages"]
+
+
+def test_the_hand_fix_hint_carries_the_flag(monkeypatch, tmp_path, capsys):
+    monkeypatch.setattr(updater.platform, "system", lambda: "Darwin")
+    _stdlib(monkeypatch, tmp_path, marker=True)
+    res = updater.UpgradeResult(before="1.6.44", after="1.6.44", changed=False,
+                               ran=True, detail="externally-managed-environment")
+    updater._report(res, latest="1.6.51")
+    assert "--break-system-packages" in capsys.readouterr().out

{devops_bot_sdk-1.6.51 → devops_bot_sdk-1.6.52}/tests/test_vps_health.py

@@ -73,7 +73,7 @@ class TestBuildPayload:
     def test_maps_every_field(self, monkeypatch):
         monkeypatch.delenv("AGENTOS_VPS_HEALTH_STATUS", raising=False)
         monkeypatch.setattr(vps_health, "_bandwidth_used_mb", lambda: 1024.5)
-        monkeypatch.setattr(vps_health, "_outbound_ip", lambda: "192.168.1.1")
+        monkeypatch.setattr(vps_health, "_outbound_ip", lambda: "77.68.16.238")
 
         p = vps_health.build_payload(_HEALTH)
 
@@ -85,7 +85,7 @@ class TestBuildPayload:
         assert p["diskUsage"] == 30.2
         assert p["totalDisk"] == 500.0
         assert p["bandwidthUsed"] == 1024.5
-        assert p["ipAddress"] == "192.168.1.1"
+        assert p["ipAddress"] == "77.68.16.238"
         assert p["uptimeSeconds"] == 86400
         # ISO-8601 with millis + Z, as the backend sample shows.
         assert p["lastPingedAt"].endswith("Z") and "T" in p["lastPingedAt"]
@@ -118,6 +118,15 @@ class TestBuildPayload:
                        "totalDisk", "uptimeSeconds", "bandwidthUsed", "ipAddress"):
             assert absent not in p
 
+    @pytest.mark.parametrize("ip", ["172.31.44.234", "192.168.18.16", "10.0.0.5",
+                                    "127.0.0.1", "not-an-ip"])
+    def test_a_private_ip_never_overwrites_the_allocation(self, monkeypatch, ip):
+        """Behind NAT the outbound address is private; sending it replaced the
+        VPS's public IP and left the backend unable to reach the panel."""
+        monkeypatch.setattr(vps_health, "_bandwidth_used_mb", lambda: None)
+        monkeypatch.setattr(vps_health, "_outbound_ip", lambda: ip)
+        assert "ipAddress" not in vps_health.build_payload(_HEALTH)
+
 
 class _FakeClient:
     def __init__(self, ok: bool = True) -> None: