mb-rag 1.1.28__py3-none-any.whl → 1.1.29__py3-none-any.whl

mb_rag/chatbot/basic.py

@@ -316,21 +316,26 @@ class ModelFactory:
         str: Output from the model
     """
         base64_images = [self._image_to_base64(image) for image in images]
-        image_prompt_create = [{"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{base64_images[i]}"}} for i in range(len(images))]
-        prompt_new = [{"type": "text", "text": prompt},
-                      *image_prompt_create,]
-        if pydantic_model is not None:
-            try:
-                self.model = self.model.with_structured_output(pydantic_model)
-            except Exception as e:
-                print(f"Error with pydantic_model: {e}")
-                print("Continuing without structured output")
-        message= HumanMessage(content=prompt_new,)
-        response = self.model.invoke([message])
-        try:
+        if self.model_name=='ollama':
+            ollama_model = self.model.bind(images=[base64_images])
+            response = ollama_model.invoke([HumanMessage(content=prompt)])
             return response.content
-        except Exception:
-            return response
+        else:
+            image_prompt_create = [{"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{base64_images[i]}"}} for i in range(len(images))]
+            prompt_new = [{"type": "text", "text": prompt},
+                          *image_prompt_create,]
+            if pydantic_model is not None:
+                try:
+                    self.model = self.model.with_structured_output(pydantic_model)
+                except Exception as e:
+                    print(f"Error with pydantic_model: {e}")
+                    print("Continuing without structured output")
+            message= HumanMessage(content=prompt_new,)
+            response = self.model.invoke([message])
+            try:
+                return response.content
+            except Exception:
+                return response
 
 class ConversationModel:
     """

mb_rag/version.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 1
 MINOR_VERSION = 1
-PATCH_VERSION = 28
+PATCH_VERSION = 29
 version = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 __all__  = ['MAJOR_VERSION', 'MINOR_VERSION', 'PATCH_VERSION', 'version']

{mb_rag-1.1.28.dist-info → mb_rag-1.1.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mb_rag
-Version: 1.1.28
+Version: 1.1.29
 Summary: RAG function file
 Author: ['Malav Bateriwala']
 Requires-Python: >=3.8

{mb_rag-1.1.28.dist-info → mb_rag-1.1.29.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mb_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mb_rag/version.py,sha256=Jjd2mCudGZRz7bRa7R4U_JjRiyIfx48EnBIOJCCQwhM,207
+mb_rag/version.py,sha256=ITnbW1vqO-j5BPqKB80kAPQo-teqS8UgeKu0ZGjsi3Q,207
 mb_rag/chatbot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mb_rag/chatbot/basic.py,sha256=_-ZYE_xMX__H9gGGFI96oQ0R-nwhikGDFcFa91CIS4w,23103
+mb_rag/chatbot/basic.py,sha256=Jj5c46lZHAHftpVoT3cr_xHtJ6auJB_vqJ6IgAXLbos,23393
 mb_rag/chatbot/chains.py,sha256=vDbLX5R29sWN1pcFqJ5fyxJEgMCM81JAikunAEvMC9A,7223
 mb_rag/chatbot/prompts.py,sha256=n1PyiLbU-5fkslRv6aVOzt0dDlwya_cEdQ7kRnRhMuY,1749
 mb_rag/rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,7 +11,7 @@ mb_rag/utils/bounding_box.py,sha256=G0hdDam8QmYtD9lfwMeDHGm-TTo6KZg-yK5ESFL9zaM,
 mb_rag/utils/document_extract.py,sha256=vZiFB1RYm1BIEaNA0MveJ5Zp-KEi0ngKjW8xEdtPqXA,12558
 mb_rag/utils/extra.py,sha256=spbFrGgdruNyYQ5PzgvpSIa6Nm0rn9bb4qc8W9g582o,2492
 mb_rag/utils/pdf_extract.py,sha256=cVeMyhnAU4XZxjIZHKMYhrktTjUNOjhx2r_LZKReOZE,15598
-mb_rag-1.1.28.dist-info/METADATA,sha256=SrvA8RRcIxPKtwB19iQjO4-m8XuqKpmDkTT0u8p1Tu4,234
-mb_rag-1.1.28.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-mb_rag-1.1.28.dist-info/top_level.txt,sha256=FIK1eAa5uYnurgXZquBG-s3PIy-HDTC5yJBW4lTH_pM,7
-mb_rag-1.1.28.dist-info/RECORD,,
+mb_rag-1.1.29.dist-info/METADATA,sha256=vWy1_OLmVPaiAbeZtm1QRN-UAUyc_Hw13vcxjnz5FSs,234
+mb_rag-1.1.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mb_rag-1.1.29.dist-info/top_level.txt,sha256=FIK1eAa5uYnurgXZquBG-s3PIy-HDTC5yJBW4lTH_pM,7
+mb_rag-1.1.29.dist-info/RECORD,,