mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
fix(agent): recover Codex streams with null output
This commit is contained in:
Carlton
Teknium
parent
bb4703c761
commit
43a3f119fc
4 changed files with 250 additions and 62 deletions
|
|
@ -107,6 +107,32 @@ from utils import base_url_host_matches, base_url_hostname, normalize_proxy_env_
|
|||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _responses_null_output_iterable_error(exc: BaseException) -> bool:
|
||||
"""True when the OpenAI SDK trips over terminal response.output=None."""
|
||||
text = str(exc)
|
||||
return isinstance(exc, TypeError) and "NoneType" in text and "not iterable" in text
|
||||
|
||||
|
||||
def _responses_backfilled_response(output_items: List[Any], text_parts: List[str], *, has_function_calls: bool, model: str = None) -> Optional[Any]:
|
||||
"""Build a minimal Responses-like object from already streamed events."""
|
||||
if output_items:
|
||||
return SimpleNamespace(output=list(output_items), usage=None, status="completed", model=model)
|
||||
if text_parts and not has_function_calls:
|
||||
assembled = "".join(text_parts)
|
||||
return SimpleNamespace(
|
||||
output=[SimpleNamespace(
|
||||
type="message",
|
||||
role="assistant",
|
||||
status="completed",
|
||||
content=[SimpleNamespace(type="output_text", text=assembled)],
|
||||
)],
|
||||
usage=None,
|
||||
status="completed",
|
||||
model=model,
|
||||
)
|
||||
return None
|
||||
|
||||
|
||||
def _safe_isinstance(obj: Any, maybe_type: Any) -> bool:
|
||||
"""Return False instead of raising when a patched symbol is not a type."""
|
||||
try:
|
||||
|
|
@ -796,44 +822,61 @@ class _CodexCompletionsAdapter:
|
|||
timeout_timer.daemon = True
|
||||
timeout_timer.start()
|
||||
_check_cancelled()
|
||||
final = None
|
||||
with self._client.responses.stream(**resp_kwargs) as stream:
|
||||
for _event in stream:
|
||||
try:
|
||||
for _event in stream:
|
||||
_check_cancelled()
|
||||
_etype = getattr(_event, "type", "")
|
||||
if _etype == "response.output_item.done":
|
||||
_done = getattr(_event, "item", None)
|
||||
if _done is not None:
|
||||
collected_output_items.append(_done)
|
||||
elif "output_text.delta" in _etype:
|
||||
_delta = getattr(_event, "delta", "")
|
||||
if _delta:
|
||||
collected_text_deltas.append(_delta)
|
||||
elif "function_call" in _etype:
|
||||
has_function_calls = True
|
||||
_check_cancelled()
|
||||
_etype = getattr(_event, "type", "")
|
||||
if _etype == "response.output_item.done":
|
||||
_done = getattr(_event, "item", None)
|
||||
if _done is not None:
|
||||
collected_output_items.append(_done)
|
||||
elif "output_text.delta" in _etype:
|
||||
_delta = getattr(_event, "delta", "")
|
||||
if _delta:
|
||||
collected_text_deltas.append(_delta)
|
||||
elif "function_call" in _etype:
|
||||
has_function_calls = True
|
||||
_check_cancelled()
|
||||
final = stream.get_final_response()
|
||||
final = stream.get_final_response()
|
||||
except TypeError as exc:
|
||||
if not _responses_null_output_iterable_error(exc):
|
||||
raise
|
||||
final = _responses_backfilled_response(
|
||||
collected_output_items,
|
||||
collected_text_deltas,
|
||||
has_function_calls=has_function_calls,
|
||||
model=resp_kwargs.get("model"),
|
||||
)
|
||||
if final is None:
|
||||
raise
|
||||
logger.debug(
|
||||
"Codex auxiliary Responses stream parser hit response.output=None; "
|
||||
"recovered from streamed events (items=%d, text_parts=%d)",
|
||||
len(collected_output_items),
|
||||
len(collected_text_deltas),
|
||||
)
|
||||
|
||||
if final is None:
|
||||
raise RuntimeError("Codex auxiliary Responses stream did not return a final response")
|
||||
|
||||
# Backfill empty output from collected stream events
|
||||
_output = getattr(final, "output", None)
|
||||
if isinstance(_output, list) and not _output:
|
||||
if collected_output_items:
|
||||
final.output = list(collected_output_items)
|
||||
if _output is None or (isinstance(_output, list) and not _output):
|
||||
recovered = _responses_backfilled_response(
|
||||
collected_output_items,
|
||||
collected_text_deltas,
|
||||
has_function_calls=has_function_calls,
|
||||
model=resp_kwargs.get("model"),
|
||||
)
|
||||
if recovered is not None:
|
||||
final.output = recovered.output
|
||||
logger.debug(
|
||||
"Codex auxiliary: backfilled %d output items from stream events",
|
||||
"Codex auxiliary: backfilled missing output from stream events "
|
||||
"(items=%d, text_parts=%d)",
|
||||
len(collected_output_items),
|
||||
)
|
||||
elif collected_text_deltas and not has_function_calls:
|
||||
# Only synthesize text when no tool calls were streamed —
|
||||
# a function_call response with incidental text should not
|
||||
# be collapsed into a plain-text message.
|
||||
assembled = "".join(collected_text_deltas)
|
||||
final.output = [SimpleNamespace(
|
||||
type="message", role="assistant", status="completed",
|
||||
content=[SimpleNamespace(type="output_text", text=assembled)],
|
||||
)]
|
||||
logger.debug(
|
||||
"Codex auxiliary: synthesized from %d deltas (%d chars)",
|
||||
len(collected_text_deltas), len(assembled),
|
||||
len(collected_text_deltas),
|
||||
)
|
||||
|
||||
# Extract text and tool calls from the Responses output.
|
||||
|
|
|
|||
|
|
@ -176,6 +176,37 @@ def run_codex_app_server_turn(
|
|||
|
||||
|
||||
|
||||
def _responses_null_output_iterable_error(exc: BaseException) -> bool:
|
||||
"""True when the OpenAI SDK trips over terminal response.output=None."""
|
||||
text = str(exc)
|
||||
return isinstance(exc, TypeError) and "NoneType" in text and "not iterable" in text
|
||||
|
||||
|
||||
def _codex_backfilled_response(output_items: list, text_parts: list, *, has_tool_calls: bool, model: str = None):
|
||||
"""Build a minimal Responses-like object from events already streamed."""
|
||||
if output_items:
|
||||
return SimpleNamespace(
|
||||
output=list(output_items),
|
||||
usage=None,
|
||||
status="completed",
|
||||
model=model,
|
||||
)
|
||||
if text_parts and not has_tool_calls:
|
||||
assembled = "".join(text_parts)
|
||||
return SimpleNamespace(
|
||||
output=[SimpleNamespace(
|
||||
type="message",
|
||||
role="assistant",
|
||||
status="completed",
|
||||
content=[SimpleNamespace(type="output_text", text=assembled)],
|
||||
)],
|
||||
usage=None,
|
||||
status="completed",
|
||||
model=model,
|
||||
)
|
||||
return None
|
||||
|
||||
|
||||
def run_codex_stream(agent, api_kwargs: dict, client: Any = None, on_first_delta: callable = None):
|
||||
"""Execute one streaming Responses API request and return the final response."""
|
||||
import httpx as _httpx
|
||||
|
|
@ -251,24 +282,20 @@ def run_codex_stream(agent, api_kwargs: dict, client: Any = None, on_first_delta
|
|||
# but get_final_response() can return an empty output list.
|
||||
# Backfill from collected items or synthesize from deltas.
|
||||
_out = getattr(final_response, "output", None)
|
||||
if isinstance(_out, list) and not _out:
|
||||
if collected_output_items:
|
||||
final_response.output = list(collected_output_items)
|
||||
if _out is None or (isinstance(_out, list) and not _out):
|
||||
recovered = _codex_backfilled_response(
|
||||
collected_output_items,
|
||||
agent._codex_streamed_text_parts,
|
||||
has_tool_calls=has_tool_calls,
|
||||
model=api_kwargs.get("model"),
|
||||
)
|
||||
if recovered is not None:
|
||||
final_response.output = recovered.output
|
||||
logger.debug(
|
||||
"Codex stream: backfilled %d output items from stream events",
|
||||
"Codex stream: backfilled missing output from stream events "
|
||||
"(items=%d, text_parts=%d)",
|
||||
len(collected_output_items),
|
||||
)
|
||||
elif agent._codex_streamed_text_parts and not has_tool_calls:
|
||||
assembled = "".join(agent._codex_streamed_text_parts)
|
||||
final_response.output = [SimpleNamespace(
|
||||
type="message",
|
||||
role="assistant",
|
||||
status="completed",
|
||||
content=[SimpleNamespace(type="output_text", text=assembled)],
|
||||
)]
|
||||
logger.debug(
|
||||
"Codex stream: synthesized output from %d text deltas (%d chars)",
|
||||
len(agent._codex_streamed_text_parts), len(assembled),
|
||||
len(agent._codex_streamed_text_parts),
|
||||
)
|
||||
return final_response
|
||||
except (_httpx.RemoteProtocolError, _httpx.ReadTimeout, _httpx.ConnectError, ConnectionError) as exc:
|
||||
|
|
@ -287,6 +314,30 @@ def run_codex_stream(agent, api_kwargs: dict, client: Any = None, on_first_delta
|
|||
exc,
|
||||
)
|
||||
return agent._run_codex_create_stream_fallback(api_kwargs, client=active_client)
|
||||
except TypeError as exc:
|
||||
if _responses_null_output_iterable_error(exc):
|
||||
recovered = _codex_backfilled_response(
|
||||
collected_output_items,
|
||||
agent._codex_streamed_text_parts,
|
||||
has_tool_calls=has_tool_calls,
|
||||
model=api_kwargs.get("model"),
|
||||
)
|
||||
if recovered is not None:
|
||||
logger.debug(
|
||||
"Codex Responses stream parser hit response.output=None; "
|
||||
"recovered from streamed events (items=%d, text_parts=%d). %s",
|
||||
len(collected_output_items),
|
||||
len(agent._codex_streamed_text_parts),
|
||||
agent._client_log_context(),
|
||||
)
|
||||
return recovered
|
||||
logger.debug(
|
||||
"Codex Responses stream parser hit response.output=None without "
|
||||
"recoverable events; falling back to create(stream=True). %s",
|
||||
agent._client_log_context(),
|
||||
)
|
||||
return agent._run_codex_create_stream_fallback(api_kwargs, client=active_client)
|
||||
raise
|
||||
except RuntimeError as exc:
|
||||
err_text = str(exc)
|
||||
missing_completed = "response.completed" in err_text
|
||||
|
|
@ -355,6 +406,7 @@ def run_codex_create_stream_fallback(agent, api_kwargs: dict, client: Any = None
|
|||
terminal_response = None
|
||||
collected_output_items: list = []
|
||||
collected_text_deltas: list = []
|
||||
has_tool_calls = False
|
||||
try:
|
||||
for event in stream_or_response:
|
||||
agent._touch_activity("receiving stream response")
|
||||
|
|
@ -404,6 +456,8 @@ def run_codex_create_stream_fallback(agent, api_kwargs: dict, client: Any = None
|
|||
delta = event.get("delta", "")
|
||||
if delta:
|
||||
collected_text_deltas.append(delta)
|
||||
elif event_type and "function_call" in event_type:
|
||||
has_tool_calls = True
|
||||
|
||||
if event_type not in {"response.completed", "response.incomplete", "response.failed"}:
|
||||
continue
|
||||
|
|
@ -414,23 +468,20 @@ def run_codex_create_stream_fallback(agent, api_kwargs: dict, client: Any = None
|
|||
if terminal_response is not None:
|
||||
# Backfill empty output from collected stream events
|
||||
_out = getattr(terminal_response, "output", None)
|
||||
if isinstance(_out, list) and not _out:
|
||||
if collected_output_items:
|
||||
terminal_response.output = list(collected_output_items)
|
||||
if _out is None or (isinstance(_out, list) and not _out):
|
||||
recovered = _codex_backfilled_response(
|
||||
collected_output_items,
|
||||
collected_text_deltas,
|
||||
has_tool_calls=has_tool_calls,
|
||||
model=fallback_kwargs.get("model"),
|
||||
)
|
||||
if recovered is not None:
|
||||
terminal_response.output = recovered.output
|
||||
logger.debug(
|
||||
"Codex fallback stream: backfilled %d output items",
|
||||
"Codex fallback stream: backfilled missing output "
|
||||
"(items=%d, text_parts=%d)",
|
||||
len(collected_output_items),
|
||||
)
|
||||
elif collected_text_deltas:
|
||||
assembled = "".join(collected_text_deltas)
|
||||
terminal_response.output = [SimpleNamespace(
|
||||
type="message", role="assistant",
|
||||
status="completed",
|
||||
content=[SimpleNamespace(type="output_text", text=assembled)],
|
||||
)]
|
||||
logger.debug(
|
||||
"Codex fallback stream: synthesized from %d deltas (%d chars)",
|
||||
len(collected_text_deltas), len(assembled),
|
||||
len(collected_text_deltas),
|
||||
)
|
||||
return terminal_response
|
||||
finally:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue