lollms-client 0.32.1__py3-none-any.whl → 1.0.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__ = "0.32.1" # Updated version
+__version__ = "1.0.0" # Updated version
 
 # Optionally, you could define __all__ if you want to be explicit about exports
 __all__ = [

lollms_client/llm_bindings/azure_openai/__init__.py

@@ -45,10 +45,6 @@ class AzureOpenAIBinding(LollmsLLMBinding):
     """
 
     def __init__(self,
-                 model_name: str, # In Azure, this is the DEPLOYMENT NAME
-                 azure_api_key: str = None,
-                 azure_endpoint: str = None,
-                 azure_api_version: str = "2024-02-01",
                  **kwargs
                  ):
         """
@@ -56,15 +52,15 @@ class AzureOpenAIBinding(LollmsLLMBinding):
 
         Args:
             model_name (str): The name of the Azure OpenAI DEPLOYMENT to use.
-            azure_api_key (str): The API key for the Azure OpenAI service.
+            service_key (str): The API key for the Azure OpenAI service.
             azure_endpoint (str): The endpoint URL for the Azure OpenAI service.
             azure_api_version (str): The API version to use.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name  # Here, it's the deployment name
-        self.azure_api_key = azure_api_key or os.getenv("AZURE_OPENAI_API_KEY")
-        self.azure_endpoint = azure_endpoint or os.getenv("AZURE_OPENAI_ENDPOINT")
-        self.azure_api_version = azure_api_version or os.getenv("AZURE_OPENAI_API_VERSION", "2024-02-01")
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name")  # Here, it's the deployment name
+        self.azure_api_key = kwargs.get("service_key") or os.getenv("AZURE_OPENAI_API_KEY")
+        self.azure_endpoint = kwargs.get("azure_endpoint") or os.getenv("AZURE_OPENAI_ENDPOINT")
+        self.azure_api_version = kwargs.get("azure_api_version") or os.getenv("AZURE_OPENAI_API_VERSION", "2024-02-01")
 
         if not self.model_name:
             raise ValueError("Azure deployment name ('model_name') is required.")

lollms_client/llm_bindings/claude/__init__.py

@@ -66,10 +66,6 @@ class ClaudeBinding(LollmsLLMBinding):
     """Anthropic Claude-specific binding implementation."""
 
     def __init__(self,
-                 host_address: str = None,  # Ignored, for compatibility
-                 model_name: str = "claude-3-sonnet-20240229",
-                 service_key: str = None,
-                 verify_ssl_certificate: bool = True, # Ignored, for compatibility
                  **kwargs
                  ):
         """
@@ -79,9 +75,9 @@ class ClaudeBinding(LollmsLLMBinding):
             model_name (str): Name of the Claude model to use.
             service_key (str): Anthropic API key.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name
-        self.service_key = service_key
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name")
+        self.service_key = kwargs.get("service_key")
         self._cached_models: Optional[List[Dict[str, str]]] = None
 
         if not self.service_key:
@@ -335,6 +331,7 @@ class ClaudeBinding(LollmsLLMBinding):
             )
             return response.token_count # Updated to correct response attribute
         except Exception as e:
+            trace_exception(e)
             ASCIIColors.error(f"Failed to count tokens with Claude API: {e}")
             return len(self.tokenize(text))
 

lollms_client/llm_bindings/gemini/__init__.py

@@ -33,10 +33,6 @@ class GeminiBinding(LollmsLLMBinding):
     """Google Gemini-specific binding implementation."""
 
     def __init__(self,
-                 host_address: str = None,  # Ignored, for compatibility
-                 model_name: str = "gemini-1.5-pro-latest",
-                 service_key: str = None,
-                 verify_ssl_certificate: bool = True, # Ignored, for compatibility
                  **kwargs
                  ):
         """
@@ -46,9 +42,9 @@ class GeminiBinding(LollmsLLMBinding):
             model_name (str): Name of the Gemini model to use.
             service_key (str): Google AI Studio API key.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name
-        self.service_key = service_key
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name", None)
+        self.service_key = kwargs.get("service_key", None)
 
         if not self.service_key:
             self.service_key = os.getenv("GOOGLE_API_KEY")

lollms_client/llm_bindings/grok/__init__.py

@@ -60,10 +60,6 @@ class GrokBinding(LollmsLLMBinding):
     """xAI Grok-specific binding implementation."""
 
     def __init__(self,
-                 host_address: str = None,  # Ignored, for compatibility
-                 model_name: str = "grok-1.5-vision-preview",
-                 service_key: str = None,
-                 verify_ssl_certificate: bool = True, # Ignored, for compatibility
                  **kwargs
                  ):
         """
@@ -73,9 +69,9 @@ class GrokBinding(LollmsLLMBinding):
             model_name (str): Name of the Grok model to use.
             service_key (str): xAI API key.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name
-        self.service_key = service_key
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name", "grok-1.5-vision-preview")
+        self.service_key = kwargs.get("service_key")
         self.base_url = kwargs.get("base_url", GROK_API_BASE_URL)
         self._cached_models: Optional[List[Dict[str, str]]] = None
 

lollms_client/llm_bindings/groq/__init__.py

@@ -29,8 +29,6 @@ class GroqBinding(LollmsLLMBinding):
     """
 
     def __init__(self,
-                 model_name: str = "llama3-8b-8192",
-                 groq_api_key: str = None,
                  **kwargs
                  ):
         """
@@ -38,11 +36,11 @@ class GroqBinding(LollmsLLMBinding):
 
         Args:
             model_name (str): The name of the Groq model to use.
-            groq_api_key (str): The API key for the Groq service.
+            service_key (str): The API key for the Groq service.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name
-        self.groq_api_key = groq_api_key or os.getenv("GROQ_API_KEY")
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name", "llama3-8b-8192")
+        self.groq_api_key = kwargs.get("service_key") or os.getenv("GROQ_API_KEY")
 
         if not self.groq_api_key:
             raise ValueError("Groq API key is required. Set it via 'groq_api_key' or GROQ_API_KEY env var.")
@@ -258,7 +256,6 @@ if __name__ == '__main__':
         ASCIIColors.cyan("\n--- Text Generation (Streaming) ---")
         full_streamed_text = ""
         def stream_callback(chunk: str, msg_type: int):
-            nonlocal full_streamed_text
             ASCIIColors.green(chunk, end="", flush=True)
             full_streamed_text += chunk
             return True

lollms_client/llm_bindings/hugging_face_inference_api/__init__.py

@@ -25,8 +25,6 @@ class HuggingFaceInferenceAPIBinding(LollmsLLMBinding):
     """
 
     def __init__(self,
-                 model_name: str = "mistralai/Mistral-7B-Instruct-v0.2",
-                 hf_api_key: str = None,
                  **kwargs
                  ):
         """
@@ -34,11 +32,11 @@ class HuggingFaceInferenceAPIBinding(LollmsLLMBinding):
 
         Args:
             model_name (str): The repository ID of the model on the Hugging Face Hub.
-            hf_api_key (str): The Hugging Face API key.
+            service_key (str): The Hugging Face API key.
         """
-        super().__init__(binding_name=BindingName)
-        self.model_name = model_name
-        self.hf_api_key = hf_api_key or os.getenv("HUGGING_FACE_HUB_TOKEN")
+        super().__init__(BindingName, **kwargs)
+        self.model_name = kwargs.get("model_name")
+        self.hf_api_key = kwargs.get("service_key") or os.getenv("HUGGING_FACE_HUB_TOKEN")
 
         if not self.hf_api_key:
             raise ValueError("Hugging Face API key is required. Set it via 'hf_api_key' or HUGGING_FACE_HUB_TOKEN env var.")

lollms_client/llm_bindings/litellm/__init__.py

@@ -36,12 +36,21 @@ class LiteLLMBinding(LollmsLLMBinding):
     and correct payload formatting for both streaming and non-streaming modes.
     """
     
-    def __init__(self, host_address: str, model_name: str, service_key: str = "anything", verify_ssl_certificate: bool = True, **kwargs):
-        super().__init__(binding_name="litellm")
-        self.host_address = host_address.rstrip('/')
-        self.model_name = model_name
-        self.service_key = service_key
-        self.verify_ssl_certificate = verify_ssl_certificate
+    def __init__(self, 
+                 **kwargs):
+        """ Initializes the LiteLLM binding with the provided parameters.
+        Args:
+            host_address (str): The base URL of the LiteLLM server.
+            model_name (str): The name of the model to use.
+            service_key (str): The API key for authentication.
+            verify_ssl_certificate (bool): Whether to verify SSL certificates.
+        """
+        super().__init__(BindingName, **kwargs)
+        self.host_address = kwargs.get("host_address")
+        if self.host_address: self.host_address = self.host_address.rstrip('/')
+        self.model_name = kwargs.get("model_name")
+        self.service_key = kwargs.get("service_key")
+        self.verify_ssl_certificate = kwargs.get("verify_ssl_certificate")
 
     def _perform_generation(self, messages: List[Dict], n_predict: Optional[int], stream: bool, temperature: float, top_p: float, repeat_penalty: float, seed: Optional[int], streaming_callback: Optional[Callable[[str, MSG_TYPE], None]]) -> Union[str, dict]:
         url = f'{self.host_address}/v1/chat/completions'