lollms-client 1.4.8__py3-none-any.whl → 1.5.0__py3-none-any.whl

lollms_client/__init__.py

@@ -8,7 +8,7 @@ from lollms_client.lollms_utilities import PromptReshaper # Keep general utiliti
 from lollms_client.lollms_mcp_binding import LollmsMCPBinding, LollmsMCPBindingManager
 from lollms_client.lollms_llm_binding import LollmsLLMBindingManager
 
-__version__ = "1.4.8" # Updated version
+__version__ = "1.5.0" # Updated version
 
 # Optionally, you could define __all__ if you want to be explicit about exports
 __all__ = [

lollms_client/llm_bindings/lollms/__init__.py

@@ -11,6 +11,8 @@ from ascii_colors import ASCIIColors, trace_exception
 from typing import List, Dict
 import httpx
 import pipmaster as pm
+import mimetypes
+import base64
 
 pm.ensure_packages(["openai","tiktoken"])
 
@@ -20,7 +22,63 @@ import os
 
 BindingName = "LollmsBinding"
 
-
+def _read_file_as_base64(path):
+    with open(path, "rb") as f:
+        return base64.b64encode(f.read()).decode("utf-8")
+
+def _extract_markdown_path(s):
+    s = s.strip()
+    if s.startswith("[") and s.endswith(")"):
+        lb, rb = s.find("["), s.find("]")
+        if lb != -1 and rb != -1 and rb > lb:
+            return s[lb+1:rb].strip()
+    return s
+
+def _guess_mime_from_name(name, default="image/jpeg"):
+    mime, _ = mimetypes.guess_type(name)
+    return mime or default
+
+def _to_data_url(b64_str, mime):
+    return f"data:{mime};base64,{b64_str}"
+
+def normalize_image_input(img, default_mime="image/jpeg"):
+    """
+    Returns a Responses API-ready content block:
+      { "type": "input_image", "image_url": "data:<mime>;base64,<...>" }
+    Accepts:
+      - dict {'data': '<base64>', 'mime': 'image/png'}
+      - dict {'path': 'E:\\images\\x.png'}
+      - string raw base64
+      - string local path (Windows/POSIX), including markdown-like "[E:\\path\\img.png]()"
+    URLs are intentionally not supported (base64 only).
+    """
+    if isinstance(img, dict):
+        if "data" in img and isinstance(img["data"], str):
+            mime = img.get("mime", default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(img["data"], mime)}
+        if "path" in img and isinstance(img["path"], str):
+            p = _extract_markdown_path(img["path"])
+            b64 = _read_file_as_base64(p)
+            mime = _guess_mime_from_name(p, default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(b64, mime)}
+        if "url" in img:
+            raise ValueError("URL inputs not allowed here; provide base64 or local path")
+        raise ValueError("Unsupported dict format for image input")
+
+    if isinstance(img, str):
+        s = _extract_markdown_path(img)
+        # Accept already-correct data URLs as-is
+        if s.startswith("data:"):
+            return {"type": "input_image", "image_url": s}
+        # Local path heuristics: exists on disk or looks like a path
+        if os.path.exists(s) or (":" in s and "\\" in s) or s.startswith("/") or s.startswith("."):
+            b64 = _read_file_as_base64(s)
+            mime = _guess_mime_from_name(s, default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(b64, mime)}
+        # Otherwise, treat as raw base64 payload
+        return {"type": "input_image", "image_url": _to_data_url(s, default_mime)}
+
+    raise ValueError("Unsupported image input type")
 class LollmsBinding(LollmsLLMBinding):
     """Lollms-specific binding implementation (open ai compatible with some extra parameters)"""
     
@@ -54,7 +112,7 @@ class LollmsBinding(LollmsLLMBinding):
 
     def lollms_listMountedPersonalities(self, host_address:str|None=None):
         host_address = host_address if host_address else self.host_address
-        url = f"{host_address}/list_mounted_personalities"
+        url = f"{host_address}/personalities"
 
         response = requests.get(url)
 
@@ -136,17 +194,18 @@ class LollmsBinding(LollmsLLMBinding):
 
         if images:
             if split:
+                # Original call to split message roles
                 messages += self.split_discussion(prompt, user_keyword=user_keyword, ai_keyword=ai_keyword)
-                messages[-1]["content"] = [{"type": "text", "text": messages[-1]["content"]}] + [
-                    {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}}
-                    for path in images
-                ]
+                # Convert the last message content to the structured content array
+                last = messages[-1]
+                text_block = {"type": "text", "text": last["content"]}
+                image_blocks = [normalize_image_input(img) for img in images]
+                last["content"] = [text_block] + image_blocks
             else:
                 messages.append({
-                    'role': 'user',
-                    'content': [{"type": "text", "text": prompt}] + [
-                        {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}}
-                        for path in images
+                    "role": "user",
+                    "content": [{"type": "text", "text": prompt}] + [
+                        normalize_image_input(img) for img in images
                     ]
                 })
         else:

lollms_client/llm_bindings/ollama/__init__.py

@@ -296,15 +296,13 @@ class OllamaBinding(LollmsLLMBinding):
                 for item in content:
                     if item.get("type") == "text":
                         text_parts.append(item.get("text", ""))
-                    elif item.get("type") == "image_url":
-                        base64_data = item.get("image_url", {}).get("base64")
-                        url = item.get("image_url", {}).get("url")
+                    elif item.get("type") == "input_image":
+                        base64_data = item.get("image_url")
                         if base64_data:
                             # ⚠️ remove prefix "data:image/...;base64,"
                             cleaned = re.sub(r"^data:image/[^;]+;base64,", "", base64_data)
                             images.append(cleaned)
-                        elif url:
-                            images.append(url)
+
 
             return {
                 "role": role,

lollms_client/llm_bindings/openai/__init__.py

@@ -12,7 +12,7 @@ from typing import List, Dict
 import math
 import httpx
 import pipmaster as pm
-
+import mimetypes
 pm.ensure_packages(["openai","tiktoken"])
 
 import openai
@@ -22,6 +22,63 @@ import os
 BindingName = "OpenAIBinding"
 
 
+def _read_file_as_base64(path):
+    with open(path, "rb") as f:
+        return base64.b64encode(f.read()).decode("utf-8")
+
+def _extract_markdown_path(s):
+    s = s.strip()
+    if s.startswith("[") and s.endswith(")"):
+        lb, rb = s.find("["), s.find("]")
+        if lb != -1 and rb != -1 and rb > lb:
+            return s[lb+1:rb].strip()
+    return s
+
+def _guess_mime_from_name(name, default="image/jpeg"):
+    mime, _ = mimetypes.guess_type(name)
+    return mime or default
+
+def _to_data_url(b64_str, mime):
+    return f"data:{mime};base64,{b64_str}"
+
+def normalize_image_input(img, default_mime="image/jpeg"):
+    """
+    Returns a Responses API-ready content block:
+      { "type": "input_image", "image_url": "data:<mime>;base64,<...>" }
+    Accepts:
+      - dict {'data': '<base64>', 'mime': 'image/png'}
+      - dict {'path': 'E:\\images\\x.png'}
+      - string raw base64
+      - string local path (Windows/POSIX), including markdown-like "[E:\\path\\img.png]()"
+    URLs are intentionally not supported (base64 only).
+    """
+    if isinstance(img, dict):
+        if "data" in img and isinstance(img["data"], str):
+            mime = img.get("mime", default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(img["data"], mime)}
+        if "path" in img and isinstance(img["path"], str):
+            p = _extract_markdown_path(img["path"])
+            b64 = _read_file_as_base64(p)
+            mime = _guess_mime_from_name(p, default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(b64, mime)}
+        if "url" in img:
+            raise ValueError("URL inputs not allowed here; provide base64 or local path")
+        raise ValueError("Unsupported dict format for image input")
+
+    if isinstance(img, str):
+        s = _extract_markdown_path(img)
+        # Accept already-correct data URLs as-is
+        if s.startswith("data:"):
+            return {"type": "input_image", "image_url": s}
+        # Local path heuristics: exists on disk or looks like a path
+        if os.path.exists(s) or (":" in s and "\\" in s) or s.startswith("/") or s.startswith("."):
+            b64 = _read_file_as_base64(s)
+            mime = _guess_mime_from_name(s, default_mime)
+            return {"type": "input_image", "image_url": _to_data_url(b64, mime)}
+        # Otherwise, treat as raw base64 payload
+        return {"type": "input_image", "image_url": _to_data_url(s, default_mime)}
+
+    raise ValueError("Unsupported image input type")
 class OpenAIBinding(LollmsLLMBinding):
     """OpenAI-specific binding implementation"""
     
@@ -123,17 +180,18 @@ class OpenAIBinding(LollmsLLMBinding):
 
         if images:
             if split:
+                # Original call to split message roles
                 messages += self.split_discussion(prompt, user_keyword=user_keyword, ai_keyword=ai_keyword)
-                messages[-1]["content"] = [{"type": "text", "text": messages[-1]["content"]}] + [
-                    {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}}
-                    for path in images
-                ]
+                # Convert the last message content to the structured content array
+                last = messages[-1]
+                text_block = {"type": "text", "text": last["content"]}
+                image_blocks = [normalize_image_input(img) for img in images]
+                last["content"] = [text_block] + image_blocks
             else:
                 messages.append({
-                    'role': 'user',
-                    'content': [{"type": "text", "text": prompt}] + [
-                        {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{encode_image(path)}"}}
-                        for path in images
+                    "role": "user",
+                    "content": [{"type": "text", "text": prompt}] + [
+                        normalize_image_input(img) for img in images
                     ]
                 })
         else:

lollms_client/lollms_core.py

@@ -5845,8 +5845,11 @@ Provide the final aggregated answer in {output_format} format, directly addressi
                     MSG_TYPE.MSG_TYPE_STEP_START, 
                     {"id": f"chunk_{i+1}", "progress": progress_before}
                 )
-
-            prompt = chunk_summary_prompt_template.format(chunk_text=chunk)
+            try:
+                prompt = chunk_summary_prompt_template.format(chunk_text=chunk)
+            except Exception as ex:
+                ASCIIColors.warning(ex)
+                prompt = chunk_summary_prompt_template.replace("{chunk_text}", chunk)
             processed_system_prompt = system_prompt.format(chunk_id=i,scratchpad="\n\n---\n\n".join(chunk_summaries))
             try:
                 # Generate summary for the current chunk

{lollms_client-1.4.8.dist-info → lollms_client-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lollms_client
-Version: 1.4.8
+Version: 1.5.0
 Summary: A client library for LoLLMs generate endpoint
 Author-email: ParisNeo <parisneoai@gmail.com>
 License:                                  Apache License

{lollms_client-1.4.8.dist-info → lollms_client-1.5.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-lollms_client/__init__.py,sha256=aXDoiWyHhxA9qZ2dawSv9lH1_mMWQ8AwV--DRVw2u7w,1146
+lollms_client/__init__.py,sha256=JKweJeRzcBSH1iv1daEcmmdNuwUmCIdGk2TrQD55AZk,1146
 lollms_client/lollms_agentic.py,sha256=pQiMEuB_XkG29-SW6u4KTaMFPr6eKqacInggcCuCW3k,13914
 lollms_client/lollms_config.py,sha256=goEseDwDxYJf3WkYJ4IrLXwg3Tfw73CXV2Avg45M_hE,21876
-lollms_client/lollms_core.py,sha256=aCEoxmEF6ZmkBgJgZd74lKkM4A3PVVyt2IwMvLfScWw,315053
+lollms_client/lollms_core.py,sha256=0FavCKvsoI1_feFCoW-lbe8CWvm1z8i-3t6uWozuhpo,315238
 lollms_client/lollms_discussion.py,sha256=ON29_FLV4toXSz8YTqNwM9_5bcNBg1XKTIeo_44rmgc,123245
 lollms_client/lollms_js_analyzer.py,sha256=01zUvuO2F_lnUe_0NLxe1MF5aHE1hO8RZi48mNPv-aw,8361
 lollms_client/lollms_llm_binding.py,sha256=Dj1PI2bQBYv_JgPxCIaIC7DMUvWdFJGwXFdsP5hdGBg,25014
@@ -26,13 +26,13 @@ lollms_client/llm_bindings/groq/__init__.py,sha256=EGrMh9vuCoM4pskDw8ydfsAWYgEb4
 lollms_client/llm_bindings/hugging_face_inference_api/__init__.py,sha256=SFcj5XQTDmN9eR4of82IgQa9iRYZaGlF6rMlF5S5wWg,13938
 lollms_client/llm_bindings/litellm/__init__.py,sha256=lRH4VfZMUG5JCCj6a7hk2PTfSyDowAu-ujLOM-XPl-8,12756
 lollms_client/llm_bindings/llamacpp/__init__.py,sha256=llPF85AzYgMp7Cpo_4OvEHKlxIAgI6F95NB3SqskD9E,62480
-lollms_client/llm_bindings/lollms/__init__.py,sha256=XFQKtTJnkW8OwF1IoyzHqAZ8JAJ0PnAUKDdeOLGcbrE,24310
+lollms_client/llm_bindings/lollms/__init__.py,sha256=S2ycEQORSxjy4J4S-FAoMWXjmvaQNvS-3ExeTU0DrTs,26904
 lollms_client/llm_bindings/lollms_webui/__init__.py,sha256=iuDfhZZoLC-PDEPLHrcjk5-962S5c7OeCI7PMdJxI_A,17753
 lollms_client/llm_bindings/mistral/__init__.py,sha256=cddz9xIj8NRFLKHe2JMxzstpUrNIu5s9juci3mhiHfo,14133
 lollms_client/llm_bindings/novita_ai/__init__.py,sha256=NOg6_NBCxuz9gwrijTCzrp9a78AbmBdT4k67baCTtuc,13877
-lollms_client/llm_bindings/ollama/__init__.py,sha256=a6cgzXPuo8ZLhIZHJFy8QF0n5ZTk0X4OC1JSyXG1enk,46013
+lollms_client/llm_bindings/ollama/__init__.py,sha256=3cJra6K-r4ISPOC1VBnfSpMX6arNxSFUzEu10eO4LQc,45848
 lollms_client/llm_bindings/open_router/__init__.py,sha256=cAFWtCWJx0WjIe1w2JReCf6WlAZjrXYA4jZ8l3zqxMs,14915
-lollms_client/llm_bindings/openai/__init__.py,sha256=ElLbtHLwR61Uj3W6G4g6QIhxtCqUGOCQBYwhQyN60us,26142
+lollms_client/llm_bindings/openai/__init__.py,sha256=J_1OI4TGWgAPwOIjrki1TOGePVLHZ1tYP-nKQFZNLIk,28734
 lollms_client/llm_bindings/openllm/__init__.py,sha256=RC9dVeopslS-zXTsSJ7VC4iVsKgZCBwfmccmr_LCHA0,29971
 lollms_client/llm_bindings/perplexity/__init__.py,sha256=lMRPdbVbGX_weByAdcsZakdxDg7nFF3uCbdzakQmBOc,15006
 lollms_client/llm_bindings/pythonllamacpp/__init__.py,sha256=ZTuVa5ngu9GPVImjs_g8ArV7Bx7a1Rze518Tz8AFJ3U,31807
@@ -79,8 +79,8 @@ lollms_client/tts_bindings/xtts/server/main.py,sha256=T-Kn5NM-u1FJMygeV8rOoZKlqn
 lollms_client/tts_bindings/xtts/server/setup_voices.py,sha256=UdHaPa5aNcw8dR-aRGkZr2OfSFFejH79lXgfwT0P3ss,1964
 lollms_client/ttv_bindings/__init__.py,sha256=UZ8o2izQOJLQgtZ1D1cXoNST7rzqW22rL2Vufc7ddRc,3141
 lollms_client/ttv_bindings/lollms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lollms_client-1.4.8.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-lollms_client-1.4.8.dist-info/METADATA,sha256=IXy2ED-SFtzaVkrR2FDNZSNXZW1KfaPakP3RGz02TPM,71854
-lollms_client-1.4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lollms_client-1.4.8.dist-info/top_level.txt,sha256=Bk_kz-ri6Arwsk7YG-T5VsRorV66uVhcHGvb_g2WqgE,14
-lollms_client-1.4.8.dist-info/RECORD,,
+lollms_client-1.5.0.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+lollms_client-1.5.0.dist-info/METADATA,sha256=i31CkTse62ayQGDMLRJPKs4ungJTxwPPCeGUVw__5cU,71854
+lollms_client-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lollms_client-1.5.0.dist-info/top_level.txt,sha256=Bk_kz-ri6Arwsk7YG-T5VsRorV66uVhcHGvb_g2WqgE,14
+lollms_client-1.5.0.dist-info/RECORD,,