NeoAnd/adk-python
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/adk-python.git synced 2025-07-16 04:02:55 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ollama issues with ChatCompletionAssistantToolCall

Browse Source 
PiperOrigin-RevId: 761732316
This commit is contained in:
Google Team Member 2025-05-21 17:26:31 -07:00 committed by Copybara-Service
parent 505d936007
commit 4542af5650
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/google/adk/models/lite_llm.py
View File

@ -30,6 +30,7 @@ from typing import Union
from google.genai import types from google.genai import types
from litellm import acompletion from litellm import acompletion
from litellm import ChatCompletionAssistantMessage from litellm import ChatCompletionAssistantMessage
from litellm import ChatCompletionAssistantToolCall
from litellm import ChatCompletionDeveloperMessage from litellm import ChatCompletionDeveloperMessage
from litellm import ChatCompletionImageUrlObject from litellm import ChatCompletionImageUrlObject
from litellm import ChatCompletionMessageToolCall from litellm import ChatCompletionMessageToolCall
@ -180,12 +181,12 @@ def _content_to_message_param(
for part in content.parts: for part in content.parts:
if part.function_call: if part.function_call:
tool_calls.append( tool_calls.append(
ChatCompletionMessageToolCall( ChatCompletionAssistantToolCall(
type="function", type="function",
id=part.function_call.id, id=part.function_call.id,
function=Function( function=Function(
name=part.function_call.name, name=part.function_call.name,
arguments=part.function_call.args, arguments=json.dumps(part.function_call.args),
), ),
) )
) )

13
tests/unittests/models/test_litellm.py
View File

@ -700,13 +700,12 @@ def test_content_to_message_param_function_call():
message = _content_to_message_param(content) message = _content_to_message_param(content)
assert message["role"] == "assistant" assert message["role"] == "assistant"
assert message["content"] == None assert message["content"] == None
assert message["tool_calls"][0].type == "function"
assert message["tool_calls"][0].id == "test_tool_call_id" tool_call = message["tool_calls"][0]
assert message["tool_calls"][0].function.name == "test_function" assert tool_call["type"] == "function"
assert ( assert tool_call["id"] == "test_tool_call_id"
message["tool_calls"][0].function.arguments assert tool_call["function"]["name"] == "test_function"
== '{"test_arg": "test_value"}' assert tool_call["function"]["arguments"] == '{"test_arg": "test_value"}'
)
def test_message_to_generate_content_response_text(): def test_message_to_generate_content_response_text():