ravmem-cli 1.3.0__tar.gz → 1.3.1__tar.gz

{ravmem_cli-1.3.0/ravmem_cli.egg-info → ravmem_cli-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ravmem-cli
-Version: 1.3.0
+Version: 1.3.1
 Summary: RavMem CLI — lightweight client for the RavMem code knowledge graph server
 Author-email: RavMem <harpreet.singh@ravmem.com>
 License-Expression: MIT

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ravmem-cli"
-version = "1.3.0"
+version = "1.3.1"
 description = "RavMem CLI — lightweight client for the RavMem code knowledge graph server"
 readme = "README.md"
 requires-python = ">=3.10"

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1}/ravmem/cli/_common.py

@@ -73,7 +73,7 @@ def wait_for_indexing(client, project_id: str, branch_name: str, job_id: int, wa
 
 
 def _poll_job_with_progress(
-    client, job_id: int, label: str, interval: float = 1.0, timeout: float = 600.0,
+    client, job_id: int, label: str, interval: float = 1.0,
 ) -> dict:
     """Poll a job to completion, rendering a live progress bar (phase + %)
     instead of ``client.poll_job``'s silent loop — which, combined with the
@@ -92,7 +92,6 @@ def _poll_job_with_progress(
     httpx_logger = logging.getLogger("httpx")
     prev_level = httpx_logger.level
     httpx_logger.setLevel(logging.WARNING)
-    deadline = time.monotonic() + timeout
     try:
         with Progress(
             TextColumn("[bold]{task.description}"),
@@ -112,8 +111,7 @@ def _poll_job_with_progress(
                 if status in ("done", "failed", "cancelled"):
                     progress.update(task, completed=100 if status == "done" else pct)
                     return job
-                if time.monotonic() >= deadline:
-                    raise TimeoutError(f"Job {job_id} did not complete within {timeout}s")
+                # No deadline: --wait means until the job ends, and on a large repo embedding alone takes many minutes.
                 time.sleep(interval)
     finally:
         httpx_logger.setLevel(prev_level)

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1}/ravmem/cli/git_local.py

@@ -56,23 +56,16 @@ def diff_name_status(
 
     Paths are relative to *repo_path*.
     """
+    # NUL separation keeps tabs, spaces and non-ASCII names intact, and --no-renames reports a rename as a delete
+    # plus an add, so the old path is removed and the new one uploaded.
     out = _run(
-        ["git", "diff", "--name-status", base_commit, target], cwd=repo_path,
+        ["git", "diff", "--name-status", "-z", "--no-renames", base_commit, target], cwd=repo_path,
     )
     modified: list[str] = []
     deleted: list[str] = []
-    for line in out.splitlines():
-        line = line.strip()
-        if not line:
-            continue
-        parts = line.split("\t", 1)
-        if len(parts) != 2:
-            continue
-        status, path = parts[0].strip(), parts[1].strip()
-        if status.startswith("D"):
-            deleted.append(path)
-        else:
-            modified.append(path)
+    fields = out.split("\0")
+    for status, path in zip(fields[::2], fields[1::2]):
+        (deleted if status.startswith("D") else modified).append(path)
     return modified, deleted
 
 

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1}/ravmem/client/api.py

@@ -52,6 +52,21 @@ def handle_api_error(exc: Exception) -> None:
     raise typer.Exit(1)
 
 
+_MAX_ATTEMPTS = 8
+_MAX_RETRY_WAIT_SECS = 120
+# A delete waits up to 2 minutes for running jobs to stop, then purges the graph in chunks, which takes minutes on
+# a large project. The normal 30 s timeout would report a failure for a delete that goes on to succeed.
+_DELETE_TIMEOUT_SECS = 1800.0
+
+
+def _retry_after_secs(resp: httpx.Response, attempt: int) -> float:
+    try:
+        wait = float(resp.headers.get("Retry-After", ""))
+    except ValueError:
+        wait = 2 ** attempt
+    return min(max(wait, 1.0), _MAX_RETRY_WAIT_SECS)
+
+
 class RavMemClient:
     """Thin wrapper around the RavMem REST API."""
 
@@ -100,11 +115,25 @@ class RavMemClient:
     # Internal helper
     # ------------------------------------------------------------------
 
-    def _request(self, method: str, path: str, **kwargs) -> dict | list:
-        try:
-            resp = self._client.request(method, path, **kwargs)
-        except (httpx.ConnectError, httpx.TimeoutException):
-            raise
+    def _request(self, method: str, path: str, *, retry_timeouts: bool = False, **kwargs) -> dict | list:
+        """Send a request, waiting out any 429 for as long as the server's Retry-After says.
+
+        ``retry_timeouts`` is only for calls the server treats as idempotent: a timed-out request may still have
+        been processed, so resending anything else could apply it twice.
+        """
+        attempt = 0
+        while True:
+            attempt += 1
+            try:
+                resp = self._client.request(method, path, **kwargs)
+            except httpx.TimeoutException:
+                if not retry_timeouts or attempt >= _MAX_ATTEMPTS:
+                    raise
+                time.sleep(min(2 ** attempt, _MAX_RETRY_WAIT_SECS))
+                continue
+            if resp.status_code != 429 or attempt >= _MAX_ATTEMPTS:
+                break
+            time.sleep(_retry_after_secs(resp, attempt))
 
         try:
             resp.raise_for_status()
@@ -163,7 +192,7 @@ class RavMemClient:
         return self._request("GET", f"/api/projects/{project_id}")
 
     def delete_project(self, project_id: str) -> dict:
-        return self._request("DELETE", f"/api/projects/{project_id}")
+        return self._request("DELETE", f"/api/projects/{project_id}", timeout=_DELETE_TIMEOUT_SECS)
 
     def update_project(self, project_id: str, default_branch: str) -> dict:
         return self._request(
@@ -233,7 +262,8 @@ class RavMemClient:
             body["parent_branch"] = parent_branch
         if langs is not None:
             body["langs"] = langs
-        return self._request("POST", f"/api/projects/{project_id}/index", json=body)
+        # The server ignores a batch it already has, so a timed-out batch is safe to send again.
+        return self._request("POST", f"/api/projects/{project_id}/index", json=body, retry_timeouts=True)
 
     def index_branch(
         self,
@@ -264,7 +294,7 @@ class RavMemClient:
 
     def delete_branch_index(self, project_id: str, branch: str) -> dict:
         return self._request(
-            "DELETE", f"/api/projects/{project_id}/branches/{branch}/index"
+            "DELETE", f"/api/projects/{project_id}/branches/{branch}/index", timeout=_DELETE_TIMEOUT_SECS,
         )
 
     def get_divergence(self, project_id: str, branch: str) -> dict:

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1/ravmem_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ravmem-cli
-Version: 1.3.0
+Version: 1.3.1
 Summary: RavMem CLI — lightweight client for the RavMem code knowledge graph server
 Author-email: RavMem <harpreet.singh@ravmem.com>
 License-Expression: MIT

{ravmem_cli-1.3.0 → ravmem_cli-1.3.1}/ravmem_cli.egg-info/SOURCES.txt

@@ -33,4 +33,5 @@ ravmem_cli.egg-info/dependency_links.txt
 ravmem_cli.egg-info/entry_points.txt
 ravmem_cli.egg-info/requires.txt
 ravmem_cli.egg-info/top_level.txt
+tests/test_client_delete_timeout.py
 tests/test_smoke.py

ravmem_cli-1.3.1/tests/test_client_delete_timeout.py

@@ -0,0 +1,28 @@
+import httpx
+
+from ravmem.client import api
+
+
+def _client_seeing(seen):
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen.append(request.extensions["timeout"])
+        return httpx.Response(200, json={"deleted": True})
+
+    client = api.RavMemClient("http://server")
+    client._client = httpx.Client(base_url="http://server", transport=httpx.MockTransport(handler), timeout=30.0)
+    return client
+
+
+def test_deletes_wait_longer_than_the_default_timeout():
+    seen = []
+    client = _client_seeing(seen)
+    client.delete_project("p")
+    client.delete_branch_index("p", "main")
+    assert [t["read"] for t in seen] == [api._DELETE_TIMEOUT_SECS] * 2
+
+
+def test_other_calls_keep_the_default_timeout():
+    seen = []
+    client = _client_seeing(seen)
+    client._request("GET", "/api/projects")
+    assert seen[0]["read"] == 30.0