Skip to content

fix: treat a single image value as one image instead of iterating it #737

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

fix: treat a single image value as one image instead of iterating it #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion ollama/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,10 @@ async def ps(self) -> ProcessResponse:
)


def _copy_images(images: Optional[Sequence[Union[Image, Any]]]) -> Iterator[Image]:
def _copy_images(images: Optional[Union[Image, Sequence[Union[Image, Any]]]]) -> Iterator[Image]:
if isinstance(images, (str, bytes, PathLike, Image)):
images = [images]

for image in images or []:
yield image if isinstance(image, Image) else Image(value=image)

Expand Down
54 changes: 54 additions & 0 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,60 @@ def test_client_chat_images(httpserver: HTTPServer, message_format: str, file_st
assert response['message']['content'] == "I don't know."


@pytest.mark.parametrize('image_content', (PNG_BASE64, PNG_BYTES))
def test_client_chat_single_image_not_in_list(httpserver: HTTPServer, image_content):
httpserver.expect_ordered_request(
'/api/chat',
method='POST',
json={
'model': 'dummy',
'messages': [
{
'role': 'user',
'content': 'Why is the sky blue?',
'images': [PNG_BASE64],
},
],
'tools': [],
'stream': False,
},
).respond_with_json(
{
'model': 'dummy',
'message': {
'role': 'assistant',
'content': "I don't know.",
},
}
)

client = Client(httpserver.url_for('/'))
response = client.chat('dummy', messages=[{'role': 'user', 'content': 'Why is the sky blue?', 'images': image_content}])
assert response['message']['content'] == "I don't know."


def test_client_generate_single_image_not_in_list(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/generate',
method='POST',
json={
'model': 'dummy',
'prompt': 'What is in this image?',
'images': [PNG_BASE64],
'stream': False,
},
).respond_with_json(
{
'model': 'dummy',
'response': 'A single pixel.',
}
)

client = Client(httpserver.url_for('/'))
response = client.generate('dummy', 'What is in this image?', images=PNG_BASE64)
assert response['response'] == 'A single pixel.'


def test_client_chat_format_json(httpserver: HTTPServer):
httpserver.expect_ordered_request(
'/api/chat',
Expand Down