Skip to content

Fix ollama_chat vision models #8582

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.

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 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
37 changes: 36 additions & 1 deletion dspy/clients/lm.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from copy import deepcopy
import logging
import os
import re
Expand Down Expand Up @@ -300,15 +301,49 @@ async def async_stream_completion():
return async_stream_completion


def _modify_ollama_request(request):
"""Draft version to make it work on my machine / on my test"""
messages = request["messages"]
request["messages"] = []
for message in messages:
new_message = dict(
role=message["role"],
)
content = message["content"]
if isinstance(content, str):
new_message["content"] = content
request["messages"].append(new_message)
elif isinstance(content, list):
contents = message["content"]
new_message["content"] = []
for part in contents:
if part["type"] == "text":
new_message["content"].append(part["text"])
elif part["type"] == "image_url":
if "images" not in new_message:
new_message["images"] = []
new_message["images"].append(part["image_url"]["url"].split(",", 1)[1])
new_message["content"] = " ".join(new_message["content"])
request["messages"].append(new_message)
else:
NotImplementedError("Such content type is not supported")
return request


def litellm_completion(request: dict[str, Any], num_retries: int, cache: dict[str, Any] | None = None):
cache = cache or {"no-cache": True, "no-store": True}
stream_completion = _get_stream_completion_fn(request, cache, sync=True)
if request["model"].split("/")[0] == "ollama_chat":
modified_request = _modify_ollama_request(deepcopy(request))
else:
modified_request = request

if stream_completion is None:
return litellm.completion(
cache=cache,
num_retries=num_retries,
retry_strategy="exponential_backoff_retry",
**request,
**modified_request,
)

return stream_completion()
Expand Down
Loading