-
Notifications
You must be signed in to change notification settings - Fork 52.4k
fix(agent): JSON-serialize non-string tool results to prevent API 400 #29920
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hermesagent26
wants to merge
1
commit into
NousResearch:main
Choose a base branch
from
hermesagent26:fix/tool-result-content-serialization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+19
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3346,6 +3346,13 @@ def _tool_result_content_for_active_model(self, tool_name: str, result: Any) -> | |
| the agent has a chance to recover. | ||
| """ | ||
| if not _is_multimodal_tool_result(result): | ||
| # Non-multimodal results must be string-safe for the API. MCP tools | ||
| # (and a few native helpers) can return Python dicts/lists that the | ||
| # OpenAI SDK serializes as nested objects, causing HTTP 400 | ||
| # "invalid message content type: map[string]interface {}" because | ||
| # the API expects `content` to be a string or a content-parts list. | ||
| if not isinstance(result, str): | ||
| return json.dumps(result, ensure_ascii=False, default=str) | ||
| return result | ||
|
|
||
| content = result.get("content") or [] | ||
|
|
@@ -3658,6 +3665,10 @@ def _needs_kimi_tool_reasoning(self) -> bool: | |
| or base_url_host_matches(self.base_url, "api.kimi.com") | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This Kimi/Ollama reasoning change is unrelated to the stated serialization fix. Please split it out: current main documents Kimi detection as host-driven specifically to avoid model-name routing ( |
||
| or base_url_host_matches(self.base_url, "moonshot.ai") | ||
| or base_url_host_matches(self.base_url, "moonshot.cn") | ||
| or ( | ||
| "kimi" in (self.model or "").lower() | ||
| and self.provider == "ollama-cloud" | ||
| ) | ||
| ) | ||
|
|
||
| def _needs_deepseek_tool_reasoning(self) -> bool: | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This blanket check also serializes valid OpenAI content-part lists.
_tool_result_content_for_active_modelintentionally returns such a list for multimodal results, so the final sanitizer would turn a vision payload into JSON text. Preserve valid lists and coerce only invalid tool-content shapes.