lollms-client 0.15.2__py3-none-any.whl → 0.17.0__py3-none-any.whl

lollms_client/lollms_llm_binding.py

@@ -2,13 +2,14 @@
 from abc import ABC, abstractmethod
 import importlib
 from pathlib import Path
-from typing import Optional, Callable, List
+from typing import Optional, Callable, List, Union
 from lollms_client.lollms_types import ELF_COMPLETION_FORMAT
 import importlib
 from pathlib import Path
 from typing import Optional
 from ascii_colors import trace_exception
-
+from lollms_client.lollms_types import MSG_TYPE
+import re
 class LollmsLLMBinding(ABC):
     """Abstract base class for all LOLLMS LLM bindings"""
     
@@ -25,41 +26,50 @@ class LollmsLLMBinding(ABC):
         self.model_name = None #Must be set by the instance
     
     @abstractmethod
-    def generate_text(self, 
+    def generate_text(self,
                      prompt: str,
                      images: Optional[List[str]] = None,
                      system_prompt: str = "",
                      n_predict: Optional[int] = None,
-                     stream: bool = False,
-                     temperature: float = 0.1,
-                     top_k: int = 50,
-                     top_p: float = 0.95,
-                     repeat_penalty: float = 0.8,
-                     repeat_last_n: int = 40,
+                     stream: Optional[bool] = None,
+                     temperature: Optional[float] = None,
+                     top_k: Optional[int] = None,
+                     top_p: Optional[float] = None,
+                     repeat_penalty: Optional[float] = None,
+                     repeat_last_n: Optional[int] = None,
                      seed: Optional[int] = None,
-                     n_threads: int = 8,
-                     streaming_callback: Optional[Callable[[str, str], None]] = None) -> str:
+                     n_threads: Optional[int] = None,
+                     ctx_size: int | None = None,
+                     streaming_callback: Optional[Callable[[str, MSG_TYPE], None]] = None,
+                     split:Optional[bool]=False, # put to true if the prompt is a discussion
+                     user_keyword:Optional[str]="!@>user:",
+                     ai_keyword:Optional[str]="!@>assistant:",
+                     ) -> Union[str, dict]:
         """
-        Generate text based on the provided prompt and parameters.
+        Generate text using the active LLM binding, using instance defaults if parameters are not provided.
 
         Args:
             prompt (str): The input prompt for text generation.
             images (Optional[List[str]]): List of image file paths for multimodal generation.
-            n_predict (Optional[int]): Maximum number of tokens to generate.
-            stream (bool): Whether to stream the output. Defaults to False.
-            temperature (float): Sampling temperature. Defaults to 0.1.
-            top_k (int): Top-k sampling parameter. Defaults to 50.
-            top_p (float): Top-p sampling parameter. Defaults to 0.95.
-            repeat_penalty (float): Penalty for repeated tokens. Defaults to 0.8.
-            repeat_last_n (int): Number of previous tokens to consider for repeat penalty. Defaults to 40.
-            seed (Optional[int]): Random seed for generation.
-            n_threads (int): Number of threads to use. Defaults to 8.
+            n_predict (Optional[int]): Maximum number of tokens to generate. Uses instance default if None.
+            stream (Optional[bool]): Whether to stream the output. Uses instance default if None.
+            temperature (Optional[float]): Sampling temperature. Uses instance default if None.
+            top_k (Optional[int]): Top-k sampling parameter. Uses instance default if None.
+            top_p (Optional[float]): Top-p sampling parameter. Uses instance default if None.
+            repeat_penalty (Optional[float]): Penalty for repeated tokens. Uses instance default if None.
+            repeat_last_n (Optional[int]): Number of previous tokens to consider for repeat penalty. Uses instance default if None.
+            seed (Optional[int]): Random seed for generation. Uses instance default if None.
+            n_threads (Optional[int]): Number of threads to use. Uses instance default if None.
+            ctx_size (int | None): Context size override for this generation.
             streaming_callback (Optional[Callable[[str, str], None]]): Callback function for streaming output.
                 - First parameter (str): The chunk of text received.
                 - Second parameter (str): The message type (e.g., MSG_TYPE.MSG_TYPE_CHUNK).
+            split:Optional[bool]: put to true if the prompt is a discussion
+            user_keyword:Optional[str]: when splitting we use this to extract user prompt 
+            ai_keyword:Optional[str]": when splitting we use this to extract ai prompt
 
         Returns:
-            str: Generated text or error dictionary if failed.
+            Union[str, dict]: Generated text or error dictionary if failed.
         """
         pass
     
@@ -146,6 +156,50 @@ class LollmsLLMBinding(ABC):
         pass
 
 
+    def split_discussion(self, lollms_prompt_string: str, system_keyword="!@>system:", user_keyword="!@>user:", ai_keyword="!@>assistant:") -> list:
+
+        """
+        Abra-cadabra! Splits a combined LoLLMs prompt string into a list of
+        OpenAI chat messages.
+
+        Each segment starting with system_keyword/user_keyword/ai_keyword
+        becomes a {"role": ..., "content": ...} dict.
+        """
+        # Build a regex that looks ahead for any of the three markers
+        pattern = r"(?={}|{}|{})".format(
+            re.escape(system_keyword),
+            re.escape(user_keyword),
+            re.escape(ai_keyword)
+        )
+        # Split the big string into little bits at each keyword
+        parts = re.split(pattern, lollms_prompt_string)
+        messages = []
+
+        for part in parts:
+            part = part.strip()
+            if not part:
+                continue  # Skip empty rabbitholes
+
+            if part.startswith(system_keyword):
+                role = "system"
+                content = part[len(system_keyword):].strip()
+            elif part.startswith(user_keyword):
+                role = "user"
+                content = part[len(user_keyword):].strip()
+            elif part.startswith(ai_keyword):
+                role = "assistant"
+                content = part[len(ai_keyword):].strip()
+            else:
+                # Unknown segment—maybe a ghost?
+                continue
+
+            messages.append({"role": role, "content": content})
+        if messages[-1]["content"]=="":
+            del messages[-1]
+        return messages
+
+
+
 class LollmsLLMBindingManager:
     """Manages binding discovery and instantiation"""
 

lollms_client/lollms_stt_binding.py

@@ -9,26 +9,14 @@ class LollmsSTTBinding(ABC):
     """Abstract base class for all LOLLMS Speech-to-Text bindings."""
 
     def __init__(self,
-                 host_address: Optional[str] = None,
-                 model_name: Optional[str] = None, # Can represent a default model
-                 service_key: Optional[str] = None,
-                 verify_ssl_certificate: bool = True):
+                 binding_name:str="unknown"):
         """
         Initialize the LollmsSTTBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the STT service.
-            model_name (Optional[str]): A default identifier for the STT model.
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
+            binding_name (Optional[str]): The binding name
         """
-        if host_address is not None:
-            self.host_address = host_address.rstrip('/')
-        else:
-            self.host_address = None
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+        self.binding_name = binding_name
 
     @abstractmethod
     def transcribe_audio(self, audio_path: Union[str, Path], model: Optional[str] = None, **kwargs) -> str:

lollms_client/lollms_tti_binding.py

@@ -9,26 +9,14 @@ class LollmsTTIBinding(ABC):
     """Abstract base class for all LOLLMS Text-to-Image bindings."""
 
     def __init__(self,
-                 host_address: Optional[str] = None,
-                 model_name: Optional[str] = None, # Can represent a default service/model
-                 service_key: Optional[str] = None,
-                 verify_ssl_certificate: bool = True):
+                 binding_name:str="unknown"):
         """
         Initialize the LollmsTTIBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the TTI service.
-            model_name (Optional[str]): A default identifier (e.g., service or model name).
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
-        """
-        if host_address is not None:
-            self.host_address = host_address.rstrip('/')
-        else:
-            self.host_address = None
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+            binding_name (Optional[str]): The binding name
+        """
+        self.binding_name = binding_name
 
     @abstractmethod
     def generate_image(self,
@@ -128,20 +116,12 @@ class LollmsTTIBindingManager:
 
     def create_binding(self,
                       binding_name: str,
-                      host_address: Optional[str] = None,
-                      model_name: Optional[str] = None,
-                      service_key: Optional[str] = None,
-                      verify_ssl_certificate: bool = True,
                       **kwargs) -> Optional[LollmsTTIBinding]:
         """
         Create an instance of a specific TTI binding.
 
         Args:
             binding_name (str): Name of the TTI binding to create.
-            host_address (Optional[str]): Host address for the service.
-            model_name (Optional[str]): Default model/service identifier.
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
             **kwargs: Additional parameters specific to the binding's __init__.
 
         Returns:
@@ -153,11 +133,7 @@ class LollmsTTIBindingManager:
         binding_class = self.available_bindings.get(binding_name)
         if binding_class:
             try:
-                return binding_class(host_address=host_address,
-                                     model_name=model_name,
-                                     service_key=service_key,
-                                     verify_ssl_certificate=verify_ssl_certificate,
-                                     **kwargs)
+                return binding_class(**kwargs)
             except Exception as e:
                 trace_exception(e)
                 print(f"Failed to instantiate TTI binding {binding_name}: {str(e)}")

lollms_client/lollms_ttm_binding.py

@@ -9,26 +9,15 @@ class LollmsTTMBinding(ABC):
     """Abstract base class for all LOLLMS Text-to-Music bindings."""
 
     def __init__(self,
-                 host_address: Optional[str] = None,
-                 model_name: Optional[str] = None, # Can represent a default model/service
-                 service_key: Optional[str] = None,
-                 verify_ssl_certificate: bool = True):
+                 binding_name:str="unknown"):
         """
         Initialize the LollmsTTMBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the TTM service.
-            model_name (Optional[str]): A default identifier (e.g., service or model name).
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
+            binding_name (Optional[str]): The binding name
         """
-        if host_address is not None:
-            self.host_address = host_address.rstrip('/')
-        else:
-            self.host_address = None
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+        self.binding_name = binding_name
+
 
     @abstractmethod
     def generate_music(self, prompt: str, **kwargs) -> bytes:
@@ -88,20 +77,12 @@ class LollmsTTMBindingManager:
 
     def create_binding(self,
                       binding_name: str,
-                      host_address: Optional[str] = None,
-                      model_name: Optional[str] = None,
-                      service_key: Optional[str] = None,
-                      verify_ssl_certificate: bool = True,
                       **kwargs) -> Optional[LollmsTTMBinding]:
         """
         Create an instance of a specific TTM binding.
 
         Args:
             binding_name (str): Name of the TTM binding to create.
-            host_address (Optional[str]): Host address for the service.
-            model_name (Optional[str]): Default model/service identifier.
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
             **kwargs: Additional parameters specific to the binding's __init__.
 
         Returns:
@@ -113,11 +94,7 @@ class LollmsTTMBindingManager:
         binding_class = self.available_bindings.get(binding_name)
         if binding_class:
             try:
-                return binding_class(host_address=host_address,
-                                     model_name=model_name,
-                                     service_key=service_key,
-                                     verify_ssl_certificate=verify_ssl_certificate,
-                                     **kwargs)
+                return binding_class(**kwargs)
             except Exception as e:
                 trace_exception(e)
                 print(f"Failed to instantiate TTM binding {binding_name}: {str(e)}")

lollms_client/lollms_tts_binding.py

@@ -9,26 +9,14 @@ class LollmsTTSBinding(ABC):
     """Abstract base class for all LOLLMS Text-to-Speech bindings."""
 
     def __init__(self,
-                 host_address: Optional[str] = None,
-                 model_name: Optional[str] = None, # Can represent a default voice or model
-                 service_key: Optional[str] = None,
-                 verify_ssl_certificate: bool = True):
+                 binding_name:str="unknown"):
         """
         Initialize the LollmsTTSBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the TTS service.
-            model_name (Optional[str]): A default identifier (e.g., voice or model name).
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
+            binding_name (Optional[str]): The binding name
         """
-        if host_address is not None:
-            self.host_address = host_address.rstrip('/')
-        else:
-            self.host_address = None
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+        self.binding_name = binding_name
 
     @abstractmethod
     def generate_audio(self, text: str, voice: Optional[str] = None, **kwargs) -> bytes:
@@ -91,20 +79,12 @@ class LollmsTTSBindingManager:
 
     def create_binding(self,
                       binding_name: str,
-                      host_address: Optional[str] = None,
-                      model_name: Optional[str] = None,
-                      service_key: Optional[str] = None,
-                      verify_ssl_certificate: bool = True,
                       **kwargs) -> Optional[LollmsTTSBinding]:
         """
         Create an instance of a specific TTS binding.
 
         Args:
             binding_name (str): Name of the TTS binding to create.
-            host_address (Optional[str]): Host address for the service.
-            model_name (Optional[str]): Default model/voice identifier.
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
             **kwargs: Additional parameters specific to the binding's __init__.
 
         Returns:
@@ -116,11 +96,7 @@ class LollmsTTSBindingManager:
         binding_class = self.available_bindings.get(binding_name)
         if binding_class:
             try:
-                return binding_class(host_address=host_address,
-                                     model_name=model_name,
-                                     service_key=service_key,
-                                     verify_ssl_certificate=verify_ssl_certificate,
-                                     **kwargs)
+                return binding_class(**kwargs)
             except Exception as e:
                 trace_exception(e)
                 print(f"Failed to instantiate TTS binding {binding_name}: {str(e)}")

lollms_client/lollms_ttv_binding.py

@@ -9,26 +9,14 @@ class LollmsTTVBinding(ABC):
     """Abstract base class for all LOLLMS Text-to-Video bindings."""
 
     def __init__(self,
-                 host_address: Optional[str] = None,
-                 model_name: Optional[str] = None, # Can represent a default model/service
-                 service_key: Optional[str] = None,
-                 verify_ssl_certificate: bool = True):
+                 binding_name:str="unknown"):
         """
         Initialize the LollmsTTVBinding base class.
 
         Args:
-            host_address (Optional[str]): The host address for the TTV service.
-            model_name (Optional[str]): A default identifier (e.g., service or model name).
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
+            binding_name (Optional[str]): The binding name
         """
-        if host_address is not None:
-            self.host_address = host_address.rstrip('/')
-        else:
-            self.host_address = None
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+        self.binding_name = binding_name
 
     @abstractmethod
     def generate_video(self, prompt: str, **kwargs) -> bytes:
@@ -88,20 +76,12 @@ class LollmsTTVBindingManager:
 
     def create_binding(self,
                       binding_name: str,
-                      host_address: Optional[str] = None,
-                      model_name: Optional[str] = None,
-                      service_key: Optional[str] = None,
-                      verify_ssl_certificate: bool = True,
                       **kwargs) -> Optional[LollmsTTVBinding]:
         """
         Create an instance of a specific TTV binding.
 
         Args:
             binding_name (str): Name of the TTV binding to create.
-            host_address (Optional[str]): Host address for the service.
-            model_name (Optional[str]): Default model/service identifier.
-            service_key (Optional[str]): Authentication key for the service.
-            verify_ssl_certificate (bool): Whether to verify SSL certificates.
             **kwargs: Additional parameters specific to the binding's __init__.
 
         Returns:
@@ -113,11 +93,7 @@ class LollmsTTVBindingManager:
         binding_class = self.available_bindings.get(binding_name)
         if binding_class:
             try:
-                return binding_class(host_address=host_address,
-                                     model_name=model_name,
-                                     service_key=service_key,
-                                     verify_ssl_certificate=verify_ssl_certificate,
-                                     **kwargs)
+                return binding_class(**kwargs)
             except Exception as e:
                 trace_exception(e)
                 print(f"Failed to instantiate TTV binding {binding_name}: {str(e)}")

lollms_client/lollms_utilities.py

@@ -1,10 +1,12 @@
 import urllib
 import numpy
 from pathlib import Path
-from pipmaster import PackageManager
+import pipmaster as pm
 from PIL import Image
 import io
 import base64
+import re
+import numpy as np
 class PromptReshaper:
     def __init__(self, template:str):
         self.template = template
@@ -122,8 +124,8 @@ def remove_text_from_string(string: str, text_to_find:str):
 
 
 def process_ai_output(output, images, output_folder):
-    if not PackageManager.is_installed("cv2"):
-        PackageManager.install("opencv-python")
+    if not pm.is_installed("opencv-python"):
+        pm.install("opencv-python")
     import cv2
     images = [cv2.imread(str(img)) for img in images]
     # Find all bounding box entries in the output

lollms_client/stt_bindings/lollms/__init__.py

@@ -27,10 +27,11 @@ class LollmsSTTBinding_Impl(LollmsSTTBinding):
             service_key (Optional[str]): Authentication key (currently unused by default LOLLMS STT).
             verify_ssl_certificate (bool): Whether to verify SSL certificates.
         """
-        super().__init__(host_address=host_address,
-                         model_name=model_name,
-                         service_key=service_key,
-                         verify_ssl_certificate=verify_ssl_certificate)
+        super().__init__("lollms")
+        self.host_address=host_address
+        self.model_name=model_name
+        self.service_key=service_key
+        self.verify_ssl_certificate=verify_ssl_certificate
 
     def transcribe_audio(self, audio_path: Union[str, Path], model: Optional[str] = None, **kwargs) -> str:
         """