Skip to content

Commit 7d42f0d

Browse files
committed
remove DONE when getting error
1 parent b5b2086 commit 7d42f0d

File tree

3 files changed

+10
-34
lines changed

3 files changed

+10
-34
lines changed

sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/agent_framework.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -225,32 +225,6 @@ async def stream_updates():
225225
update_count += 1
226226
yield event
227227

228-
# timeout_s = self._resolve_stream_timeout(context.request)
229-
# logger.info("Starting streaming with idle-timeout=%.2fs", timeout_s)
230-
# for ev in streaming_converter.initial_events():
231-
# yield ev
232-
#
233-
# # Iterate with per-update timeout; terminate if idle too long
234-
# aiter = agent.run_stream(message).__aiter__()
235-
# while True:
236-
# try:
237-
# update = await asyncio.wait_for(aiter.__anext__(), timeout=timeout_s)
238-
# except StopAsyncIteration:
239-
# logger.debug("Agent streaming iterator finished (StopAsyncIteration)")
240-
# break
241-
# except asyncio.TimeoutError:
242-
# logger.warning(
243-
# "Streaming idle timeout reached (%.1fs); terminating stream.", timeout_s
244-
# )
245-
# for ev in streaming_converter.completion_events():
246-
# yield ev
247-
# return
248-
# update_count += 1
249-
# transformed = streaming_converter.transform_output_for_streaming(update)
250-
# for event in transformed:
251-
# yield event
252-
# for ev in streaming_converter.completion_events():
253-
# yield ev
254228
logger.info("Streaming completed with %d updates", update_count)
255229
finally:
256230
# Close tool_client if it was created for this request

sdk/agentserver/azure-ai-agentserver-agentframework/azure/ai/agentserver/agentframework/models/agent_framework_output_streaming_converter.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,13 +299,16 @@ async def convert(self, updates: AsyncIterable[AgentRunResponseUpdate]) -> Async
299299
elif isinstance(first, FunctionResultContent):
300300
state = _FunctionCallOutputStreamingState(self)
301301
elif isinstance(first, ErrorContent):
302-
yield ResponseErrorEvent(
303-
sequence_number=self.next_sequence(),
304-
code=getattr(first, "error_code", None) or "server_error",
305-
message=getattr(first, "message", None) or "An error occurred",
306-
param="",
307-
)
308-
continue
302+
code=getattr(first, "error_code", None) or "server_error"
303+
message=getattr(first, "message", None) or "An error occurred"
304+
raise ValueError(f"ErrorContent received: code={code}, message={message}")
305+
# yield ResponseErrorEvent(
306+
# sequence_number=self.next_sequence(),
307+
# code=getattr(first, "error_code", None) or "server_error",
308+
# message=getattr(first, "message", None) or "An error occurred",
309+
# param="",
310+
# )
311+
# continue
309312
if not state:
310313
continue
311314

sdk/agentserver/azure-ai-agentserver-core/azure/ai/agentserver/core/server/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ def gen():
158158
logger.error("Error in non-async generator: %s\n%s", e, traceback.format_exc())
159159
payload = {"error": err_msg}
160160
yield f"event: error\ndata: {json.dumps(payload)}\n\n"
161-
yield "data: [DONE]\n\n"
162161
error_sent = True
163162
finally:
164163
logger.info("End of processing CreateResponse request.")

0 commit comments

Comments
 (0)