asyncgh 0.5.2__tar.gz → 0.5.4__tar.gz

{asyncgh-0.5.2 → asyncgh-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: asyncgh
-Version: 0.5.2
+Version: 0.5.4
 Summary: Minimal async GitHub REST + GraphQL transport: auth, retry, pagination -- no generated models
 Project-URL: Homepage, https://github.com/hugoh/fleet-tools/tree/main/asyncgh
 Project-URL: Issues, https://github.com/hugoh/fleet-tools/issues

{asyncgh-0.5.2 → asyncgh-0.5.4}/pyproject.toml

@@ -43,7 +43,7 @@ dev = [
 # still forwards raw-options as get_version() kwargs, so under v10 `tag` errors
 # and the deprecated `git_describe_command` --match is ignored (wrong tag picked).
 # Unpin once hatch-vcs ships setuptools-scm 10 support.
-requires = ["hatch-vcs>=0.4", "hatchling", "setuptools-scm>=8,<9"]
+requires = ["hatch-vcs>=0.4", "hatchling", "setuptools-scm<9"]
 build-backend = "hatchling.build"
 
 [tool.coverage.run]

{asyncgh-0.5.2 → asyncgh-0.5.4}/src/asyncgh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.2'
-__version_tuple__ = version_tuple = (0, 5, 2)
+__version__ = version = '0.5.4'
+__version_tuple__ = version_tuple = (0, 5, 4)

{asyncgh-0.5.2 → asyncgh-0.5.4}/src/asyncgh/client.py

@@ -119,9 +119,18 @@ class _GraphQLRateLimited(Exception):
     """
 
 
+class _GraphQLInvalidBody(Exception):
+    """Internal marker: GraphQL answered 2xx with a body that isn't JSON
+    (typically empty, from a gateway giving up on an expensive query).
+    Transient, so retried on the default backoff.
+    """
+
+
 def _should_retry_graphql(exc: Exception) -> bool | float:
     if isinstance(exc, _GraphQLRateLimited):
         return SECONDARY_RATE_LIMIT_WAIT
+    if isinstance(exc, _GraphQLInvalidBody):
+        return True
     return _should_retry(exc)
 
 
@@ -324,7 +333,14 @@ class GitHubClient:
                         raise GhError(
                             error_message(response), status_code=response.status_code
                         )
-                    body = response.json()
+                    try:
+                        body = response.json()
+                    except ValueError as exc:
+                        raise _GraphQLInvalidBody(
+                            "GraphQL response body is not valid JSON "
+                            f"(status {response.status_code}, "
+                            f"body: {response.text[:200]!r}): {exc}"
+                        ) from exc
                     errors = body.get("errors")
                     if not errors:
                         return body["data"]
@@ -334,7 +350,7 @@ class GitHubClient:
                         _format_graphql_errors(errors),
                         error_type=errors[0].get("type"),
                     )
-        except _GraphQLRateLimited as exc:
+        except (_GraphQLRateLimited, _GraphQLInvalidBody) as exc:
             raise GhError(str(exc)) from exc
         except httpx2.HTTPStatusError as exc:
             raise GhError(

{asyncgh-0.5.2 → asyncgh-0.5.4}/tests/test_client.py

@@ -499,3 +499,42 @@ async def test_github_client_as_context_manager_closes_on_exit(
         http = gh._http
         assert http is not None
     assert http.is_closed
+
+
+async def test_graphql_retries_undecodable_success_body_then_succeeds(
+    httpx2_mock: respx.Router,
+):
+    route = httpx2_mock.post(f"{API_BASE}/graphql").mock(
+        side_effect=[
+            httpx.Response(200, content=b""),
+            httpx.Response(200, json={"data": {"ok": True}}),
+        ]
+    )
+    data = await graphql("query { ok }")
+    assert data == {"ok": True}
+    assert route.call_count == 2
+
+
+async def test_graphql_raises_gh_error_when_success_body_stays_undecodable(
+    httpx2_mock: respx.Router,
+):
+    route = httpx2_mock.post(f"{API_BASE}/graphql").mock(
+        return_value=httpx.Response(200, content=b"")
+    )
+    with pytest.raises(GhError, match="not valid JSON"):
+        await graphql("query { ok }")
+    assert route.call_count == client.DEFAULT_MAX_RETRIES + 1
+
+
+async def test_graphql_invalid_body_error_includes_status_and_body_prefix(
+    httpx2_mock: respx.Router,
+):
+    httpx2_mock.post(f"{API_BASE}/graphql").mock(
+        return_value=httpx.Response(200, content=b"<html>" + b"x" * 500)
+    )
+    with pytest.raises(GhError) as excinfo:
+        await graphql("query { ok }")
+    message = str(excinfo.value)
+    assert "status 200" in message
+    assert "<html>xxx" in message
+    assert "x" * 300 not in message