github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-08-17 16:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ollama: update _convert_content_blocks_to_ollama_format for robustness

Browse Source
This commit is contained in:
Mason Daugherty 2025-08-04 15:52:25 -04:00
parent 5b7df921df
commit 7b89cabd0b
No known key found for this signature in database
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/partners/ollama/langchain_ollama/_compat.py
View File

@ -40,10 +40,13 @@ def _convert_content_blocks_to_ollama_format(
"""Convert v1 content blocks to Ollama API format. """Convert v1 content blocks to Ollama API format.
Returns: Returns:
Tuple of (text_content, images, tool_calls) Tuple of `(text_content, images, tool_calls)`
""" """
text_content = "" text_content = ""
images = [] images = []
"""Base64 encoded image data."""
tool_calls = [] tool_calls = []
for block in content: for block in content:
@ -54,13 +57,22 @@ def _convert_content_blocks_to_ollama_format(
elif block_type == "image": elif block_type == "image":
image_block = cast(ImageContentBlock, block) image_block = cast(ImageContentBlock, block)
if image_block.get("base64"): if image_block.get("base64"):
# Ollama doesn't need MIME type or other metadata
if not isinstance(image_block.get("base64"), str):
# (This shouldn't happen in practice, but just in case)
msg = "Image content must be base64 encoded string"
raise ValueError(msg)
if not image_block.get("base64", "").strip():
msg = "Image content cannot be empty"
raise ValueError(msg)
# Ensure we have plain/raw base64 data
if image_block.get("base64", "").startswith("data:"):
# Strip the data URI scheme (e.g., 'data:image/png;base64,')
image_block["base64"] = image_block.get("base64", "").split(",")[1]
images.append(image_block.get("base64", "")) images.append(image_block.get("base64", ""))
else: else:
msg = "Only base64 image data is supported by Ollama" msg = "Only base64 image data is supported by Ollama"
raise ValueError(msg) raise ValueError(msg)
elif block_type == "audio":
msg = "Audio content blocks are not supported by Ollama"
raise ValueError(msg)
elif block_type == "tool_call": elif block_type == "tool_call":
tool_call_block = cast(ToolCall, block) tool_call_block = cast(ToolCall, block)
tool_calls.append( tool_calls.append(
@ -73,7 +85,10 @@ def _convert_content_blocks_to_ollama_format(
}, },
} }
) )
# Skip other content block types that aren't supported else:
# Skip other content block types that aren't supported
msg = f"Unsupported content block type: {block_type}"
raise ValueError(msg)
return text_content, images, tool_calls return text_content, images, tool_calls