Repository navigation
fix: add id to Message.ToolCall and tool_call_id to Message (#667) - #769
Open
Madhavkannank wants to merge 2 commits into
Open
Madhavkannank wants to merge 2 commits into
Madhavkannank wants to merge 2 commits into
Conversation
There was a problem hiding this comment.
Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.
An organization owner can choose the repository organization as the billing source for reviews requested by members with a paid Copilot license. Learn about Copilot code review billing. Review the Copilot code review billing settings.
This branch has not been deployed
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
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
The Ollama Go server backend exposes both
ToolCall.ID(when a model requests a tool call) andMessage.ToolCallID(when returning arole: "tool"execution result back to the model, as seen inollama/api/types.go).Previously in
ollama-python:Message.ToolCalllacked theidfield, causing server-returned tool call IDs to be dropped.Messagelacked thetool_call_idfield, causing incomingrole: "tool"messages in_copy_messages()to droptool_call_idduringMessage.model_validate(...)serialization.This PR provides the complete two-way tool correlation fix, directly resolving the missing tool-result correlation identified in PR #712.
Changes
id: Optional[str] = NonetoMessage.ToolCallinollama/_types.py.tool_call_id: Optional[str] = NonetoMessageinollama/_types.py.tests/test_client.pyfor bothClient.chatandAsyncClient.chatverifying:idparsing from server responsestool_call['id'])idis omitted by the servermodel_dump())tool_call_idonrole: "tool"messages through_copy_messages()into outbound/api/chatrequests.Fixes #667