[Madhavkannank]

Description

The Ollama Go server backend exposes both ToolCall.ID (when a model requests a tool call) and Message.ToolCallID (when returning a role: "tool" execution result back to the model, as seen in ollama/api/types.go).

Previously in ollama-python:

1. Message.ToolCall lacked the id field, causing server-returned tool call IDs to be dropped.
2. Message lacked the tool_call_id field, causing incoming role: "tool" messages in _copy_messages() to drop tool_call_id during Message.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

• Added id: Optional[str] = None to Message.ToolCall in ollama/_types.py.
• Added tool_call_id: Optional[str] = None to Message in ollama/_types.py.
• Added regression tests in tests/test_client.py for both Client.chat and AsyncClient.chat verifying:
  • Tool call id parsing from server responses
  • Subscript indexing access (tool_call['id'])
  • Backward compatibility when id is omitted by the server
  • Pydantic serialization round-trip (model_dump())
  • Tool result round-trip: preserving tool_call_id on role: "tool" messages through _copy_messages() into outbound /api/chat requests.

Fixes #667

[Copilot]

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.

[Copilot]

🟢 Approval recommended

No unresolved issues were identified, and the requested behavior is covered by regression tests.

No open issues 🎉

_{Review effort: Lite}

[Copilot]

🟢 Approval recommended

The reviewed changes are covered by regression tests and have no unresolved blocking issues.

No open issues 🎉

_{Review effort: Lite}

[Madhavkannank]

Hi @ParthSareen , could you please take a look or kick off the CI workflow when you have a moment? This fixes the missing tool linkage from #667. Thanks!

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

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.