lollms-client 0.12.1__py3-none-any.whl → 0.12.3__py3-none-any.whl

lollms_client/__init__.py

@@ -1,8 +1,20 @@
+# lollms_client/__init__.py
 from lollms_client.lollms_core import LollmsClient, ELF_COMPLETION_FORMAT
 from lollms_client.lollms_tasks import TasksLibrary
-from lollms_client.lollms_types import MSG_TYPE
-from lollms_client.lollms_personality import LollmsPersonality
+from lollms_client.lollms_types import MSG_TYPE # Assuming ELF_GENERATION_FORMAT is not directly used by users from here
 from lollms_client.lollms_discussion import LollmsDiscussion, LollmsMessage
-from lollms_client.lollms_utilities import PromptReshaper
-from lollms_client.lollms_tts_binding import LollmsTTS
+from lollms_client.lollms_utilities import PromptReshaper # Keep general utilities
 from lollms_client.lollms_functions import FunctionCalling_Library
+
+# Optionally, you could define __all__ if you want to be explicit about exports
+__all__ = [
+    "LollmsClient",
+    "ELF_COMPLETION_FORMAT",
+    "TasksLibrary",
+    "MSG_TYPE",
+    "LollmsPersonality",
+    "LollmsDiscussion",
+    "LollmsMessage",
+    "PromptReshaper",
+    "FunctionCalling_Library"
+]

lollms_client/llm_bindings/lollms/__init__.py

@@ -10,6 +10,7 @@ import json
 
 BindingName = "LollmsLLMBinding"
 
+
 class LollmsLLMBinding(LollmsLLMBinding):
     """LOLLMS-specific binding implementation"""
     
@@ -215,7 +216,18 @@ class LollmsLLMBinding(LollmsLLMBinding):
         except Exception as ex:
             return {"status": False, "error": str(ex)}
 
+    def count_tokens(self, text: str) -> int:
+        """
+        Count tokens from a text.
 
+        Args:
+            tokens (list): List of tokens to detokenize.
+
+        Returns:
+            int: Number of tokens in text.
+        """        
+        return len(self.tokenize(text))
+    
     def embed(self, text: str, **kwargs) -> list:
         """
         Get embeddings for the input text using Ollama API

lollms_client/llm_bindings/ollama/__init__.py

@@ -11,6 +11,72 @@ from ascii_colors import ASCIIColors, trace_exception
 BindingName = "OllamaBinding"
 
 
+def count_tokens_ollama(
+    text_to_tokenize: str,
+    model_name: str,
+    ollama_host: str = "http://localhost:11434",
+    timeout: int = 30
+) -> int:
+    """
+    Counts the number of tokens in a given text using a specified Ollama model
+    by calling the Ollama server's /api/tokenize endpoint.
+
+    Args:
+        text_to_tokenize (str): The text to be tokenized.
+        model_name (str): The name of the Ollama model to use (e.g., "llama3", "mistral").
+        ollama_host (str): The base URL of the Ollama server (default: "http://localhost:11434").
+        timeout (int): Timeout for the request in seconds (default: 30).
+
+    Returns:
+        int: The number of tokens. Returns -1 if an error occurs.
+
+    Raises:
+        requests.exceptions.RequestException: For network issues or timeouts.
+        requests.exceptions.HTTPError: For HTTP error responses (4xx or 5xx).
+        ValueError: If the response from Ollama is not as expected (e.g., missing 'tokens' key).
+    """
+    api_url = f"{ollama_host}/api/tokenize"
+    payload = {
+        "model": model_name,
+        "prompt": text_to_tokenize
+        # You can add "options" here if needed, but for tokenization, it's usually not required.
+        # "options": {"num_ctx": 4096} # Example, might influence tokenizer for specific context length
+    }
+
+    try:
+        response = requests.post(api_url, json=payload, timeout=timeout)
+        response.raise_for_status()  # Raises HTTPError for bad responses (4xx or 5xx)
+
+        response_data = response.json()
+
+        if "tokens" in response_data and isinstance(response_data["tokens"], list):
+            return len(response_data["tokens"])
+        else:
+            raise ValueError(
+                f"Ollama response did not contain a 'tokens' list. Response: {response_data}"
+            )
+
+    except requests.exceptions.HTTPError as http_err:
+        # You might want to inspect http_err.response.text for more details from Ollama
+        print(f"HTTP error occurred: {http_err} - {http_err.response.text}")
+        raise  # Re-raise the exception
+    except requests.exceptions.ConnectionError as conn_err:
+        print(f"Connection error occurred: {conn_err}")
+        raise
+    except requests.exceptions.Timeout as timeout_err:
+        print(f"Timeout error occurred: {timeout_err}")
+        raise
+    except requests.exceptions.RequestException as req_err:
+        print(f"An unexpected error occurred with the request: {req_err}")
+        raise
+    except json.JSONDecodeError as json_err:
+        # This can happen if the server returns non-JSON, e.g., an HTML error page
+        raise ValueError(
+            f"Failed to decode JSON response from Ollama: {json_err}. Response text: {response.text}"
+        ) from json_err
+    except ValueError as val_err: # Catches the ValueError raised above for missing 'tokens'
+        print(f"Value error: {val_err}")
+        raise
 class OllamaBinding(LollmsLLMBinding):
     """Ollama-specific binding implementation"""
     
@@ -210,6 +276,18 @@ class OllamaBinding(LollmsLLMBinding):
         """
         return "".join(tokens)
     
+    def count_tokens(self, text: str) -> int:
+        """
+        Count tokens from a text.
+
+        Args:
+            tokens (list): List of tokens to detokenize.
+
+        Returns:
+            int: Number of tokens in text.
+        """        
+        return count_tokens_ollama(text, self.model_name, self.host_address)
+    
     def embed(self, text: str, **kwargs) -> list:
         """
         Get embeddings for the input text using Ollama API

lollms_client/llm_bindings/openai/__init__.py

@@ -199,6 +199,19 @@ class OpenAIBinding(LollmsLLMBinding):
             return tiktoken.model.encoding_for_model(self.model_name).decode(tokens)
         except:
             return tiktoken.model.encoding_for_model("gpt-3.5-turbo").decode(tokens)
+
+    def count_tokens(self, text: str) -> int:
+        """
+        Count tokens from a text.
+
+        Args:
+            tokens (list): List of tokens to detokenize.
+
+        Returns:
+            int: Number of tokens in text.
+        """        
+        return len(self.tokenize(text))
+
         
     def embed(self, text: str, **kwargs) -> list:
         """

lollms_client/llm_bindings/transformers/__init__.py

@@ -254,6 +254,19 @@ class TransformersBinding(LollmsLLMBinding):
         """Convert a list of tokens back to text."""
         return "".join(tokens)
     
+    def count_tokens(self, text: str) -> int:
+        """
+        Count tokens from a text.
+
+        Args:
+            tokens (list): List of tokens to detokenize.
+
+        Returns:
+            int: Number of tokens in text.
+        """        
+        return len(self.tokenize(text))
+
+    
     def embed(self, text: str, **kwargs) -> list:
         """Get embeddings for the input text (placeholder)."""
         pass

lollms_client/lollms_llm_binding.py

@@ -103,6 +103,19 @@ class LollmsLLMBinding(ABC):
             str: Detokenized text.
         """
         pass
+    
+    @abstractmethod
+    def count_tokens(self, text: str) -> int:
+        """
+        Count tokens from a text.
+
+        Args:
+            tokens (list): List of tokens to detokenize.
+
+        Returns:
+            int: Number of tokens in text.
+        """        
+        pass
 
     @abstractmethod
     def embed(self, text: str, **kwargs) -> list:

{lollms_client-0.12.1.dist-info → lollms_client-0.12.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lollms_client
-Version: 0.12.1
+Version: 0.12.3
 Summary: A client library for LoLLMs generate endpoint
 Home-page: https://github.com/ParisNeo/lollms_client
 Author: ParisNeo

{lollms_client-0.12.1.dist-info → lollms_client-0.12.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-lollms_client/__init__.py,sha256=CrU6LzlhPyYQOMDgkw8Dqb3nvWYyZk0HixGF0QyTOWc,501
+lollms_client/__init__.py,sha256=Ey-ct0qjYx07HIZo5C_6ZOPOwZdlKyrH4LaMszGUzQM,821
 lollms_client/lollms_config.py,sha256=goEseDwDxYJf3WkYJ4IrLXwg3Tfw73CXV2Avg45M_hE,21876
 lollms_client/lollms_core.py,sha256=NYUmzYxxMAPyy8OQ5fnPSerzM5IEYxhz598zZdA6Qrg,77772
 lollms_client/lollms_discussion.py,sha256=9b83m0D894jwpgssWYTQHbVxp1gJoI-J947Ui_dRXII,2073
 lollms_client/lollms_functions.py,sha256=p8SFtmEPqvVCsIz2fZ5HxyOHaxjrAo5c12uTzJnb6m8,3594
 lollms_client/lollms_js_analyzer.py,sha256=01zUvuO2F_lnUe_0NLxe1MF5aHE1hO8RZi48mNPv-aw,8361
-lollms_client/lollms_llm_binding.py,sha256=3oyj2GF7x27bCQxM8D1ZkKiEfGKFp0E_Bv5bH_meTMk,8331
+lollms_client/lollms_llm_binding.py,sha256=pYygaOHD4M4LGDNlaV4fAiHtnPzfgDlDNuOcWF0k2RQ,8627
 lollms_client/lollms_personality.py,sha256=gTOU7WJrxyNE88g-9-is5QxMf84s6xbEMAv--SD2P64,20313
 lollms_client/lollms_personality_worker.py,sha256=rQbZg9Gn-R3b6x0Ryb4JPWJzBfn4fObDzj5IWYez_9o,65331
 lollms_client/lollms_python_analyzer.py,sha256=7gf1fdYgXCOkPUkBAPNmr6S-66hMH4_KonOMsADASxc,10246
@@ -20,10 +20,10 @@ lollms_client/lollms_ttv_binding.py,sha256=u-gLIe22tbu4YsKA5RTyUT7iBlKxPXDmoQzcc
 lollms_client/lollms_types.py,sha256=cfc1sremM8KR4avkYX99fIVkkdRvXErrCWKGjLrgv50,2723
 lollms_client/lollms_utilities.py,sha256=YAgamfp0pBVApR68AHKjhp1lh6isMNF8iadwWLl63c0,7045
 lollms_client/llm_bindings/__init__.py,sha256=9sWGpmWSSj6KQ8H4lKGCjpLYwhnVdL_2N7gXCphPqh4,14
-lollms_client/llm_bindings/lollms/__init__.py,sha256=PRQwXOdqR_nWMvxwcL2u-32YBPDrSdQZRUxkbz3-bBk,11911
-lollms_client/llm_bindings/ollama/__init__.py,sha256=7xZpoRQNptTPlHY9o5BD0xH2yR-b3FcT8wfv-SOWS9Q,12534
-lollms_client/llm_bindings/openai/__init__.py,sha256=8VbJ9EF30w0gTlc9e7gzvTxBfWl0mjNBGlHqUoqQ2eg,10463
-lollms_client/llm_bindings/transformers/__init__.py,sha256=vSzg5OWpiFPPP3GzEfoOs9K7Q0B1n6zCi3-j4M9tkWE,12467
+lollms_client/llm_bindings/lollms/__init__.py,sha256=H1Vw6trTzinS_xaeNWZ7Aq-3XngbzoYxtA4Se2IeCpQ,12213
+lollms_client/llm_bindings/ollama/__init__.py,sha256=oOSWM7eVpDPTBGulRdHukOxpIwvA1x5VNsJEVgT2jFk,15843
+lollms_client/llm_bindings/openai/__init__.py,sha256=n8y14j6MAkaZSGMsvvUogr8LRgLsNz4S6QJJdB6H0lQ,10763
+lollms_client/llm_bindings/transformers/__init__.py,sha256=UyaiQcJQricBZJGe1zfNIVy6Cb3QpHSvImSoE9FhgC0,12771
 lollms_client/stt_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lollms_client/stt_bindings/lollms/__init__.py,sha256=7-IZkrsn15Vaz0oqkqCxMeNQfMkeilbgScLlrrywES4,6098
 lollms_client/tti_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,8 +34,8 @@ lollms_client/tts_bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 lollms_client/tts_bindings/lollms/__init__.py,sha256=8x2_T9XscvISw2TiaLoFxvrS7TIsVLdqbwSc04cX-wc,7164
 lollms_client/ttv_bindings/__init__.py,sha256=UZ8o2izQOJLQgtZ1D1cXoNST7rzqW22rL2Vufc7ddRc,3141
 lollms_client/ttv_bindings/lollms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lollms_client-0.12.1.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-lollms_client-0.12.1.dist-info/METADATA,sha256=KSlyF6abPll_F4-vU03grmQSpt5yTkW6tnOVD93HbG0,6866
-lollms_client-0.12.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-lollms_client-0.12.1.dist-info/top_level.txt,sha256=Bk_kz-ri6Arwsk7YG-T5VsRorV66uVhcHGvb_g2WqgE,14
-lollms_client-0.12.1.dist-info/RECORD,,
+lollms_client-0.12.3.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+lollms_client-0.12.3.dist-info/METADATA,sha256=t92LRON5mw051xnzqLrPRyagxWEklQZrnaOJwEXy9OM,6866
+lollms_client-0.12.3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+lollms_client-0.12.3.dist-info/top_level.txt,sha256=Bk_kz-ri6Arwsk7YG-T5VsRorV66uVhcHGvb_g2WqgE,14
+lollms_client-0.12.3.dist-info/RECORD,,