tools: fix issue with tools that are substrings of others #11456
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
e59d9c0 to
47d220a
Compare
rick-github
approved these changes
Jul 18, 2025
Co-authored-by: frob <rick+github@frob.com.au>
47d220a to
c3e9a4e
Compare
gabe-l-hart
added a commit
to gabe-l-hart/ollama
that referenced
this pull request
Jul 21, 2025
* origin/main: readme: add GMAI - Gradle Managed to community integrations (ollama#11461) tools: fix parsing issue when a tool name is a substring of another (ollama#11456) readme: update argo description to support deep research (ollama#11455) ci: switch mac builder to arm64 (ollama#11379) docs: add the no-Modelfile function of `ollama create` (ollama#9077) openai: allow openai endpoint to accept webp images (ollama#11412) readme: update the llama.cpp github link (ollama#11427) compile bf16 support into ggml-metal (ollama#11430) cmd: add default assistant role to message construction (ollama#11431) api: fix unreachable status err (ollama#11423) docs: fix typo in macos.md (ollama#11425)
rick-github
added a commit
to rick-github/ollama
that referenced
this pull request
Aug 20, 2025
…llama#11456) Co-authored-by: frob <rick+github@frob.com.au>
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.
Builds on #11386
@rick-github sorry to open a different PR – there were a few tricky streaming use cases I handled building on your PR. I've added you as a co-author