Skip to content

fix(decisioning): project malformed-JSON 2xx responses to AdcpError #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bokelley wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −1
Draft

fix(decisioning): project malformed-JSON 2xx responses to AdcpError #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa1b60a
fix(decisioning): project malformed-JSON 2xx responses to AdcpError
claude May 21, 2026
d318a7e
fix(decisioning): narrow except Exception → except ValueError per review
claude May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/adcp/decisioning/upstream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,20 @@ async def _request(
)
if response.status_code == 204 or not response.content:
return {}
parsed: Any = response.json()
try:
parsed: Any = response.json()
except ValueError as exc:
# Server returned a successful status with a non-JSON body (e.g.
# a proxy/CDN HTML error page). Project to SERVICE_UNAVAILABLE so
# adopters get a typed AdcpError rather than a raw JSONDecodeError.
raise AdcpError(
"SERVICE_UNAVAILABLE",
message=(
f"upstream {method} {path} returned non-JSON body "
f"(status {response.status_code}): {exc}"
),
recovery="transient",
) from exc
return parsed

async def get(
Expand Down
16 changes: 16 additions & 0 deletions tests/test_upstream_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,22 @@ async def test_async_context_manager_closes_client() -> None:
assert client._client is None # type: ignore[union-attr]


@respx.mock
async def test_200_with_malformed_json_raises_service_unavailable() -> None:
"""A 2xx response with non-JSON body (e.g. CDN/proxy HTML page) must
surface as SERVICE_UNAVAILABLE, not a raw JSONDecodeError."""
respx.get(f"{BASE}/items").mock(
return_value=httpx.Response(200, content=b"<html>bad gateway</html>")
)
client = create_upstream_http_client(BASE)
with pytest.raises(AdcpError) as exc_info:
await client.get("/items")
assert exc_info.value.code == "SERVICE_UNAVAILABLE"
assert exc_info.value.recovery == "transient"
assert isinstance(exc_info.value.__cause__, json.JSONDecodeError)
await client.aclose()


@respx.mock
async def test_pool_reused_across_calls() -> None:
respx.get(f"{BASE}/a").mock(return_value=httpx.Response(200, json={}))
Expand Down
Loading