bugfix: fix passing Image type in messages for chat (#390)

---------

Co-authored-by: Aarni Koskela <akx@iki.fi>

Author: ParthSareen

ollama/_client.py

@@ -252,7 +252,7 @@ def generate(
         stream=stream,
         raw=raw,
         format=format,
-        images=[Image(value=image) for image in images] if images else None,
+        images=[image for image in _copy_images(images)] if images else None,
         options=options,
         keep_alive=keep_alive,
       ).model_dump(exclude_none=True),
@@ -753,7 +753,7 @@ async def generate(
         stream=stream,
         raw=raw,
         format=format,
-        images=[Image(value=image) for image in images] if images else None,
+        images=[image for image in _copy_images(images)] if images else None,
         options=options,
         keep_alive=keep_alive,
       ).model_dump(exclude_none=True),
@@ -1121,10 +1121,15 @@ async def ps(self) -> ProcessResponse:
     )
 
 
+def _copy_images(images: Optional[Sequence[Union[Image, Any]]]) -> Iterator[Image]:
+  for image in images or []:
+    yield image if isinstance(image, Image) else Image(value=image)
+
+
 def _copy_messages(messages: Optional[Sequence[Union[Mapping[str, Any], Message]]]) -> Iterator[Message]:
   for message in messages or []:
     yield Message.model_validate(
-      {k: [Image(value=image) for image in v] if k == 'images' else v for k, v in dict(message).items() if v},
+      {k: [image for image in _copy_images(v)] if k == 'images' else v for k, v in dict(message).items() if v},
     )
 
 

poetry.lock

@@ -18,7 +18,6 @@ pytest = ">=7.4.3,<9.0.0"
 pytest-asyncio = ">=0.23.2,<0.25.0"
 pytest-cov = ">=4.1,<6.0"
 pytest-httpserver = "^1.0.8"
-pillow = "^10.2.0"
 ruff = ">=0.1.8,<0.8.0"
 
 [build-system]