lollms-client 0.15.1__py3-none-any.whl → 0.16.0__py3-none-any.whl

lollms_client/lollms_core.py

@@ -48,6 +48,13 @@ class LollmsClient():
                  ttv_bindings_dir: Path = Path(__file__).parent / "ttv_bindings",
                  ttm_bindings_dir: Path = Path(__file__).parent / "ttm_bindings",
 
+                 # Configurations
+                 tts_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
+                 tti_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
+                 stt_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
+                 ttv_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
+                 ttm_binding_config: Optional[Dict[str, any]] = None, # Renamed for clarity
+
                  # General Parameters (mostly defaults for LLM generation)
                  service_key: Optional[str] = None, # Shared service key/client_id
                  verify_ssl_certificate: bool = True,
@@ -84,6 +91,11 @@ class LollmsClient():
             stt_bindings_dir (Path): Directory for STT bindings.
             ttv_bindings_dir (Path): Directory for TTV bindings.
             ttm_bindings_dir (Path): Directory for TTM bindings.
+            tts_binding_config (Optional[Dict]): Additional config for the TTS binding.
+            tti_binding_config (Optional[Dict]): Additional config for the TTI binding.
+            stt_binding_config (Optional[Dict]): Additional config for the STT binding.
+            ttv_binding_config (Optional[Dict]): Additional config for the TTV binding.
+            ttm_binding_config (Optional[Dict]): Additional config for the TTM binding.
             service_key (Optional[str]): Shared authentication key or client_id.
             verify_ssl_certificate (bool): Whether to verify SSL certificates.
             ctx_size (Optional[int]): Default context size for LLM.
@@ -144,54 +156,62 @@ class LollmsClient():
         if tts_binding_name:
             self.tts = self.tts_binding_manager.create_binding(
                 binding_name=tts_binding_name,
-                host_address=effective_host_address,
-                service_key=self.service_key,
-                verify_ssl_certificate=self.verify_ssl_certificate
+                **tts_binding_config
             )
             if self.tts is None:
                 ASCIIColors.warning(f"Failed to create TTS binding: {tts_binding_name}. Available: {self.tts_binding_manager.get_available_bindings()}")
 
         if tti_binding_name:
-            self.tti = self.tti_binding_manager.create_binding(
-                binding_name=tti_binding_name,
-                host_address=effective_host_address,
-                service_key=self.service_key, # Passed as service_key, used as client_id by lollms TTI binding
-                verify_ssl_certificate=self.verify_ssl_certificate
-            )
+            if tti_binding_config:
+                self.tti = self.tti_binding_manager.create_binding(
+                    binding_name=tti_binding_name,
+                    **tti_binding_config
+                )
+            else:
+                self.tti = self.tti_binding_manager.create_binding(
+                    binding_name=tti_binding_name
+                )
             if self.tti is None:
                 ASCIIColors.warning(f"Failed to create TTI binding: {tti_binding_name}. Available: {self.tti_binding_manager.get_available_bindings()}")
 
         if stt_binding_name:
-            self.stt = self.stt_binding_manager.create_binding(
-                binding_name=stt_binding_name,
-                host_address=effective_host_address,
-                service_key=self.service_key,
-                verify_ssl_certificate=self.verify_ssl_certificate
-            )
+            if stt_binding_config:
+                self.stt = self.stt_binding_manager.create_binding(
+                    binding_name=stt_binding_name,
+                    **stt_binding_config
+                )
+            else:
+                self.stt = self.stt_binding_manager.create_binding(
+                    binding_name=stt_binding_name,
+                )
             if self.stt is None:
                 ASCIIColors.warning(f"Failed to create STT binding: {stt_binding_name}. Available: {self.stt_binding_manager.get_available_bindings()}")
-
         if ttv_binding_name:
-            self.ttv = self.ttv_binding_manager.create_binding(
-                binding_name=ttv_binding_name,
-                host_address=effective_host_address,
-                service_key=self.service_key,
-                verify_ssl_certificate=self.verify_ssl_certificate
-            )
+            if ttv_binding_config:
+                self.ttv = self.ttv_binding_manager.create_binding(
+                    binding_name=ttv_binding_name,
+                    **ttv_binding_config
+                )
+            else:
+                self.ttv = self.ttv_binding_manager.create_binding(
+                    binding_name=ttv_binding_name
+                )
             if self.ttv is None:
                 ASCIIColors.warning(f"Failed to create TTV binding: {ttv_binding_name}. Available: {self.ttv_binding_manager.get_available_bindings()}")
 
         if ttm_binding_name:
-            self.ttm = self.ttm_binding_manager.create_binding(
-                binding_name=ttm_binding_name,
-                host_address=effective_host_address,
-                service_key=self.service_key,
-                verify_ssl_certificate=self.verify_ssl_certificate
-            )
+            if ttm_binding_config:
+                self.ttm = self.ttm_binding_manager.create_binding(
+                    binding_name=ttm_binding_name,
+                    **ttm_binding_config
+                )
+            else:
+                self.ttm = self.ttm_binding_manager.create_binding(
+                    binding_name=ttm_binding_name
+                )
             if self.ttm is None:
                 ASCIIColors.warning(f"Failed to create TTM binding: {ttm_binding_name}. Available: {self.ttm_binding_manager.get_available_bindings()}")
 
-
         # --- Store Default Generation Parameters ---
         self.default_ctx_size = ctx_size
         self.default_n_predict = n_predict

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/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:
         """