Skip to content

fix: omit empty tools list from chat requests #768

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
Mrun25 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: omit empty tools list from chat requests #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ollama/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def add_two_numbers(a: int, b: int) -> int:
json=ChatRequest(
model=model,
messages=list(_copy_messages(messages)),
tools=list(_copy_tools(tools)),
tools=list(_copy_tools(tools)) or None,
stream=stream,
think=think,
logprobs=logprobs,
Expand Down Expand Up @@ -1055,7 +1055,7 @@ def add_two_numbers(a: int, b: int) -> int:
json=ChatRequest(
model=model,
messages=list(_copy_messages(messages)),
tools=list(_copy_tools(tools)),
tools=list(_copy_tools(tools)) or None,
stream=stream,
think=think,
logprobs=logprobs,
Expand Down
75 changes: 63 additions & 12 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from ollama._client import CONNECTION_ERROR_MESSAGE, AsyncClient, Client, _copy_tools
from ollama._types import Image, Message
from ollama._utils import convert_function_to_tool

PNG_BASE64 = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR4nGNgYGAAAAAEAAH2FzhVAAAAAElFTkSuQmCC'
PNG_BYTES = base64.b64decode(PNG_BASE64)
Expand Down Expand Up @@ -42,7 +43,6 @@ def test_client_chat(httpserver: HTTPServer):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'stream': False,
},
).respond_with_json(
Expand All @@ -62,14 +62,75 @@ def test_client_chat(httpserver: HTTPServer):
assert response['message']['content'] == "I don't know."


def test_client_chat_omits_tools_for_empty_list(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/chat',
method='POST',
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Hi'}],
'stream': False,
},
).respond_with_json(
{
'model': 'dummy',
'message': {
'role': 'assistant',
'content': 'Hello!',
},
}
)

client = Client(httpserver.url_for('/'))
response = client.chat('dummy', messages=[{'role': 'user', 'content': 'Hi'}], tools=[])
assert response['message']['content'] == 'Hello!'


def test_client_chat_sends_tools_when_provided(httpserver: HTTPServer):
def add_two_numbers(a: int, b: int) -> int:
"""
Add two numbers.

Args:
a: First number.
b: Second number.

Returns:
int: The sum of the two numbers.
"""
return a + b

httpserver.expect_ordered_request(
'/api/chat',
method='POST',
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Hi'}],
'tools': [convert_function_to_tool(add_two_numbers).model_dump(exclude_none=True)],
'stream': False,
},
).respond_with_json(
{
'model': 'dummy',
'message': {
'role': 'assistant',
'content': 'Hello!',
},
}
)

client = Client(httpserver.url_for('/'))
response = client.chat('dummy', messages=[{'role': 'user', 'content': 'Hi'}], tools=[add_two_numbers])
assert response['message']['content'] == 'Hello!'


def test_client_chat_with_logprobs(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/chat',
method='POST',
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Hi'}],
'tools': [],
'stream': False,
'logprobs': True,
'top_logprobs': 3,
Expand Down Expand Up @@ -125,7 +186,6 @@ def generate():
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'stream': True,
},
).respond_with_handler(stream_handler)
Expand Down Expand Up @@ -156,7 +216,6 @@ def test_client_chat_images(httpserver: HTTPServer, message_format: str, file_st
'images': [PNG_BASE64],
},
],
'tools': [],
'stream': False,
},
).respond_with_json(
Expand Down Expand Up @@ -198,7 +257,6 @@ def test_client_chat_format_json(httpserver: HTTPServer):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'format': 'json',
'stream': False,
},
Expand Down Expand Up @@ -230,7 +288,6 @@ class ResponseFormat(BaseModel):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'format': {'title': 'ResponseFormat', 'type': 'object', 'properties': {'answer': {'title': 'Answer', 'type': 'string'}, 'confidence': {'title': 'Confidence', 'type': 'number'}}, 'required': ['answer', 'confidence']},
'stream': False,
},
Expand Down Expand Up @@ -258,7 +315,6 @@ async def test_async_client_chat_format_json(httpserver: HTTPServer):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'format': 'json',
'stream': False,
},
Expand Down Expand Up @@ -290,7 +346,6 @@ class ResponseFormat(BaseModel):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'format': {'title': 'ResponseFormat', 'type': 'object', 'properties': {'answer': {'title': 'Answer', 'type': 'string'}, 'confidence': {'title': 'Confidence', 'type': 'number'}}, 'required': ['answer', 'confidence']},
'stream': False,
},
Expand Down Expand Up @@ -887,7 +942,6 @@ async def test_async_client_chat(httpserver: HTTPServer):
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'stream': False,
},
).respond_with_json(
Expand Down Expand Up @@ -932,7 +986,6 @@ def generate():
json={
'model': 'dummy',
'messages': [{'role': 'user', 'content': 'Why is the sky blue?'}],
'tools': [],
'stream': True,
},
).respond_with_handler(stream_handler)
Expand All @@ -959,7 +1012,6 @@ async def test_async_client_chat_images(httpserver: HTTPServer):
'images': [PNG_BASE64],
},
],
'tools': [],
'stream': False,
},
).respond_with_json(
Expand Down Expand Up @@ -1507,7 +1559,6 @@ def test_client_chat_with_think_level(httpserver: HTTPServer):
json={
'model': 'qwen3.8:27b',
'messages': [{'role': 'user', 'content': 'Hello'}],
'tools': [],
'stream': False,
'think': 'xhigh',
},
Expand Down