Merge 7b1088cc80 into f58a864951

pyproject.toml

@@ -42,6 +42,7 @@ dependencies = [
   "pathvalidate",
   "charset-normalizer",
   "openai",
+  "ollama"
 ]
 
 [project.urls]

src/markitdown/_markitdown.py

@@ -13,6 +13,7 @@ import sys
 import tempfile
 import traceback
 import zipfile
+from http.client import responses
 from xml.dom import minidom
 from typing import Any, Dict, List, Optional, Union
 from pathlib import Path
@@ -1096,24 +1097,42 @@ class ImageConverter(MediaConverter):
                 content_type = "image/jpeg"
             image_base64 = base64.b64encode(image_file.read()).decode("utf-8")
             data_uri = f"data:{content_type};base64,{image_base64}"
+        # check if Ollama client
+        if str(type(client)) == "<class 'ollama._client.Client'>":
+            messages = [
+                {
+                    "role": "user",
+                    "content": prompt,
+                    'images': [local_path]
 
-        messages = [
+                }
-            {
+            ]
-                "role": "user",
+
-                "content": [
+            response = client.chat(
-                    {"type": "text", "text": prompt},
+            model = model,
-                    {
+            messages = messages,
-                        "type": "image_url",
+
-                        "image_url": {
+        )
-                            "url": data_uri,
+
+            return response.message.content
+
+        else:# use openai
+            messages = [
+                {
+                    "role": "user",
+                    "content": [
+                        {"type": "text", "text": prompt},
+                        {
+                            "type": "image_url",
+                            "image_url": {
+                                "url": data_uri,
+                            },
                         },
-                    },
+                    ],
-                ],
+                }
-            }
+            ]
-        ]
+            response = client.chat.completions.create(model=model, messages=messages)
-
+            return response.choices[0].message.content
-        response = client.chat.completions.create(model=model, messages=messages)
-        return response.choices[0].message.content
 
 
 class OutlookMsgConverter(DocumentConverter):