Skip to content

types: make ChatRequest serialization None-safe for tools without parameters #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepanshupal wants to merge 2 commits into
base: main
Choose a base branch
from
Open

types: make ChatRequest serialization None-safe for tools without parameters #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8cc38f
types: make ChatRequest serialization None-safe for tools without par…
deepanshupal Oct 6, 2026
c11bce6
tests: cover ChatRequest serialization with tools missing function or…
deepanshupal Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ollama/_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,9 @@ def serialize_model(self, nxt):
output = nxt(self)
if output.get('tools'):
for tool in output['tools']:
if 'function' in tool and 'parameters' in tool['function'] and 'defs' in tool['function']['parameters']:
tool['function']['parameters']['$defs'] = tool['function']['parameters'].pop('defs')
parameters = (tool.get('function') or {}).get('parameters')
if parameters and 'defs' in parameters:
parameters['$defs'] = parameters.pop('defs')
return output

messages: Optional[Sequence[Union[Mapping[str, Any], Message]]] = None
Expand Down
16 changes: 15 additions & 1 deletion tests/test_type_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from ollama._types import ChatRequest, CreateRequest, GenerateRequest, Image
from ollama._types import ChatRequest, CreateRequest, GenerateRequest, Image, Tool


def test_image_serialization_bytes():
Expand Down Expand Up @@ -122,3 +122,17 @@ def test_think_boolean_serialization():
assert ChatRequest(model='test-model', think=True).model_dump(exclude_none=True)['think'] is True
assert ChatRequest(model='test-model', think=False).model_dump(exclude_none=True)['think'] is False
assert 'think' not in ChatRequest(model='test-model', think=None).model_dump(exclude_none=True)


def test_chat_request_dump_with_tools_missing_function_or_parameters():
req = ChatRequest(model='test-model', tools=[Tool(function=Tool.Function(name='f')), Tool()])
assert req.model_dump()['tools'][0]['function']['name'] == 'f'
assert req.model_dump(exclude_none=True)['tools'][0]['function'] == {'name': 'f'}
assert 'tools' in req.model_dump_json()


def test_chat_request_renames_defs_for_tool_parameters():
tool = Tool(function=Tool.Function(name='f', parameters=Tool.Function.Parameters(defs={'A': {'type': 'string'}})))
params = ChatRequest(model='test-model', tools=[tool]).model_dump()['tools'][0]['function']['parameters']
assert params['$defs'] == {'A': {'type': 'string'}}
assert 'defs' not in params