Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 37 additions & 3 deletions src/agent_env/agents/agents/gemini/a2a_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,41 @@
# the CLI prints each model call's events once that call returns, so the live
# trajectory advances per call.
_LITELLM_PROXY_PATH = "/litellm-gemini"
_UPSTREAM_ERROR_BODY_LOG_LIMIT = 500
_LITELLM_PROXY_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH"]
_PROXY_DROP_REQ_HEADERS = {"host", "content-length", "transfer-encoding", "connection", "keep-alive", "accept-encoding"}
_PROXY_DROP_RESP_HEADERS = {"content-length", "transfer-encoding", "content-encoding", "connection", "keep-alive"}
_LITELLM_ROUTE_HEADERS = ("x-litellm-model-id", "x-litellm-model-api-base", "x-litellm-model-group")


def _describe_transport_error(exc: Exception) -> str:
"""Name the exception class: many httpx errors (ReadTimeout, RemoteProtocolError) stringify to ''."""
text = str(exc)
return f"{type(exc).__name__}: {text}" if text else repr(exc)


def _litellm_route_headers(headers: httpx.Headers) -> dict[str, str]:
"""The headers by which LiteLLM names the deployment that served (or failed) a call, when it sent them."""
return {name: headers[name] for name in _LITELLM_ROUTE_HEADERS if name in headers}


def _log_upstream_error(proxy: str, upstream: httpx.Response) -> None:
route = _litellm_route_headers(upstream.headers)
route_text = "".join(f" {name}={value}" for name, value in route.items())
logger.warning(
"%s upstream %s: %s event=litellm_upstream_error_response%s",
proxy, upstream.status_code, upstream.text[:_UPSTREAM_ERROR_BODY_LOG_LIMIT], route_text,
extra={"event": "litellm_upstream_error_response", "proxy": proxy,
"upstream_status": upstream.status_code, **route},
)


def _log_transport_error(proxy: str, exc: Exception) -> str:
detail = _describe_transport_error(exc)
logger.warning("%s upstream request failed: %s event=litellm_upstream_transport_error", proxy, detail,
extra={"event": "litellm_upstream_transport_error", "proxy": proxy,
"error_type": type(exc).__name__})
return detail


class GeminiConfig(AgentConfig):
Expand Down Expand Up @@ -347,9 +379,9 @@ async def _vertex_openai_bridge(
headers=headers, content=json.dumps(oai_req).encode(),
)
except httpx.HTTPError as e:
raise HTTPException(status_code=502, detail=f"vertex bridge upstream failed: {e}")
raise HTTPException(status_code=502, detail=f"vertex bridge upstream failed: {_log_transport_error('vertex bridge', e)}")
if upstream.status_code >= 400:
logger.warning("vertex bridge upstream %s: %s", upstream.status_code, upstream.text[:500])
_log_upstream_error("vertex bridge", upstream)
return Response(
content=upstream.content, status_code=upstream.status_code,
media_type=upstream.headers.get("content-type", "application/json"),
Expand Down Expand Up @@ -734,7 +766,9 @@ async def litellm_gemini_proxy(self, request: Request) -> Response:
params=request.query_params, headers=fwd_headers, content=body,
)
except httpx.HTTPError as e:
raise HTTPException(status_code=502, detail=f"gemini upstream request failed: {e}")
raise HTTPException(status_code=502, detail=f"gemini upstream request failed: {_log_transport_error('gemini', e)}")
if upstream.status_code >= 400:
_log_upstream_error("gemini", upstream)
resp_headers = {k: v for k, v in upstream.headers.items() if k.lower() not in _PROXY_DROP_RESP_HEADERS}
return Response(content=upstream.content, status_code=upstream.status_code, headers=resp_headers)

Expand Down
45 changes: 43 additions & 2 deletions tst/unit/agents/gemini/test_litellm_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,48 @@ def test_an_unreachable_upstream_is_a_502(upstream, agent, client):
response = client.post(GENERATE, content=b"{}")

assert (response.status_code, response.json()) == (
502, {"detail": "gemini upstream request failed: All connection attempts failed"})
502, {"detail": "gemini upstream request failed: ConnectError: All connection attempts failed"})


def test_an_exception_with_no_message_is_named_in_the_502_and_the_log(caplog, upstream, agent, client):
_route(agent)
upstream.response = httpx.ReadTimeout("")

response = client.post(GENERATE, content=b"{}")

assert response.status_code == 502
assert response.json() == {"detail": "gemini upstream request failed: ReadTimeout('')"}
(record,) = [r for r in caplog.records if getattr(r, "event", None) == "litellm_upstream_transport_error"]
assert (record.proxy, record.error_type) == ("gemini", "ReadTimeout")
assert "ReadTimeout" in record.getMessage()
assert "event=litellm_upstream_transport_error" in record.getMessage()


def test_an_unreachable_bridge_upstream_names_the_exception(vertex, client):
vertex.response = httpx.RemoteProtocolError("")

response = client.post(GENERATE, json=_GREQ)

assert response.json() == {"detail": "vertex bridge upstream failed: RemoteProtocolError('')"}


@pytest.mark.parametrize("path", ["passthrough", "bridge"])
def test_an_error_response_logs_the_litellm_routing_headers_that_are_present(caplog, upstream, agent, client, path):
_route(agent, model="vertex_ai/global/g" if path == "bridge" else None)
upstream.response = httpx.Response(
429, json={"error": "slow down"},
headers={"x-litellm-model-id": "dep-1", "x-litellm-model-group": "grp", "x-litellm-response-cost": "0.1"},
)

response = client.post(GENERATE, json=_GREQ)

assert response.status_code == 429
(record,) = [r for r in caplog.records if getattr(r, "event", None) == "litellm_upstream_error_response"]
assert record.upstream_status == 429
message = record.getMessage()
assert "event=litellm_upstream_error_response" in message
assert "x-litellm-model-id=dep-1" in message and "x-litellm-model-group=grp" in message
assert "x-litellm-model-api-base" not in message and "x-litellm-response-cost" not in message


# ── provider-prefixed models: the chat-completions bridge ────────────────────────
Expand Down Expand Up @@ -245,7 +286,7 @@ def test_bridge_upstream_errors(vertex, client):

assert (limited.status_code, limited.content) == (429, b'{"error":"slow down"}')
assert (garbled.status_code, garbled.json()) == (502, {"detail": "vertex bridge: non-JSON upstream response"})
assert (unreachable.status_code, unreachable.json()) == (502, {"detail": "vertex bridge upstream failed: refused"})
assert (unreachable.status_code, unreachable.json()) == (502, {"detail": "vertex bridge upstream failed: ConnectError: refused"})



Expand Down
Loading