virtuai-cli 1.0.0__tar.gz → 1.0.2__tar.gz

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: virtuai-cli
-Version: 1.0.0
+Version: 1.0.2
 Summary: Run VirtuAI deep agents on your local machine
 Author-email: uCloudStore <lmoreno@ucloudstore.com>
 License: Proprietary

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "virtuai-cli"
-version = "1.0.0"
+version = "1.0.2"
 description = "Run VirtuAI deep agents on your local machine"
 readme = "README.md"
 requires-python = ">=3.11"

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/src/virtuai_cli/__init__.py

@@ -1,2 +1,2 @@
 """VirtuAI local CLI."""
-__version__ = "1.0.0"
+__version__ = "1.0.2"

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/src/virtuai_cli/pull.py

@@ -35,7 +35,10 @@ logger = logging.getLogger(__name__)
 _HEARTBEAT_SECONDS = 5.0
 #: Output is sent this often while there is some, so a stream reads as one.
 _FLUSH_SECONDS = 0.25
-_RETRY_DELAYS = (1, 2, 5, 10, 20, 30)
+#: A poll is cheap, and the only thing waiting behind a long backoff is the
+#: agent: capped at 5 s. With (…, 10, 20, 30) a runner came back ~20 s after
+#: the server did on a dev rollout.
+_RETRY_DELAYS = (1, 2, 3, 5)
 #: How long a finished job keeps trying to hand in its result.
 _RESULT_RETRY_SECONDS = 120.0
 #: Past this many jobs in hand, wait for some to finish before asking for more.
@@ -142,12 +145,20 @@ class _Session:
             "ready": await runner._ready_payload(self.workdir),
         }
         resp = await self.http.post("/api/cli/v2/hello", json=body)
-        if resp.status_code == 404:
-            raise PullUnavailable()
         if resp.status_code == 401:
             raise TokenRejected("the server rejected this runner's token; pair it again")
-        resp.raise_for_status()
-        data = resp.json()
+        if resp.status_code >= 500:
+            resp.raise_for_status()  # a server in trouble: retried
+        # Anything else that is not a v2 hello means this server does not
+        # offer pull. Not only 404: a server from before v2 answers a POST
+        # here with 405 (its frontend's catch-all route), and some proxies
+        # with an HTML page. 1.0.0 retried those forever and never connected.
+        try:
+            data = resp.json() if resp.status_code == 200 else None
+        except ValueError:
+            data = None
+        if not isinstance(data, dict) or not data.get("runner_id"):
+            raise PullUnavailable()
         self.runner_id = data["runner_id"]
         self.wait = int(data.get("wait_seconds", self.wait))
         self.heartbeat = float(data.get("heartbeat_seconds", self.heartbeat))
@@ -192,7 +203,9 @@ class _Session:
                     continue
                 if resp.status_code == 401:
                     raise TokenRejected("the server rejected this runner's token; pair it again")
-                if resp.status_code == 404:
+                if resp.status_code in (404, 405) or (
+                        resp.status_code == 200
+                        and not resp.headers.get("content-type", "").startswith("application/json")):
                     not_found += 1
                     if not_found >= _GONE_AFTER_404S:
                         raise PullUnavailable()

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/src/virtuai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: virtuai-cli
-Version: 1.0.0
+Version: 1.0.2
 Summary: Run VirtuAI deep agents on your local machine
 Author-email: uCloudStore <lmoreno@ucloudstore.com>
 License: Proprietary

{virtuai_cli-1.0.0 → virtuai_cli-1.0.2}/src/virtuai_cli.egg-info/SOURCES.txt

@@ -26,5 +26,6 @@ src/virtuai_cli/chat/widgets.py
 tests/test_browser.py
 tests/test_frame_concurrency.py
 tests/test_process_group_kill.py
+tests/test_pull_fallback.py
 tests/test_run_single_instance.py
 tests/test_session_isolation.py

virtuai_cli-1.0.2/tests/test_pull_fallback.py

@@ -0,0 +1,79 @@
+"""CLI 1.0 against a server that does not offer pull must use the socket.
+
+1.0.0 fell back only on a 404. A server from before the v2 API answers a
+POST to /api/cli/v2/hello with 405 — its frontend's catch-all route — and
+1.0.0 retried that forever and never connected. Every answer that is not a
+v2 hello now means "no pull here", except a rejected token (reported) and a
+server error (retried).
+"""
+
+from __future__ import annotations
+
+import asyncio
+import sys
+from pathlib import Path
+
+import httpx
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[0] / ".." / "src"))
+
+from virtuai_cli import pull  # noqa: E402
+
+
+def _hello_against(response: httpx.Response, tmp_path):
+    session = pull._Session("http://x", "t", tmp_path, lambda *a: None, None, "host")
+    session.http = httpx.AsyncClient(base_url="http://x",
+                                     transport=httpx.MockTransport(lambda req: response))
+    return asyncio.run(session.hello())
+
+
+@pytest.mark.parametrize("response", [
+    httpx.Response(404, json={"detail": "Not Found"}),                 # v2 code, flag off
+    httpx.Response(405, json={"detail": "Method Not Allowed"}),        # a server from before v2
+    httpx.Response(200, text="<!doctype html><title>VirtuAI</title>",  # a catch-all page
+                   headers={"content-type": "text/html"}),
+    httpx.Response(200, json={"ok": True}),                            # JSON, but not a hello
+    httpx.Response(403, json={"detail": "Forbidden"}),
+], ids=["404", "405", "html", "json-without-runner", "403"])
+def test_anything_but_a_v2_hello_means_use_the_socket(response, tmp_path):
+    with pytest.raises(pull.PullUnavailable):
+        _hello_against(response, tmp_path)
+
+
+def test_a_rejected_token_is_reported_not_retried(tmp_path):
+    with pytest.raises(pull.TokenRejected):
+        _hello_against(httpx.Response(401, json={"detail": "Invalid CLI token"}), tmp_path)
+
+
+def test_a_server_error_is_retried_not_taken_as_no_pull(tmp_path):
+    with pytest.raises(httpx.HTTPStatusError):
+        _hello_against(httpx.Response(503, text="unavailable"), tmp_path)
+
+
+def test_a_real_hello_registers(tmp_path):
+    _hello_against(httpx.Response(200, json={"runner_id": "c-1", "wait_seconds": 25,
+                                             "heartbeat_seconds": 5}), tmp_path)
+
+
+def test_run_forever_falls_back_to_the_socket_on_an_old_server(monkeypatch, tmp_path):
+    """End to end in the runner: hello gets 405, the socket session starts."""
+    from virtuai_cli import runner
+
+    started = []
+
+    async def fake_session(*a, **kw):
+        started.append(True)
+        raise SystemExit(0)
+
+    real_client = httpx.AsyncClient
+
+    def client(*a, **kw):
+        kw["transport"] = httpx.MockTransport(lambda req: httpx.Response(405, json={}))
+        return real_client(*a, **kw)
+
+    monkeypatch.setattr(pull.httpx, "AsyncClient", client)
+    monkeypatch.setattr(runner, "run_session", fake_session)
+    monkeypatch.delenv("VIRTUAI_TRANSPORT", raising=False)
+    asyncio.run(runner.run_forever("https://old.example", "t", tmp_path, lambda *a: None, None))
+    assert started == [True]