webscout 7.8__py3-none-any.whl → 8.0__py3-none-any.whl

webscout/Provider/Gemini.py

@@ -1,165 +1,167 @@
-from os import path
-from json import load, dumps
-import warnings
-from typing import Union, Any, Dict
-
-# Import internal modules and dependencies
-from ..AIutel import Optimizers, Conversation, AwesomePrompts, sanitize_stream
-from ..AIbase import Provider, AsyncProvider
-from ..Bard import Chatbot, Model
-
-warnings.simplefilter("ignore", category=UserWarning)
-
-# Define model aliases for easy usage
-MODEL_ALIASES: Dict[str, Model] = {
-    "unspecified": Model.UNSPECIFIED,
-    "flash": Model.G_2_0_FLASH,
-    "flash-exp": Model.G_2_0_FLASH_EXP,
-    "thinking": Model.G_2_0_FLASH_THINKING,
-    "thinking-with-apps": Model.G_2_0_FLASH_THINKING_WITH_APPS,
-    "exp-advanced": Model.G_2_0_EXP_ADVANCED,
-    "2.5-exp-advanced": Model.G_2_5_EXP_ADVANCED,
-    "1.5-flash": Model.G_1_5_FLASH,
-    "1.5-pro": Model.G_1_5_PRO,
-    "1.5-pro-research": Model.G_1_5_PRO_RESEARCH,
-}
-
-# List of available models (friendly names)
-AVAILABLE_MODELS = list(MODEL_ALIASES.keys())
-
-class GEMINI(Provider):
-    def __init__(
-        self,
-        cookie_file: str,
-        model: str = "flash",  # Accepts either a Model enum or a str alias.
-        proxy: dict = {},
-        timeout: int = 30,
-    ):
-        """
-        Initializes GEMINI with model support.
-
-        Args:
-            cookie_file (str): Path to the cookies JSON file.
-            model (Model or str): Selected model for the session. Can be a Model enum
-                or a string alias. Available aliases: flash, flash-exp, thinking, thinking-with-apps,
-                exp-advanced, 2.5-exp-advanced, 2.5-pro, 1.5-flash, 1.5-pro, 1.5-pro-research.
-            proxy (dict, optional): HTTP request proxy. Defaults to {}.
-            timeout (int, optional): HTTP request timeout in seconds. Defaults to 30.
-        """
-        self.conversation = Conversation(False)
-
-        # Ensure cookie_file existence.
-        if not isinstance(cookie_file, str):
-            raise TypeError(f"cookie_file should be of type str, not '{type(cookie_file)}'")
-        if not path.isfile(cookie_file):
-            raise Exception(f"{cookie_file} is not a valid file path")
-
-        # If model is provided as alias (str), convert to Model enum.
-        if isinstance(model, str):
-            alias = model.lower()
-            if alias in MODEL_ALIASES:
-                selected_model = MODEL_ALIASES[alias]
-            else:
-                raise Exception(f"Unknown model alias: '{model}'. Available aliases: {', '.join(AVAILABLE_MODELS)}")
-        elif isinstance(model, Model):
-            selected_model = model
-        else:
-            raise TypeError("model must be a string alias or an instance of Model")
-
-        # Initialize the Chatbot session using the cookie file.
-        self.session = Chatbot(cookie_file, proxy, timeout, selected_model)
-        self.last_response = {}
-        self.__available_optimizers = (
-            method for method in dir(Optimizers) if callable(getattr(Optimizers, method)) and not method.startswith("__")
-        )
-        # Store cookies from Chatbot for later use (e.g. image generation)
-        self.session_auth1 = self.session.secure_1psid
-        self.session_auth2 = self.session.secure_1psidts
-
-    def ask(
-        self,
-        prompt: str,
-        stream: bool = False,
-        raw: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-    ) -> dict:
-        """Chat with AI.
-
-        Args:
-            prompt (str): Prompt to be sent.
-            stream (bool, optional): Flag for streaming response. Defaults to False.
-            raw (bool, optional): Stream back raw response as received. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name (e.g., 'code', 'shell_command'). Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-
-        Returns:
-            dict: Response generated by the underlying Chatbot.
-        """
-        conversation_prompt = self.conversation.gen_complete_prompt(prompt)
-        if optimizer:
-            if optimizer in self.__available_optimizers:
-                conversation_prompt = getattr(Optimizers, optimizer)(
-                    conversation_prompt if conversationally else prompt
-                )
-            else:
-                raise Exception(f"Optimizer is not one of {', '.join(self.__available_optimizers)}")
-
-        def for_stream():
-            response = self.session.ask(prompt)
-            self.last_response.update(response)
-            self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
-            yield dumps(response) if raw else response
-
-        def for_non_stream():
-            for _ in for_stream():
-                pass
-            return self.last_response
-
-        return for_stream() if stream else for_non_stream()
-
-    def chat(
-        self,
-        prompt: str,
-        stream: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-    ) -> str:
-        """Generate response text.
-
-        Args:
-            prompt (str): Prompt to be sent.
-            stream (bool, optional): Flag for streaming response. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-
-        Returns:
-            str: Response generated.
-        """
-        def for_stream():
-            for response in self.ask(prompt, True, optimizer=optimizer, conversationally=conversationally):
-                yield self.get_message(response)
-
-        def for_non_stream():
-            return self.get_message(self.ask(prompt, False, optimizer=optimizer, conversationally=conversationally))
-
-        return for_stream() if stream else for_non_stream()
-
-    def get_message(self, response: dict) -> str:
-        """Retrieves message content from the response.
-
-        Args:
-            response (dict): Response generated by `self.ask`.
-
-        Returns:
-            str: Extracted message content.
-        """
-        if not isinstance(response, dict):
-            raise TypeError("Response should be of type dict")
-        return response["content"]
-
-    def reset(self):
-        """Reset the current conversation."""
-        self.session.async_chatbot.conversation_id = ""
-        self.session.async_chatbot.response_id = ""
-        self.session.async_chatbot.choice_id = ""
+from os import path
+from json import load, dumps
+import warnings
+from typing import Union, Any, Dict
+
+# Import internal modules and dependencies
+from ..AIutel import Optimizers, Conversation, AwesomePrompts, sanitize_stream
+from ..AIbase import Provider, AsyncProvider
+from ..Bard import Chatbot, Model
+
+warnings.simplefilter("ignore", category=UserWarning)
+
+# Define model aliases for easy usage
+MODEL_ALIASES: Dict[str, Model] = {
+    "unspecified": Model.UNSPECIFIED,
+    "gemini-2.0-flash": Model.G_2_0_FLASH,
+    "gemini-2.0-flash-thinking": Model.G_2_0_FLASH_THINKING,
+    "gemini-2.5-pro": Model.G_2_5_PRO,
+    "gemini-2.0-exp-advanced": Model.G_2_0_EXP_ADVANCED,
+    "gemini-2.5-exp-advanced": Model.G_2_5_EXP_ADVANCED,
+    # Add shorter aliases for convenience
+    "flash": Model.G_2_0_FLASH,
+    "thinking": Model.G_2_0_FLASH_THINKING,
+    "pro": Model.G_2_5_PRO,
+    "advanced": Model.G_2_0_EXP_ADVANCED,
+    "advanced-2.5": Model.G_2_5_EXP_ADVANCED,
+}
+
+# List of available models (friendly names)
+AVAILABLE_MODELS = list(MODEL_ALIASES.keys())
+
+class GEMINI(Provider):
+    def __init__(
+        self,
+        cookie_file: str,
+        model: str = "flash",  # Accepts either a Model enum or a str alias.
+        proxy: dict = {},
+        timeout: int = 30,
+    ):
+        """
+        Initializes GEMINI with model support.
+
+        Args:
+            cookie_file (str): Path to the cookies JSON file.
+            model (Model or str): Selected model for the session. Can be a Model enum
+                or a string alias. Available aliases: flash, flash-exp, thinking, thinking-with-apps,
+                exp-advanced, 2.5-exp-advanced, 2.5-pro, 1.5-flash, 1.5-pro, 1.5-pro-research.
+            proxy (dict, optional): HTTP request proxy. Defaults to {}.
+            timeout (int, optional): HTTP request timeout in seconds. Defaults to 30.
+        """
+        self.conversation = Conversation(False)
+
+        # Ensure cookie_file existence.
+        if not isinstance(cookie_file, str):
+            raise TypeError(f"cookie_file should be of type str, not '{type(cookie_file)}'")
+        if not path.isfile(cookie_file):
+            raise Exception(f"{cookie_file} is not a valid file path")
+
+        # If model is provided as alias (str), convert to Model enum.
+        if isinstance(model, str):
+            alias = model.lower()
+            if alias in MODEL_ALIASES:
+                selected_model = MODEL_ALIASES[alias]
+            else:
+                raise Exception(f"Unknown model alias: '{model}'. Available aliases: {', '.join(AVAILABLE_MODELS)}")
+        elif isinstance(model, Model):
+            selected_model = model
+        else:
+            raise TypeError("model must be a string alias or an instance of Model")
+
+        # Initialize the Chatbot session using the cookie file.
+        self.session = Chatbot(cookie_file, proxy, timeout, selected_model)
+        self.last_response = {}
+        self.__available_optimizers = (
+            method for method in dir(Optimizers) if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        # Store cookies from Chatbot for later use (e.g. image generation)
+        self.session_auth1 = self.session.secure_1psid
+        self.session_auth2 = self.session.secure_1psidts
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> dict:
+        """Chat with AI.
+
+        Args:
+            prompt (str): Prompt to be sent.
+            stream (bool, optional): Flag for streaming response. Defaults to False.
+            raw (bool, optional): Stream back raw response as received. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name (e.g., 'code', 'shell_command'). Defaults to None.
+            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+
+        Returns:
+            dict: Response generated by the underlying Chatbot.
+        """
+        conversation_prompt = self.conversation.gen_complete_prompt(prompt)
+        if optimizer:
+            if optimizer in self.__available_optimizers:
+                conversation_prompt = getattr(Optimizers, optimizer)(
+                    conversation_prompt if conversationally else prompt
+                )
+            else:
+                raise Exception(f"Optimizer is not one of {', '.join(self.__available_optimizers)}")
+
+        def for_stream():
+            response = self.session.ask(prompt)
+            self.last_response.update(response)
+            self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
+            yield dumps(response) if raw else response
+
+        def for_non_stream():
+            for _ in for_stream():
+                pass
+            return self.last_response
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> str:
+        """Generate response text.
+
+        Args:
+            prompt (str): Prompt to be sent.
+            stream (bool, optional): Flag for streaming response. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+
+        Returns:
+            str: Response generated.
+        """
+        def for_stream():
+            for response in self.ask(prompt, True, optimizer=optimizer, conversationally=conversationally):
+                yield self.get_message(response)
+
+        def for_non_stream():
+            return self.get_message(self.ask(prompt, False, optimizer=optimizer, conversationally=conversationally))
+
+        return for_stream() if stream else for_non_stream()
+
+    def get_message(self, response: dict) -> str:
+        """Retrieves message content from the response.
+
+        Args:
+            response (dict): Response generated by `self.ask`.
+
+        Returns:
+            str: Extracted message content.
+        """
+        if not isinstance(response, dict):
+            raise TypeError("Response should be of type dict")
+        return response["content"]
+
+    def reset(self):
+        """Reset the current conversation."""
+        self.session.async_chatbot.conversation_id = ""
+        self.session.async_chatbot.response_id = ""
+        self.session.async_chatbot.choice_id = ""

webscout/Provider/GithubChat.py

@@ -24,7 +24,8 @@ class GithubChat(Provider):
         "claude-3.5-sonnet",
         "claude-3.7-sonnet",
         "claude-3.7-sonnet-thought",
-        "gemini-2.0-flash-001"
+        "gemini-2.0-flash-001",
+        "gemini-2.5-pro"
 
     ]
     

webscout/Provider/Groq.py

@@ -16,26 +16,31 @@ class GROQ(Provider):
     """
 
     AVAILABLE_MODELS = [
-        # "whisper-large-v3",
+        "distil-whisper-large-v3-en",
+        "gemma2-9b-it",
+        "llama-3.3-70b-versatile",
+        "llama-3.1-8b-instant",
+        "llama-guard-3-8b",
         "llama3-70b-8192",
-        "qwen-2.5-32b",
+        "llama3-8b-8192",
+        "whisper-large-v3",
+        "whisper-large-v3-turbo",
+        "meta-llama/llama-4-scout-17b-16e-instruct",
+        "meta-llama/llama-4-maverick-17b-128e-instruct",
+        "playai-tts",
+        "playai-tts-arabic",
+        "qwen-qwq-32b",
+        "mistral-saba-24b",
         "qwen-2.5-coder-32b",
+        "qwen-2.5-32b",
         "deepseek-r1-distill-qwen-32b",
         "deepseek-r1-distill-llama-70b",
+        "llama-3.3-70b-specdec",
+        "llama-3.2-1b-preview",
         "llama-3.2-3b-preview",
-        "gemma2-9b-it",
-        "llama-3.2-11b-vision-preview",
-        "llama3-8b-8192",
-        "llama-3.3-70b-versatile",
         "llama-3.2-11b-vision-preview",
-        # "distil-whisper-large-v3-en",
-        "mixtral-8x7b-32768",
-        "llama-3.3-70b-specdec",
         "llama-3.2-90b-vision-preview",
-        "llama-3.2-1b-preview",
-        # "whisper-large-v3-turbo",
-        "llama-3.1-8b-instant",
-        "llama-guard-3-8b"
+        "mixtral-8x7b-32768"
     ]
 
     def __init__(
@@ -345,22 +350,31 @@ class AsyncGROQ(AsyncProvider):
     """
 
     AVAILABLE_MODELS = [
-        # "whisper-large-v3",
-        "llama3-70b-8192",
-        "llama-3.2-3b-preview",
+        "distil-whisper-large-v3-en",
         "gemma2-9b-it",
-        "llama-3.2-11b-vision-preview",
-        "llama3-8b-8192",
         "llama-3.3-70b-versatile",
+        "llama-3.1-8b-instant",
+        "llama-guard-3-8b",
+        "llama3-70b-8192",
+        "llama3-8b-8192",
+        "whisper-large-v3",
+        "whisper-large-v3-turbo",
+        "meta-llama/llama-4-scout-17b-16e-instruct",
+        "meta-llama/llama-4-maverick-17b-128e-instruct",
+        "playai-tts",
+        "playai-tts-arabic",
+        "qwen-qwq-32b",
+        "mistral-saba-24b",
+        "qwen-2.5-coder-32b",
+        "qwen-2.5-32b",
+        "deepseek-r1-distill-qwen-32b",
         "deepseek-r1-distill-llama-70b",
-        # "distil-whisper-large-v3-en",
-        "mixtral-8x7b-32768",
         "llama-3.3-70b-specdec",
-        "llama-3.2-90b-vision-preview",
         "llama-3.2-1b-preview",
-        # "whisper-large-v3-turbo",
-        "llama-3.1-8b-instant",
-        "llama-guard-3-8b"
+        "llama-3.2-3b-preview",
+        "llama-3.2-11b-vision-preview",
+        "llama-3.2-90b-vision-preview",
+        "mixtral-8x7b-32768"
     ]
 
     def __init__(

webscout/Provider/LambdaChat.py

@@ -24,7 +24,8 @@ class LambdaChat(Provider):
         "hermes-3-llama-3.1-405b-fp8",
         "llama3.1-nemotron-70b-instruct",
         "lfm-40b",
-        "llama3.3-70b-instruct-fp8"
+        "llama3.3-70b-instruct-fp8",
+        "qwen25-coder-32b-instruct"
     ]
     
     def __init__(

webscout/Provider/Netwrck.py

@@ -25,8 +25,9 @@ class Netwrck(Provider):
         "gryphe/mythomax-l2-13b",
         "google/gemini-pro-1.5",
         "nvidia/llama-3.1-nemotron-70b-instruct",
-        "deepseek-r1",
-        "deepseek",
+        "deepseek/deepseek-r1",
+        "deepseek/deepseek-chat"
+
     ]
 
     def __init__(

webscout/Provider/OpenGPT.py

@@ -0,0 +1,199 @@
+import requests
+import json
+from typing import Dict, Generator, Union
+
+from webscout.AIutel import Optimizers
+from webscout.AIutel import Conversation
+from webscout.AIutel import AwesomePrompts, sanitize_stream
+from webscout.AIbase import Provider
+from webscout import exceptions
+from webscout.litagent import LitAgent
+
+class OpenGPT(Provider):
+    """
+    A class to interact with the Open-GPT API.
+    """
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        app_id: str = "clf3yg8730000ih08ndbdi2v4",
+    ):
+        """Initializes the OpenGPT API client.
+        
+        Args:
+            is_conversation (bool, optional): Whether to maintain conversation history. Defaults to True.
+            max_tokens (int, optional): Maximum number of tokens to generate. Defaults to 600.
+            timeout (int, optional): Http request timeout. Defaults to 30.
+            intro (str, optional): Conversation introductory prompt. Defaults to None.
+            filepath (str, optional): Path to file containing conversation history. Defaults to None.
+            update_file (bool, optional): Add new prompts and responses to the file. Defaults to True.
+            proxies (dict, optional): Http request proxies. Defaults to {}.
+            history_offset (int, optional): Limit conversation history to this number of last texts. Defaults to 10250.
+            act (str, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
+            app_id (str, optional): The OpenGPT application ID. Defaults to "clf3yg8730000ih08ndbdi2v4".
+        """
+        self.session = requests.Session()
+        self.agent = LitAgent()
+        
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.timeout = timeout
+        self.last_response = {}
+        self.app_id = app_id
+        
+        # Set up headers with dynamic user agent
+        self.headers = {
+            "Content-Type": "application/json",
+            "User-Agent": self.agent.random(),
+            "Referer": f"https://open-gpt.app/id/app/{app_id}"
+        }
+        
+        self.session.headers.update(self.headers)
+        self.session.proxies.update(proxies)
+        
+        # Initialize optimizers
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        
+        # Setup conversation
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            ) if act else intro or Conversation.intro
+        )
+        
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Union[Dict, Generator]:
+        """
+        Send a prompt to the OpenGPT API and get a response.
+        
+        Args:
+            prompt: The user input/prompt for the API.
+            stream: Whether to stream the response.
+            raw: Whether to return the raw API response.
+            optimizer: Optimizer to use on the prompt.
+            conversationally: Whether to apply the optimizer on the full conversation prompt.
+            
+        Returns:
+            A dictionary or generator with the response.
+        """
+        conversation_prompt = self.conversation.gen_complete_prompt(prompt)
+        
+        if optimizer:
+            if optimizer in self.__available_optimizers:
+                conversation_prompt = getattr(Optimizers, optimizer)(
+                    conversation_prompt if conversationally else prompt
+                )
+            else:
+                raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
+                
+        # Prepare the request body payload
+        payload = {
+            "userInput": conversation_prompt,
+            "id": self.app_id,
+            "userKey": ""  # Assuming userKey is meant to be empty as in the original code
+        }
+        
+        def for_non_stream():
+            try:
+                response = self.session.post(
+                    "https://open-gpt.app/api/generate",
+                    data=json.dumps(payload),
+                    timeout=self.timeout
+                )
+                
+                # Raise an exception for bad status codes
+                response.raise_for_status()
+                
+                response_text = response.text
+                self.last_response = {"text": response_text}
+                self.conversation.update_chat_history(prompt, response_text)
+                
+                return {"text": response_text} if not raw else {"raw": response_text}
+                
+            except requests.exceptions.RequestException as e:
+                # Handle potential errors during the request
+                error_msg = f"Error fetching data: {e}"
+                raise exceptions.FailedToGenerateResponseError(error_msg)
+            except Exception as e:
+                # Catch any other unexpected errors
+                error_msg = f"An unexpected error occurred: {e}"
+                raise exceptions.FailedToGenerateResponseError(error_msg)
+        
+        # This provider doesn't support streaming, so just return non-stream
+        return for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Union[str, Generator[str, None, None]]:
+        """
+        Send a prompt to the OpenGPT API and get a text response.
+        
+        Args:
+            prompt: The user input/prompt for the API.
+            stream: Whether to stream the response (not supported).
+            optimizer: Optimizer to use on the prompt.
+            conversationally: Whether to apply the optimizer on the full conversation prompt.
+            
+        Returns:
+            A string with the response text.
+        """
+        response = self.ask(
+            prompt, False, optimizer=optimizer, conversationally=conversationally
+        )
+        return self.get_message(response)
+
+    def get_message(self, response: dict) -> str:
+        """
+        Extract the message from the response dictionary.
+        
+        Args:
+            response: Response dictionary from the ask method.
+            
+        Returns:
+            The text response as a string.
+        """
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response["text"]
+
+
+if __name__ == "__main__":
+    # Test the provider
+    print("-" * 80)
+    print("Testing OpenGPT provider")
+    print("-" * 80)
+    
+    try:
+        test_ai = OpenGPT()
+        response = test_ai.chat("Explain quantum physics simply.")
+        print(response)
+    except Exception as e:
+        print(f"Error: {e}")
+