Keep no-prose assistant tool-call messages through _sanitize_llm_messages (#862)

cb13d09 made _append_tool_results emit content=None (JSON null) for a follow-up
assistant message that carries only tool_calls and no prose, because Gemini's
OpenAI-compatible endpoint and Ollama reject tool_calls alongside an
empty-string content with HTTP 400.

But _sanitize_llm_messages strips None values and then required "content" on
every message, so it dropped that assistant message entirely — leaving the
role:"tool" result dangling with no parent tool_calls, which breaks the
follow-up round for every provider (and regresses ones that accepted "" before,
since the message is now removed rather than sent). cb13d09's tests covered
_append_tool_results in isolation, so the sanitizer interaction was uncaught.

Make the sanitizer role-aware: assistant messages survive with content OR
tool_calls, and a tool-calls-only assistant message gets an explicit
content=None re-added so the provider receives spec-correct `content: null`.
tool messages still require content + tool_call_id; user/system still require
content.

Adds tests/test_llm_core_sanitize_tool_calls.py, which drives the real producer
(_append_tool_results) into the sanitizer and asserts the assistant tool-call
message survives with its tool result paired. Red before this change, green
after.
This commit is contained in:
mist
2026-06-02 05:17:22 +03:00
committed by GitHub
parent 290cd7f1cd
commit 1007703223
2 changed files with 86 additions and 2 deletions

View File

@@ -502,14 +502,37 @@ def _parse_anthropic_response(data: dict) -> str:
def _sanitize_llm_messages(messages: List[Dict]) -> List[Dict]:
"""Strip Odysseus-only metadata before sending messages to providers."""
"""Strip Odysseus-only metadata before sending messages to providers.
Per the OpenAI chat format: user/system messages must have content; a tool
message needs content + tool_call_id; an assistant message may carry content,
tool_calls, or both. The old guard required content on every message, which
dropped a valid assistant message that has only tool_calls — e.g. the
follow-up message _append_tool_results builds for a no-prose native tool call
(content=None, since Gemini/Ollama reject tool_calls alongside ""). Dropping
it leaves the tool result dangling and breaks the next round.
"""
allowed = {"role", "content", "name", "tool_call_id", "tool_calls", "function_call"}
cleaned = []
for msg in messages or []:
if not isinstance(msg, dict):
continue
item = {k: v for k, v in msg.items() if k in allowed and v is not None}
if "role" in item and "content" in item:
role = item.get("role")
if not role:
continue
if role == "assistant":
# Re-add an explicit content=None when the message is tool-calls-only
# (the None was stripped above) so the provider gets the spec-correct
# `content: null`, not an omitted key.
if "content" not in item and item.get("tool_calls"):
item["content"] = None
if "content" in item or item.get("tool_calls"):
cleaned.append(item)
elif role == "tool":
if "content" in item and "tool_call_id" in item:
cleaned.append(item)
elif "content" in item:
cleaned.append(item)
return cleaned