tools: loosen tool argument parsing #11509
Merged
Conversation
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
ParthSareen
reviewed
Jul 23, 2025
Comment on lines
+246
to
+251
| if args, ok := obj["arguments"].(map[string]any); ok { | ||
| return args, true | ||
| } | ||
| if args, ok := obj["parameters"].(map[string]any); ok { | ||
| return args, true | ||
| } |
There was a problem hiding this comment.
I kind of remember that nested examples broke with something like this last time I wrote it. Maybe double check models like cohere still work
ParthSareen
approved these changes
Jul 23, 2025
|
Checked with:
With some heavier tool use tests |
|
I was just about to request this feature (support for |
gabe-l-hart
added a commit
to gabe-l-hart/ollama
that referenced
this pull request
Jul 25, 2025
* origin/main: cli: catch upstream errors gracefully (ollama#11512) tools: loosen tool argument parsing (ollama#11509) server: use slices.Equal to simplify code (ollama#11502) s#x/exp/maps#maps# (ollama#11506) Fix GetModelInfo (ollama#11496) Update linux.md (ollama#11462)
rick-github
pushed a commit
to rick-github/ollama
that referenced
this pull request
Aug 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR loosens tool call parsing in two ways:
It tightens parsing in one way: tool calls without arguments such as
{"name": "say_hello"}will no longer be parsed. This should be a non use caseFixes #11505