The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(api_server): the end-of-stream flush waits for a timer flush still opening the message item
Teknium22c0ecb2df96
diff --git a/gateway/platforms/api_server_openai_routes.py b/gateway/platforms/api_server_openai_routes.pyindex 05dd355bb94..22ff2e2a119 100644--- a/gateway/platforms/api_server_openai_routes.py+++ b/gateway/platforms/api_server_openai_routes.py@@ -575,9 +575,9 @@ class _ResponsesStream:self._batch_timer = Noneasync def flush_batch(self) -> None:- """Emit a single delta for all buffered text."""- if not self._batch_buf:- return+ """Emit a single delta for all buffered text. Always takes the lock, even on an empty buffer: a+ timer flush may still be opening the message item (its keyed output index is read off the loop),+ and a caller that closes the item next must wait for that index."""async with self._batch_lock:if self._batch_buf:combined = "".join(self._batch_buf)diff --git a/tests/gateway/test_responses_stream_flush_race.py b/tests/gateway/test_responses_stream_flush_race.pynew file mode 100644index 00000000000..bc947e73b65--- /dev/null+++ b/tests/gateway/test_responses_stream_flush_race.py@@ -0,0 +1,51 @@+"""Keyed Responses streaming: the end-of-stream flush waits for a timer flush still opening the message+item. The keyed output index is now read off the loop, so that open yields; an end-of-stream flush that+skipped the lock on an empty buffer closed the item before its index existed and failed the turn."""+import asyncio+import threading++import pytest++from gateway.platforms.api_server_openai_routes import _ResponsesStream+++class _Sink:+ def __init__(self):+ self.frames = []++ async def write(self, frame):+ self.frames.append(frame)+++async def test_end_of_stream_flush_waits_for_a_timer_flush_awaiting_its_output_index(api):+ store = api._current_response_store()+ entered, release = threading.Event(), threading.Event()+ real_index = store.output_index++ def slow_index(*args):+ entered.set()+ release.wait(5)+ return real_index(*args)++ store.output_index = slow_index+ sink = _Sink()+ stream = _ResponsesStream(api, sink, response_id='resp_race', model='m', created_at=0,+ conversation_history=[], user_message='hi', instructions=None,+ conversation=None, store=False, session_id='s', durable_key=('race-key', 'fp'))+ await stream.dispatch('hello')+ timer = stream._batch_timer+ assert await asyncio.to_thread(entered.wait, 5) # the timer flush is inside the off-loop index read++ async def end_of_stream(): # as _write_sse_responses runs it on the EOS sentinel+ stream.cancel_batch_timer()+ await stream.flush_batch()+ await stream.close_message_item()++ eos = asyncio.create_task(end_of_stream())+ for _ in range(5):+ await asyncio.sleep(0)+ release.set()+ await asyncio.gather(timer, eos)+ assert b'response.output_text.done' in b''.join(sink.frames)+ assert stream.final_response_text == 'hello'