scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-18 04:44:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 123

fix(responses): give a refused WebSocket turn's error frame a 429 status so Codex ends the turn

Browse source
This commit is contained in:
mateo-berri 2026-10-16 00:02:30 -07:00
parent 131eb34432
commit 4ceba6d5dd
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
litellm/responses/streaming_iterator.py
View file

@ -1899,6 +1899,12 @@ async def _admit_frame_turn(turn_admission: Callable[[], Awaitable[None]] | None
await turn_admission()
def _turn_refusal_frame(refusal: RateLimitError) -> str:
return json.dumps(
{"type": "error", "status": 429, "error": {"type": "rate_limit_exceeded", "message": str(refusal)}}
)
RESPONSES_WS_LOGGED_EVENT_TYPES: Final = [
"response.created",
"response.completed",
@ -2547,17 +2553,7 @@ class ResponsesWebSocketStreaming:
await _admit_frame_turn(turn_admission, message)
except RateLimitError as e:
try:
await self.websocket.send_text(
json.dumps(
{
"type": "error",
"error": {
"type": "rate_limit_exceeded",
"message": str(e),
},
}
)
)
await self.websocket.send_text(_turn_refusal_frame(e))
except Exception: # noqa: BLE001, S110 # client may already be gone
pass
return False
@ -2702,10 +2698,11 @@ class ManagedResponsesWebSocketHandler:
return None
async def _send_error(self, message: str, error_type: str = "server_error") -> None:
await self._send_frame(json.dumps({"type": "error", "error": {"type": error_type, "message": message}}))
async def _send_frame(self, frame: str) -> None:
try:
await self.websocket.send_text(
json.dumps({"type": "error", "error": {"type": error_type, "message": message}})
)
await self.websocket.send_text(frame)
except Exception:
pass
@ -3085,7 +3082,7 @@ class ManagedResponsesWebSocketHandler:
)
await _admit_frame_turn(turn_admission, raw_message)
except RateLimitError as e:
await self._send_error(str(e), error_type="rate_limit_exceeded")
await self._send_frame(_turn_refusal_frame(e))
return
call_kwargs: Final = self._build_base_call_kwargs(msg_obj)

3
tests/unit/responses/test_responses_websocket_all_providers.py
View file

@ -1388,6 +1388,7 @@ class TestWebSocketTurnAdmission:
]
assert turn_admission.await_count == 2
refusal: Final = json.loads(websocket.send_text.await_args.args[0])
assert refusal["status"] == 429
assert refusal["error"]["type"] == "rate_limit_exceeded"
assert "crossed budget" in refusal["error"]["message"]
@ -1442,7 +1443,7 @@ class TestWebSocketTurnAdmission:
for call in websocket.send_text.await_args_list
if json.loads(call.args[0]).get("type") == "error"
]
assert [refusal["error"]["type"] for refusal in refusals] == ["rate_limit_exceeded"]
assert [(refusal["status"], refusal["error"]["type"]) for refusal in refusals] == [(429, "rate_limit_exceeded")]
def _deployment_defaults():