Fix tool parsing for ollama #1597
Merged
Conversation
This file contains 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
dirkbrnd
commented
Dec 18, 2024
cookbook/providers/ollama/agent.py
Outdated
| @@ -18,3 +19,13 @@ | |||
|
|
|||
| # Print the response in the terminal | |||
| agent.print_response("What is the stock price of NVDA and TSLA") | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Another example with a more complex tool
|
Also need to run format and validation script |
manthanguptaa
approved these changes
Dec 18, 2024
cookbook/providers/ollama/agent.py
Outdated
Comment on lines
24
to
31
|
|
||
| agent = Agent( | ||
| model=Ollama(id="llama3.1:8b"), | ||
| tools=[Crawl4aiTools(max_length=1000)], | ||
| show_tool_calls=True | ||
| ) | ||
| agent.print_response("Summarize me the key points in bullet points of this: https://blog.google/products/gemini/google-gemini-deep-research/", | ||
| stream=True) |
There was a problem hiding this comment.
let's put this in agent_stream.py file
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.
Description
Ollama requires a specific formatting for JSONschema tools where parameter types can only be a string, never a list of strings (which is actually valid JSONschema). To compensate for this we ensure optional parameters where the type is
['string', 'null']is transformed to just'string'to be compatible.This should not have impact, because we provide a list of "required" parameters with function definitions.
Fixes #1584
Type of change
Please check the options that are relevant:
Checklist