SimplerLLM 0.3.2.7__tar.gz → 0.3.3.0__tar.gz

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplerLLM
-Version: 0.3.2.7
+Version: 0.3.3.0
 Summary: An easy-to-use Library for interacting with language models.
 Home-page: https://github.com/hassancs91/SimplerLLM
 Author: Hasan Aboul Hasan

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/__init__.py

@@ -5,6 +5,7 @@ from .wrappers.gemini_wrapper import GeminiLLM
 from .wrappers.anthropic_wrapper import AnthropicLLM
 from .wrappers.ollama_wrapper import OllamaLLM
 from .wrappers.deepseek_wrapper import DeepSeekLLM
+from .wrappers.perplexity_wrapper import PerplexityLLM
 
 __all__ = [
     'LLM',
@@ -16,4 +17,5 @@ __all__ = [
     'AnthropicLLM',
     'OllamaLLM',
     'DeepSeekLLM',
+    'PerplexityLLM',
 ]

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/base.py

@@ -22,6 +22,7 @@ class LLMProvider(Enum):
     DEEPSEEK = 6
     OPENROUTER = 7
     COHERE = 8
+    PERPLEXITY = 9
 
 class LLM:
     def __init__(
@@ -77,6 +78,9 @@ class LLM:
         if provider == LLMProvider.COHERE:
             from .wrappers.cohere_wrapper import CohereLLM
             return CohereLLM(provider, model_name, temperature, top_p, api_key, verbose=verbose)
+        if provider == LLMProvider.PERPLEXITY:
+            from .wrappers.perplexity_wrapper import PerplexityLLM
+            return PerplexityLLM(provider, model_name, temperature, top_p, api_key, verbose=verbose)
         else:
             return None
 

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/reliable.py

@@ -96,6 +96,7 @@ class ReliableLLM:
         json_mode=False,
         images: list = None,
         detail: str = "auto",
+        web_search: bool = False,
     ) -> Union[str, LLMFullResponse, Tuple[Union[str, LLMFullResponse], LLMProvider, str]]:
         """
         Generate a response using the primary LLM, falling back to secondary if primary fails.
@@ -113,6 +114,7 @@ class ReliableLLM:
             json_mode (bool, optional): If True, enables JSON mode for structured output.
             images (list, optional): A list of image URLs or file paths for vision tasks.
             detail (str, optional): Level of detail for image analysis ("low", "high", "auto"). OpenAI-specific parameter. Defaults to "auto".
+            web_search (bool, optional): If True, enables web search before generating response. OpenAI-specific parameter. Defaults to False.
 
         Returns:
             Union[str, dict, Tuple[Union[str, dict], LLMProvider, str]]:
@@ -138,6 +140,7 @@ class ReliableLLM:
                     json_mode=json_mode,
                     images=images,
                     detail=detail,
+                    web_search=web_search,
                 )
                 if self.verbose:
                     verbose_print("Primary provider generated response successfully", "info")
@@ -159,6 +162,7 @@ class ReliableLLM:
                         json_mode=json_mode,
                         images=images,
                         detail=detail,
+                        web_search=web_search,
                     )
                     if self.verbose:
                         verbose_print("Secondary provider generated response successfully", "info")
@@ -181,6 +185,7 @@ class ReliableLLM:
                 json_mode=json_mode,
                 images=images,
                 detail=detail,
+                web_search=web_search,
             )
             if self.verbose:
                 verbose_print("Secondary provider generated response successfully", "info")
@@ -203,6 +208,7 @@ class ReliableLLM:
         json_mode: bool = False,
         images: list = None,
         detail: str = "auto",
+        web_search: bool = False,
     ) -> Union[str, LLMFullResponse, Tuple[Union[str, LLMFullResponse], LLMProvider, str]]:
         """
         Asynchronously generate a response using the primary LLM, falling back to secondary if primary fails.
@@ -220,6 +226,7 @@ class ReliableLLM:
             json_mode (bool, optional): If True, enables JSON mode for structured output.
             images (list, optional): A list of image URLs or file paths for vision tasks.
             detail (str, optional): Level of detail for image analysis ("low", "high", "auto"). OpenAI-specific parameter. Defaults to "auto".
+            web_search (bool, optional): If True, enables web search before generating response. OpenAI-specific parameter. Defaults to False.
 
         Returns:
             Union[str, dict, Tuple[Union[str, dict], LLMProvider, str]]:
@@ -245,6 +252,7 @@ class ReliableLLM:
                     json_mode=json_mode,
                     images=images,
                     detail=detail,
+                    web_search=web_search,
                 )
                 if self.verbose:
                     verbose_print("Primary provider generated response successfully", "info")
@@ -266,6 +274,7 @@ class ReliableLLM:
                         json_mode=json_mode,
                         images=images,
                         detail=detail,
+                        web_search=web_search,
                     )
                     if self.verbose:
                         verbose_print("Secondary provider generated response successfully", "info")
@@ -288,6 +297,7 @@ class ReliableLLM:
                 json_mode=json_mode,
                 images=images,
                 detail=detail,
+                web_search=web_search,
             )
             if self.verbose:
                 verbose_print("Secondary provider generated response successfully", "info")

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/wrappers/__init__.py

@@ -4,6 +4,7 @@ from .anthropic_wrapper import AnthropicLLM
 from .ollama_wrapper import OllamaLLM
 from .deepseek_wrapper import DeepSeekLLM
 from .cohere_wrapper import CohereLLM
+from .perplexity_wrapper import PerplexityLLM
 
 __all__ = [
     'OpenAILLM',
@@ -12,4 +13,5 @@ __all__ = [
     'OllamaLLM',
     'DeepSeekLLM',
     'CohereLLM',
+    'PerplexityLLM',
 ]

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/wrappers/anthropic_wrapper.py

@@ -29,6 +29,7 @@ class AnthropicLLM(LLM):
         cached_input: str = "",
         json_mode=False,
         images: list = None,
+        web_search: bool = False,
     ):
         """
         Generate a response using the Anthropic LLM.
@@ -46,6 +47,7 @@ class AnthropicLLM(LLM):
             cached_input (str, optional): The cached input to use if prompt_caching is True. Defaults to "".
             json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
             images (list, optional): List of image sources (URLs or file paths) for vision-capable models. Defaults to None.
+            web_search (bool, optional): If True, enables web search before generating response. Defaults to False.
 
         Returns:
             The generated response from the Anthropic LLM.
@@ -53,6 +55,43 @@ class AnthropicLLM(LLM):
         Raises:
             ValueError: If both prompt and messages are provided, or if neither is provided.
         """
+        # Handle web search mode
+        if web_search:
+            if not prompt and not messages:
+                raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+            effective_model = model_name if model_name else self.model_name
+
+            # Prepare messages for web search
+            if prompt:
+                if images:
+                    user_content = prepare_vision_content_anthropic(prompt, images)
+                else:
+                    user_content = prompt
+                model_messages = [{"role": "user", "content": user_content}]
+            else:
+                model_messages = self.append_messages(messages)
+
+            if self.verbose:
+                verbose_print(f"Generating response with web search using {effective_model}...", "info")
+
+            try:
+                response = anthropic_llm.generate_response_with_web_search(
+                    model_name=effective_model,
+                    system_prompt=system_prompt,
+                    messages=model_messages,
+                    max_tokens=max_tokens,
+                    full_response=full_response,
+                    api_key=self.api_key,
+                )
+                if self.verbose:
+                    verbose_print("Web search response received successfully", "info")
+                return response
+            except Exception as e:
+                if self.verbose:
+                    verbose_print(f"Error generating web search response: {str(e)}", "error")
+                raise
+
         params = self.prepare_params(model_name, temperature, top_p)
 
         # Validate inputs
@@ -130,6 +169,7 @@ class AnthropicLLM(LLM):
         cached_input: str = "",
         json_mode=False,
         images: list = None,
+        web_search: bool = False,
     ):
         """
         Asynchronously generate a response from the Anthropic LLM.
@@ -147,6 +187,7 @@ class AnthropicLLM(LLM):
             cached_input (str, optional): The cached input to use. Defaults to "".
             json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
             images (list, optional): List of image sources (URLs or file paths) for vision-capable models. Defaults to None.
+            web_search (bool, optional): If True, enables web search before generating response. Defaults to False.
 
         Returns:
             The asynchronously generated response from the Anthropic LLM.
@@ -154,6 +195,43 @@ class AnthropicLLM(LLM):
         Raises:
             ValueError: If both prompt and messages are provided, or if neither is provided.
         """
+        # Handle web search mode
+        if web_search:
+            if not prompt and not messages:
+                raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+            effective_model = model_name if model_name else self.model_name
+
+            # Prepare messages for web search
+            if prompt:
+                if images:
+                    user_content = prepare_vision_content_anthropic(prompt, images)
+                else:
+                    user_content = prompt
+                model_messages = [{"role": "user", "content": user_content}]
+            else:
+                model_messages = self.append_messages(messages)
+
+            if self.verbose:
+                verbose_print(f"Generating response with web search (async) using {effective_model}...", "info")
+
+            try:
+                response = await anthropic_llm.generate_response_with_web_search_async(
+                    model_name=effective_model,
+                    system_prompt=system_prompt,
+                    messages=model_messages,
+                    max_tokens=max_tokens,
+                    full_response=full_response,
+                    api_key=self.api_key,
+                )
+                if self.verbose:
+                    verbose_print("Web search response received successfully", "info")
+                return response
+            except Exception as e:
+                if self.verbose:
+                    verbose_print(f"Error generating web search response: {str(e)}", "error")
+                raise
+
         params = self.prepare_params(model_name, temperature, top_p)
 
         # Validate inputs

{simplerllm-0.3.2.7 → simplerllm-0.3.3.0}/SimplerLLM/language/llm/wrappers/openai_wrapper.py

@@ -28,6 +28,7 @@ class OpenAILLM(LLM):
         json_mode=False,
         images: list = None,
         detail: str = "auto",
+        web_search: bool = False,
     ):
         """
         Generate a response using the OpenAI language model.
@@ -44,6 +45,7 @@ class OpenAILLM(LLM):
             json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
             images (list, optional): List of image sources (URLs or file paths) for vision-capable models. Defaults to None.
             detail (str, optional): Level of detail for image processing ("low", "high", "auto"). Defaults to "auto".
+            web_search (bool, optional): If True, enables web search before generating response. Defaults to False.
 
         Returns:
             str or dict: The generated response as a string, or the full API response as a dictionary if full_response is True.
@@ -51,6 +53,43 @@ class OpenAILLM(LLM):
         Raises:
             ValueError: If both prompt and messages are provided, or if neither is provided.
         """
+        # Handle web search mode - uses Responses API
+        if web_search:
+            if not prompt and not messages:
+                raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+            # Combine system prompt and user input for web search
+            if prompt:
+                input_text = f"{system_prompt}\n\n{prompt}"
+            else:
+                # Convert messages to a single input string
+                input_text = system_prompt + "\n\n"
+                for msg in messages:
+                    role = msg.get("role", "user")
+                    content = msg.get("content", "")
+                    input_text += f"{role}: {content}\n"
+
+            effective_model = model_name if model_name else self.model_name
+
+            if self.verbose:
+                verbose_print(f"Generating response with web search using {effective_model}...", "info")
+
+            try:
+                response = openai_llm.generate_response_with_web_search(
+                    model_name=effective_model,
+                    input_text=input_text,
+                    max_tokens=max_tokens,
+                    full_response=full_response,
+                    api_key=self.api_key,
+                )
+                if self.verbose:
+                    verbose_print("Web search response received successfully", "info")
+                return response
+            except Exception as e:
+                if self.verbose:
+                    verbose_print(f"Error generating web search response: {str(e)}", "error")
+                raise
+
         params = self.prepare_params(model_name, temperature, top_p)
 
         # Validate inputs
@@ -126,6 +165,7 @@ class OpenAILLM(LLM):
         json_mode=False,
         images: list = None,
         detail: str = "auto",
+        web_search: bool = False,
     ):
         """
         Asynchronously generates a response using the OpenAI API.
@@ -142,6 +182,7 @@ class OpenAILLM(LLM):
             json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
             images (list, optional): List of image sources (URLs or file paths) for vision-capable models. Defaults to None.
             detail (str, optional): Level of detail for image processing ("low", "high", "auto"). Defaults to "auto".
+            web_search (bool, optional): If True, enables web search before generating response. Defaults to False.
 
         Returns:
             str or dict: The generated response as a string, or the full API response as a dictionary if full_response is True.
@@ -149,6 +190,43 @@ class OpenAILLM(LLM):
         Raises:
             ValueError: If both prompt and messages are provided, or if neither is provided.
         """
+        # Handle web search mode - uses Responses API
+        if web_search:
+            if not prompt and not messages:
+                raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+            # Combine system prompt and user input for web search
+            if prompt:
+                input_text = f"{system_prompt}\n\n{prompt}"
+            else:
+                # Convert messages to a single input string
+                input_text = system_prompt + "\n\n"
+                for msg in messages:
+                    role = msg.get("role", "user")
+                    content = msg.get("content", "")
+                    input_text += f"{role}: {content}\n"
+
+            effective_model = model_name if model_name else self.model_name
+
+            if self.verbose:
+                verbose_print(f"Generating response with web search (async) using {effective_model}...", "info")
+
+            try:
+                response = await openai_llm.generate_response_with_web_search_async(
+                    model_name=effective_model,
+                    input_text=input_text,
+                    max_tokens=max_tokens,
+                    full_response=full_response,
+                    api_key=self.api_key,
+                )
+                if self.verbose:
+                    verbose_print("Web search response received successfully", "info")
+                return response
+            except Exception as e:
+                if self.verbose:
+                    verbose_print(f"Error generating web search response: {str(e)}", "error")
+                raise
+
         params = self.prepare_params(model_name, temperature, top_p)
 
         # Validate inputs

simplerllm-0.3.3.0/SimplerLLM/language/llm/wrappers/perplexity_wrapper.py

@@ -0,0 +1,222 @@
+import SimplerLLM.language.llm_providers.perplexity_llm as perplexity_llm
+import os
+from ..base import LLM
+from SimplerLLM.utils.custom_verbose import verbose_print
+
+
+class PerplexityLLM(LLM):
+    def __init__(self, provider, model_name, temperature, top_p, api_key, verbose=False):
+        super().__init__(provider, model_name, temperature, top_p, api_key, verbose=verbose)
+        self.api_key = api_key or os.getenv("PERPLEXITY_API_KEY", "")
+
+    def append_messages(self, messages: list):
+        model_messages = []
+        if messages:
+            model_messages.extend(messages)
+        return model_messages
+
+    def generate_response(
+        self,
+        model_name: str = None,
+        prompt: str = None,
+        messages: list = None,
+        system_prompt: str = "You are a helpful AI Assistant",
+        temperature: float = 0.7,
+        max_tokens: int = 300,
+        top_p: float = 1.0,
+        full_response: bool = False,
+        json_mode: bool = False,
+        search_domain_filter: list = None,
+        search_recency_filter: str = None,
+        return_images: bool = False,
+        return_related_questions: bool = False,
+        images: list = None,
+        detail: str = "auto",
+        web_search: bool = False,
+    ):
+        """
+        Generate a response using the Perplexity LLM.
+
+        Perplexity has built-in web search by default - every request performs a web search.
+        Citations are returned in web_sources when full_response=True.
+
+        Args:
+            model_name (str, optional): The model to use (e.g., 'sonar', 'sonar-pro'). Defaults to instance's model_name.
+            prompt (str, optional): A single prompt string to generate a response for.
+            messages (list, optional): A list of message dictionaries for chat-based interactions.
+            system_prompt (str, optional): The system prompt. Defaults to "You are a helpful AI Assistant".
+            temperature (float, optional): Controls randomness (0-2). Defaults to 0.7.
+            max_tokens (int, optional): Maximum tokens to generate. Defaults to 300.
+            top_p (float, optional): Nucleus sampling threshold. Defaults to 1.0.
+            full_response (bool, optional): If True, returns LLMFullResponse with web_sources. Defaults to False.
+            json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
+            search_domain_filter (list, optional): Domains to include/exclude (prefix with "-" to exclude).
+            search_recency_filter (str, optional): Filter by time ("day", "week", "month").
+            return_images (bool, optional): Include images in results. Defaults to False.
+            return_related_questions (bool, optional): Return related queries. Defaults to False.
+
+        Returns:
+            str or LLMFullResponse: Generated text or full response with web sources.
+
+        Raises:
+            ValueError: If both prompt and messages are provided, or if neither is provided.
+        """
+        params = self.prepare_params(model_name, temperature, top_p)
+
+        # Validate inputs
+        if prompt and messages:
+            if self.verbose:
+                verbose_print("Error: Both prompt and messages provided", "error")
+            raise ValueError("Only one of 'prompt' or 'messages' should be provided.")
+        if not prompt and not messages:
+            if self.verbose:
+                verbose_print("Error: Neither prompt nor messages provided", "error")
+            raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+        # Prepare messages based on input type
+        if prompt:
+            if self.verbose:
+                verbose_print("Preparing single prompt message", "debug")
+                verbose_print(f"User prompt: {prompt}", "debug")
+
+            model_messages = [
+                {"role": "system", "content": system_prompt},
+                {"role": "user", "content": prompt},
+            ]
+        else:
+            if self.verbose:
+                verbose_print("Preparing chat messages", "debug")
+            # Prepend system message if not already present
+            model_messages = self.append_messages(messages)
+            if not any(msg.get("role") == "system" for msg in model_messages):
+                model_messages.insert(0, {"role": "system", "content": system_prompt})
+
+        params.update(
+            {
+                "api_key": self.api_key,
+                "messages": model_messages,
+                "max_tokens": max_tokens,
+                "full_response": full_response,
+                "json_mode": json_mode,
+                "search_domain_filter": search_domain_filter,
+                "search_recency_filter": search_recency_filter,
+                "return_images": return_images,
+                "return_related_questions": return_related_questions,
+            }
+        )
+
+        if self.verbose:
+            verbose_print(f"Generating response with Perplexity using {params['model_name']}...", "info")
+
+        try:
+            response = perplexity_llm.generate_response(**params)
+            if self.verbose:
+                verbose_print("Response received successfully", "info")
+            return response
+        except Exception as e:
+            if self.verbose:
+                verbose_print(f"Error generating response: {str(e)}", "error")
+            raise
+
+    async def generate_response_async(
+        self,
+        model_name: str = None,
+        prompt: str = None,
+        messages: list = None,
+        system_prompt: str = "You are a helpful AI Assistant",
+        temperature: float = 0.7,
+        max_tokens: int = 300,
+        top_p: float = 1.0,
+        full_response: bool = False,
+        json_mode: bool = False,
+        search_domain_filter: list = None,
+        search_recency_filter: str = None,
+        return_images: bool = False,
+        return_related_questions: bool = False,
+        images: list = None,
+        detail: str = "auto",
+        web_search: bool = False,
+    ):
+        """
+        Asynchronously generate a response using the Perplexity LLM.
+
+        Perplexity has built-in web search by default - every request performs a web search.
+        Citations are returned in web_sources when full_response=True.
+
+        Args:
+            model_name (str, optional): The model to use (e.g., 'sonar', 'sonar-pro'). Defaults to instance's model_name.
+            prompt (str, optional): A single prompt string to generate a response for.
+            messages (list, optional): A list of message dictionaries for chat-based interactions.
+            system_prompt (str, optional): The system prompt. Defaults to "You are a helpful AI Assistant".
+            temperature (float, optional): Controls randomness (0-2). Defaults to 0.7.
+            max_tokens (int, optional): Maximum tokens to generate. Defaults to 300.
+            top_p (float, optional): Nucleus sampling threshold. Defaults to 1.0.
+            full_response (bool, optional): If True, returns LLMFullResponse with web_sources. Defaults to False.
+            json_mode (bool, optional): If True, enables JSON mode. Defaults to False.
+            search_domain_filter (list, optional): Domains to include/exclude (prefix with "-" to exclude).
+            search_recency_filter (str, optional): Filter by time ("day", "week", "month").
+            return_images (bool, optional): Include images in results. Defaults to False.
+            return_related_questions (bool, optional): Return related queries. Defaults to False.
+
+        Returns:
+            str or LLMFullResponse: Generated text or full response with web sources.
+
+        Raises:
+            ValueError: If both prompt and messages are provided, or if neither is provided.
+        """
+        params = self.prepare_params(model_name, temperature, top_p)
+
+        # Validate inputs
+        if prompt and messages:
+            if self.verbose:
+                verbose_print("Error: Both prompt and messages provided", "error")
+            raise ValueError("Only one of 'prompt' or 'messages' should be provided.")
+        if not prompt and not messages:
+            if self.verbose:
+                verbose_print("Error: Neither prompt nor messages provided", "error")
+            raise ValueError("Either 'prompt' or 'messages' must be provided.")
+
+        # Prepare messages based on input type
+        if prompt:
+            if self.verbose:
+                verbose_print("Preparing single prompt message", "debug")
+                verbose_print(f"User prompt: {prompt}", "debug")
+
+            model_messages = [
+                {"role": "system", "content": system_prompt},
+                {"role": "user", "content": prompt},
+            ]
+        else:
+            if self.verbose:
+                verbose_print("Preparing chat messages", "debug")
+            # Prepend system message if not already present
+            model_messages = self.append_messages(messages)
+            if not any(msg.get("role") == "system" for msg in model_messages):
+                model_messages.insert(0, {"role": "system", "content": system_prompt})
+
+        params.update(
+            {
+                "api_key": self.api_key,
+                "messages": model_messages,
+                "max_tokens": max_tokens,
+                "full_response": full_response,
+                "json_mode": json_mode,
+                "search_domain_filter": search_domain_filter,
+                "search_recency_filter": search_recency_filter,
+                "return_images": return_images,
+                "return_related_questions": return_related_questions,
+            }
+        )
+
+        if self.verbose:
+            verbose_print(f"Generating response with Perplexity (async) using {params['model_name']}...", "info")
+
+        try:
+            response = await perplexity_llm.generate_response_async(**params)
+            if self.verbose:
+                verbose_print("Response received successfully", "info")
+            return response
+        except Exception as e:
+            if self.verbose:
+                verbose_print(f"Error generating response: {str(e)}", "error")
+            raise