lollms-client 0.20.6__py3-none-any.whl → 0.20.8__py3-none-any.whl

lollms_client/lollms_types.py

@@ -2,9 +2,9 @@ from  enum import Enum
 class MSG_TYPE(Enum):
     # Messaging
     MSG_TYPE_CHUNK                  = 0 # A chunk of a message (used for classical chat)
-    MSG_TYPE_FULL                   = 1 # A full message (for some personality the answer is sent in bulk)
-    MSG_TYPE_FULL_INVISIBLE_TO_AI   = 2 # A full message (for some personality the answer is sent in bulk)
-    MSG_TYPE_FULL_INVISIBLE_TO_USER = 3 # A full message (for some personality the answer is sent in bulk)
+    MSG_TYPE_CONTENT                   = 1 # A full message (for some personality the answer is sent in bulk)
+    MSG_TYPE_CONTENT_INVISIBLE_TO_AI   = 2 # A full message (for some personality the answer is sent in bulk)
+    MSG_TYPE_CONTENT_INVISIBLE_TO_USER = 3 # A full message (for some personality the answer is sent in bulk)
 
     # Conditionning
     # Informations

lollms_client/lollms_utilities.py

@@ -7,6 +7,103 @@ import io
 import base64
 import re
 import numpy as np
+
+import json
+import re
+from ascii_colors import ASCIIColors, trace_exception
+def robust_json_parser(json_string: str) -> dict:
+    """
+    Parses a JSON string that may be malformed by an LLM by applying a series of cleaning strategies.
+
+    Args:
+        json_string: The string that is expected to contain a JSON object.
+
+    Returns:
+        A dictionary parsed from the JSON string.
+
+    Raises:
+        ValueError: If the string cannot be parsed after all cleaning attempts.
+
+    Strategies Applied in Order:
+    1.  Tries to parse the string directly.
+    2.  If that fails, it extracts the main JSON object or array from the string.
+    3.  Applies a series of fixes:
+        a. Replaces Python/JS boolean/null values with JSON-compliant ones.
+        b. Removes single-line and multi-line comments.
+        c. Fixes improperly escaped characters (e.g., \_).
+        d. Removes trailing commas from objects and arrays.
+        e. Escapes unescaped newline characters within strings.
+    4.  Tries to parse the cleaned string.
+    """
+    # 1. First attempt: Standard parsing
+    try:
+        return json.loads(json_string)
+    except json.JSONDecodeError:
+        pass # Will proceed to cleaning steps
+
+    # 2. Second attempt: Find a JSON object or array within a larger string
+    # This is useful if the LLM adds text like "Here is the JSON: {..}"
+    # Regex to find a JSON object `{...}` or array `[...]`
+    json_match = re.search(r'(\{[\s\S]*\}|\[[\s\S]*\])', json_string)
+    if json_match:
+        json_substring = json_match.group(0)
+    else:
+        # If no object or array is found, we work with the original string
+        json_substring = json_string
+        
+    # Store the potentially cleaned string
+    cleaned_string = json_substring
+
+    # 3. Third attempt: Apply a series of cleaning functions
+    try:
+        # a. Fix boolean and null values
+        cleaned_string = re.sub(r'\bTrue\b', 'true', cleaned_string)
+        cleaned_string = re.sub(r'\bFalse\b', 'false', cleaned_string)
+        cleaned_string = re.sub(r'\bNone\b', 'null', cleaned_string)
+
+        # b. Remove comments
+        # Remove // comments
+        cleaned_string = re.sub(r'//.*', '', cleaned_string)
+        # Remove /* ... */ comments
+        cleaned_string = re.sub(r'/\*[\s\S]*?\*/', '', cleaned_string)
+        
+        # c. Un-escape characters that are not valid JSON escape sequences
+        # e.g., \_ , \- , \* etc. that LLMs sometimes add.
+        cleaned_string = re.sub(r'\\([_`*#-])', r'\1', cleaned_string)
+
+        # d. Remove trailing commas
+        cleaned_string = re.sub(r',\s*(\}|\])', r'\1', cleaned_string)
+
+        # e. Fix unescaped newlines within strings. This is the most complex part.
+        # We iterate through the string and escape newlines only when inside a string literal.
+        in_string = False
+        escaped_string = []
+        for i, char in enumerate(cleaned_string):
+            if char == '"' and (i == 0 or cleaned_string[i-1] != '\\'):
+                in_string = not in_string
+            
+            if in_string and char == '\n':
+                escaped_string.append('\\n')
+            else:
+                escaped_string.append(char)
+        
+        cleaned_string = "".join(escaped_string)
+
+        return json.loads(cleaned_string)
+
+    except json.JSONDecodeError as e:
+        # If all else fails, raise the final error with context
+        ASCIIColors.error("Failed to parse JSON after all cleaning attempts. See details below.")
+        print("\n--- JSONDecodeError ---")
+        trace_exception(e)
+        print("\n--- Original String ---")
+        print(json_string)
+        print("\n--- Final Cleaned String Attempted ---")
+        print(cleaned_string)
+        raise ValueError(f"Failed to parse JSON. Final error: {e}") from e
+
+
+
 class PromptReshaper:
     def __init__(self, template:str):
         self.template = template

lollms_client/mcp_bindings/remote_mcp/__init__.py

@@ -5,8 +5,10 @@ from lollms_client.lollms_mcp_binding import LollmsMCPBinding
 from ascii_colors import ASCIIColors, trace_exception
 import threading
 import json
+import pipmaster as pm
 
 try:
+    pm.ensure_packages(["mcp"])
     from mcp import ClientSession, types
     from mcp.client.streamable_http import streamablehttp_client
     MCP_LIBRARY_AVAILABLE = True

{lollms_client-0.20.6.dist-info → lollms_client-0.20.8.dist-info}/METADATA

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

{lollms_client-0.20.6.dist-info → lollms_client-0.20.8.dist-info}/RECORD

@@ -25,10 +25,10 @@ examples/personality_test/chat_test.py,sha256=o2jlpoddFc-T592iqAiA29xk3x27KsdK5D
 examples/personality_test/chat_with_aristotle.py,sha256=4X_fwubMpd0Eq2rCReS2bgVlUoAqJprjkLXk2Jz6pXU,1774
 examples/personality_test/tesks_test.py,sha256=7LIiwrEbva9WWZOLi34fsmCBN__RZbPpxoUOKA_AtYk,1924
 examples/test_local_models/local_chat.py,sha256=slakja2zaHOEAUsn2tn_VmI4kLx6luLBrPqAeaNsix8,456
-lollms_client/__init__.py,sha256=Q12uBDAS5nze6N8vwIoOrzdr5UQC1wogoKmgO31q2uk,912
+lollms_client/__init__.py,sha256=BgDFjiLC2bGnZJ3-9qq2QfP8qYOSPvFoTcHsxpXgJi8,912
 lollms_client/lollms_config.py,sha256=goEseDwDxYJf3WkYJ4IrLXwg3Tfw73CXV2Avg45M_hE,21876
-lollms_client/lollms_core.py,sha256=Jr9VQCvyxtsdy3VstNjOOoMCx4uS50VHSzaFuyu754o,118714
-lollms_client/lollms_discussion.py,sha256=9QcmDIlzozgBWWuZK2EF0VlK6l3JYCxDfeXaf_KxkBA,20974
+lollms_client/lollms_core.py,sha256=kIiRskIE7w7S104SUBXDEtauGY2nt6ljMDTtc8O7pzg,133572
+lollms_client/lollms_discussion.py,sha256=d_RA4wIbg9NSpK367q8ZD5sb8vLnxzSxDpDpe7ZfLiM,19242
 lollms_client/lollms_js_analyzer.py,sha256=01zUvuO2F_lnUe_0NLxe1MF5aHE1hO8RZi48mNPv-aw,8361
 lollms_client/lollms_llm_binding.py,sha256=E81g4yBlQn76WTSLicnTETJuQhf_WZUMZaxotgRnOcA,12096
 lollms_client/lollms_mcp_binding.py,sha256=0rK9HQCBEGryNc8ApBmtOlhKE1Yfn7X7xIQssXxS2Zc,8933
@@ -38,8 +38,8 @@ lollms_client/lollms_tti_binding.py,sha256=afO0-d-Kqsmh8UHTijTvy6dZAt-XDB6R-IHmd
 lollms_client/lollms_ttm_binding.py,sha256=FjVVSNXOZXK1qvcKEfxdiX6l2b4XdGOSNnZ0utAsbDg,4167
 lollms_client/lollms_tts_binding.py,sha256=5cJYECj8PYLJAyB6SEH7_fhHYK3Om-Y3arkygCnZ24o,4342
 lollms_client/lollms_ttv_binding.py,sha256=KkTaHLBhEEdt4sSVBlbwr5i_g_TlhcrwrT-7DjOsjWQ,4131
-lollms_client/lollms_types.py,sha256=CLiodudFgTbuXTGgupDt6IgMvJkrfiOHdw1clx_5UjA,2863
-lollms_client/lollms_utilities.py,sha256=WiG-HHMdo86j3LBndcBQ-PbMqQ8kGKLp1e9WuLDzRVU,7048
+lollms_client/lollms_types.py,sha256=6x9EIoHVK37UKBX9MD8S7usfzvTisNPlDXqysIrJzpI,2872
+lollms_client/lollms_utilities.py,sha256=IyeZZcoKzera4I4Vjk7IIUJXT8uQ45FU2ZjTvaeKFjM,10944
 lollms_client/llm_bindings/__init__.py,sha256=9sWGpmWSSj6KQ8H4lKGCjpLYwhnVdL_2N7gXCphPqh4,14
 lollms_client/llm_bindings/llamacpp/__init__.py,sha256=Qj5RvsgPeHGNfb5AEwZSzFwAp4BOWjyxmm9qBNtstrc,63716
 lollms_client/llm_bindings/lollms/__init__.py,sha256=17TwGMDJMxRPjZjZZSysR8AwjMXZeRfDBy8RqWWuaIY,17769
@@ -55,7 +55,7 @@ lollms_client/mcp_bindings/local_mcp/default_tools/file_writer/file_writer.py,sh
 lollms_client/mcp_bindings/local_mcp/default_tools/generate_image_from_prompt/generate_image_from_prompt.py,sha256=THtZsMxNnXZiBdkwoBlfbWY2C5hhDdmPtnM-8cSKN6s,9488
 lollms_client/mcp_bindings/local_mcp/default_tools/internet_search/internet_search.py,sha256=PLC31-D04QKTOTb1uuCHnrAlpysQjsk89yIJngK0VGc,4586
 lollms_client/mcp_bindings/local_mcp/default_tools/python_interpreter/python_interpreter.py,sha256=McDCBVoVrMDYgU7EYtyOY7mCk1uEeTea0PSD69QqDsQ,6228
-lollms_client/mcp_bindings/remote_mcp/__init__.py,sha256=2oSVcOvW6XkAIfZvCNmwc1dSwrZ4hTZF8mntauM7YnU,16482
+lollms_client/mcp_bindings/remote_mcp/__init__.py,sha256=VsM7SX23sCZa2NDMad4fYAxm_2oJzMdIc8ZiiI6LJp8,16539
 lollms_client/mcp_bindings/standard_mcp/__init__.py,sha256=zpF4h8cTUxoERI-xcVjmS_V772LK0V4jegjz2k1PK98,31658
 lollms_client/stt_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lollms_client/stt_bindings/lollms/__init__.py,sha256=jBz3285atdPRqQe9ZRrb-AvjqKRB4f8tjLXjma0DLfE,6082
@@ -77,8 +77,8 @@ lollms_client/tts_bindings/piper_tts/__init__.py,sha256=0IEWG4zH3_sOkSb9WbZzkeV5
 lollms_client/tts_bindings/xtts/__init__.py,sha256=FgcdUH06X6ZR806WQe5ixaYx0QoxtAcOgYo87a2qxYc,18266
 lollms_client/ttv_bindings/__init__.py,sha256=UZ8o2izQOJLQgtZ1D1cXoNST7rzqW22rL2Vufc7ddRc,3141
 lollms_client/ttv_bindings/lollms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lollms_client-0.20.6.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-lollms_client-0.20.6.dist-info/METADATA,sha256=NG_lJ-ZX3YXxjvMYclHkNPI4aKvheU8CvcDR9gkqY6I,13374
-lollms_client-0.20.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lollms_client-0.20.6.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
-lollms_client-0.20.6.dist-info/RECORD,,
+lollms_client-0.20.8.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+lollms_client-0.20.8.dist-info/METADATA,sha256=CWTfUNMbBklC5rr7WI06zba9JPaE_DS0vUT1kI87gAI,13374
+lollms_client-0.20.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lollms_client-0.20.8.dist-info/top_level.txt,sha256=NI_W8S4OYZvJjb0QWMZMSIpOrYzpqwPGYaklhyWKH2w,23
+lollms_client-0.20.8.dist-info/RECORD,,