scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-11-05 07:37:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 233

Merge 707257c357 into cfc651dcd5

Browse source
This commit is contained in:
Kenneth Bingham 2026-10-28 11:32:48 -04:00 • committed by GitHub
commit 43cd2811e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 63 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
litellm/llms/ollama/chat/transformation.py
View file

@ -257,7 +257,8 @@ class OllamaChatConfig(BaseConfig):
function=OllamaToolCallFunction(
name=typed_tool["function"].get("name") or "",
arguments=arguments,
)
),
**({"id": tool_id} if (tool_id := typed_tool.get("id")) is not None else {}),
)
new_tools.append(ollama_tool_call)
reasoning_content, parsed_content = extract_reasoning_content(cast(dict, m))

3
litellm/types/llms/ollama.py
View file

@ -1,4 +1,6 @@
from typing_extensions import (
NotRequired,
ReadOnly,
Required,
TypedDict,
)
@ -12,6 +14,7 @@ class OllamaToolCallFunction(
class OllamaToolCall(TypedDict):
id: NotRequired[ReadOnly[str]]
function: OllamaToolCallFunction

58
tests/unit/llms/ollama/test_ollama_chat_transformation.py
View file

@ -854,6 +854,64 @@ class TestOllamaReasoningContentStreaming:
class TestOllamaToolCallTransformation:
@pytest.mark.parametrize("stream", [False, True])
def test_transform_request_keeps_parallel_call_ids_paired_with_results(self, stream: bool) -> None:
result: Final = OllamaChatConfig().transform_request(
model="minimax-m3.1-flash",
messages=[
{
"role": "assistant",
"content": "",
"tool_calls": [
{
"id": "call_first",
"type": "function",
"function": {"name": "read_fixture", "arguments": '{"path":"first.txt"}'},
},
{
"id": "call_second",
"type": "function",
"function": {"name": "read_fixture", "arguments": '{"path":"second.txt"}'},
},
],
},
{"role": "tool", "tool_call_id": "call_second", "content": "second result"},
{"role": "tool", "tool_call_id": "call_first", "content": "first result"},
],
optional_params={"stream": stream},
litellm_params={},
headers={},
)
assert result["messages"][0]["tool_calls"] == [
{"id": "call_first", "function": {"name": "read_fixture", "arguments": {"path": "first.txt"}}},
{"id": "call_second", "function": {"name": "read_fixture", "arguments": {"path": "second.txt"}}},
]
assert result["messages"][1:] == [
{"role": "tool", "tool_call_id": "call_second", "content": "second result", "images": []},
{"role": "tool", "tool_call_id": "call_first", "content": "first result", "images": []},
]
assert result["stream"] is stream
def test_transform_request_does_not_invent_an_id_for_an_unidentified_call(self) -> None:
result: Final = OllamaChatConfig().transform_request(
model="minimax-m3.1-flash",
messages=[
{
"role": "assistant",
"content": "",
"tool_calls": [
{"id": None, "type": "function", "function": {"name": "read_fixture", "arguments": "{}"}}
],
}
],
optional_params={},
litellm_params={},
headers={},
)
assert result["messages"][0]["tool_calls"] == [{"function": {"name": "read_fixture", "arguments": {}}}]
def test_transform_request_preserves_tool_calls(self):
"""
tool_calls on assistant messages must survive transform_request.