8000 Fix ollama provider error. by knaou · Pull Request #1344 · google/adk-python · GitHub
[go: up one dir, main page]
Skip to content

Fix ollama provider error. #1344

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

Fix ollama provider error. #1344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e07b1
fix: ollama provider error.
knaou Jun 12, 2025
4d8b12c
Merge branch 'main' into fix_ollama_error
knaou Jun 19, 2025
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
56 changes: 28 additions & 28 deletions src/google/adk/models/lite_llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,36 +175,36 @@ def _content_to_message_param(
role = _to_litellm_role(content.role)
message_content = _get_content(content.parts) or None

if role == "user":
return ChatCompletionUserMessage(role="user", content=message_content)
else: # assistant/model
tool_calls = []
content_present = False
for part in content.parts:
if part.function_call:
tool_calls.append(
ChatCompletionAssistantToolCall(
type="function",
id=part.function_call.id,
function=Function(
name=part.function_call.name,
arguments=_safe_json_serialize(part.function_call.args),
),
)
)
elif part.text or part.inline_data:
content_present = True

final_content = message_content if content_present else None
if final_content and isinstance(final_content, list):
# when the content is a single text object, we can use it directly.
# this is needed for ollama_chat provider which fails if content is a list
final_content = (
final_content[0].get("text", "")
if final_content[0].get("type", None) == "text"
else final_content
tool_calls = []
content_present = False
for part in content.parts:
if part.function_call:
tool_calls.append(
ChatCompletionAssistantToolCall(
type="function",
id=part.function_call.id,
function=Function(
name=part.function_call.name,
arguments=_safe_json_serialize(part.function_call.args),
),
)
)
elif part.text or part.inline_data:
content_present = True

final_content = message_content if content_present else None
if final_content and isinstance(final_content, list):
# when the content is a single text object, we can use it directly.
# this is needed for ollama_chat provider which fails if content is a list
final_content = (
final_content[0].get("text", "")
if final_content[0].get("type", None) == "text"
else final_content
)

if role == "user":
return ChatCompletionUserMessage(role="user", content=final_content)
else: # assistant/model
return ChatCompletionAssistantMessage(
role=role,
content=final_content,
Expand Down
0