webscout 7.7__py3-none-any.whl → 7.9__py3-none-any.whl

webscout/Provider/Gemini.py

@@ -1,179 +1,167 @@
-
-from os import path
-from json import load, dumps
-import warnings
-from typing import 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
-
-# Import Logger and related classes (assumed similar to what is in yep.py)
-from webscout.Litlogger import Logger, LogFormat
-
-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,
-    "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,  # Accepts either a Model enum or a str alias.
-        proxy: dict = {},
-        timeout: int = 30,
-        logging: bool = False  # Flag to enable Logger debugging.
-    ):
-        """
-        Initializes GEMINI with model support and optional debugging.
-
-        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, 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.
-            logging (bool, optional): Flag to enable Logger debugging. Defaults to False.
-        """
-        self.conversation = Conversation(False)
-
-        # Initialize Logger only if logging is enabled; otherwise, set to None.
-        self.logger = Logger(name="GEMINI", format=LogFormat.MODERN_EMOJI) if logging else None
-
-        # 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("__")
-        )
-        if self.logger:
-            self.logger.debug("GEMINI initialized with model: {}".format(selected_model.model_name))
-        # 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
-
-        if self.logger:
-            self.logger.debug(f"Request sent: {prompt}")
-        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 = ""
-        if self.logger:
-            self.logger.debug("Conversation reset")
+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

@@ -8,7 +8,7 @@ from webscout.AIutel import Optimizers
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class GithubChat(Provider):
     """

webscout/Provider/Glider.py

@@ -1,11 +1,11 @@
 import requests
 import json
-from typing import Any, Dict, Generator, Optional
+from typing import Union, Any, Dict, Generator, Optional
 
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent as Lit
+from webscout.litagent import LitAgent as Lit
 
 class GliderAI(Provider):
     """
@@ -81,7 +81,7 @@ class GliderAI(Provider):
         raw: bool = False,
         optimizer: Optional[str] = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
+    ) -> Union[Dict[str, Any], Generator[Any, None, None]]:
         """Chat with AI.
 
         Args:
@@ -151,7 +151,7 @@ class GliderAI(Provider):
         stream: bool = False,
         optimizer: Optional[str] = None,
         conversationally: bool = False,
-    ) -> str | Generator[str, None, None]:
+    ) -> Union[str, Generator[str, None, None]]:
         """Generate response as a string.
 
         Args:

webscout/Provider/Groq.py

@@ -1,4 +1,4 @@
-from typing import Any, AsyncGenerator, Dict, Optional, Callable, List
+from typing import Any, AsyncGenerator, Dict, Optional, Callable, List, Union
 
 import httpx
 import requests
@@ -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__(
@@ -459,7 +473,7 @@ class AsyncGROQ(AsyncProvider):
         optimizer: str = None,
         conversationally: bool = False,
         tools: Optional[List[Dict[str, Any]]] = None,
-    ) -> dict | AsyncGenerator:
+    ) -> Union[dict, AsyncGenerator]:
         """Chat with AI asynchronously.
 
         Args:
@@ -606,7 +620,7 @@ class AsyncGROQ(AsyncProvider):
         optimizer: str = None,
         conversationally: bool = False,
         tools: Optional[List[Dict[str, Any]]] = None,
-    ) -> str | AsyncGenerator:
+    ) -> Union[str, AsyncGenerator]:
         """Generate response `str` asynchronously.
         Args:
             prompt (str): Prompt to be send.

webscout/Provider/HF_space/qwen_qwen2.py

@@ -4,7 +4,7 @@ import requests
 import json
 import re
 import uuid
-from typing import List, Dict, Generator, Optional, Any, TypedDict, Final
+from typing import Union, List, Dict, Generator, Optional, Any, TypedDict, Final
 
 # Type definitions
 class Role(Enum):

webscout/Provider/HeckAI.py

@@ -9,7 +9,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class HeckAI(Provider):
     """

webscout/Provider/HuggingFaceChat.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional, Union, Generator
 from webscout.AIutel import Conversation
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class HuggingFaceChat(Provider):
     """

webscout/Provider/Hunyuan.py

@@ -11,7 +11,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class Hunyuan(Provider):
     """

webscout/Provider/Jadve.py

@@ -1,7 +1,7 @@
 import requests
 import json
 import re
-from typing import Any, Dict, Optional, Generator
+from typing import Union, Any, Dict, Optional, Generator
 
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
@@ -105,7 +105,7 @@ class JadveOpenAI(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict | Generator[dict, None, None]:
+    ) -> Union[dict, Generator[dict, None, None]]:
         """
         Chat with AI.
 
@@ -206,7 +206,7 @@ class JadveOpenAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | Generator[str, None, None]:
+    ) -> Union[str, Generator[str, None, None]]:
         """
         Generate a chat response (string).
 

webscout/Provider/Koboldai.py

@@ -5,7 +5,7 @@ from ..AIutel import Conversation
 from ..AIutel import AwesomePrompts, sanitize_stream
 from ..AIbase import  Provider, AsyncProvider
 from webscout import exceptions
-from typing import Any, AsyncGenerator, Dict
+from typing import Union, Any, AsyncGenerator, Dict
 import httpx
 #------------------------------------------------------KOBOLDAI-----------------------------------------------------------
 class KOBOLDAI(Provider):
@@ -266,7 +266,7 @@ class AsyncKOBOLDAI(AsyncProvider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict | AsyncGenerator:
+    ) -> Union[dict, AsyncGenerator]:
         """Chat with AI asynchronously.
 
         Args:
@@ -338,7 +338,7 @@ class AsyncKOBOLDAI(AsyncProvider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | AsyncGenerator:
+    ) -> Union[str, AsyncGenerator]:
         """Generate response `str` asynchronously.
         Args:
             prompt (str): Prompt to be send.

webscout/Provider/LambdaChat.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional, Union, Generator
 from webscout.AIutel import Conversation
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class LambdaChat(Provider):
     """
@@ -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/Llama.py

@@ -1,6 +1,4 @@
-
 import requests
-
 import json
 
 from webscout.AIutel import Optimizers
@@ -8,7 +6,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
-from typing import Any, AsyncGenerator, Dict
+from typing import Any, AsyncGenerator, Dict, Union
 
 
 class LLAMA(Provider):
@@ -74,7 +72,7 @@ class LLAMA(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict | AsyncGenerator:
+    ) -> Union[dict, AsyncGenerator]:
         """Chat with AI
 
         Args:
@@ -152,7 +150,7 @@ class LLAMA(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | AsyncGenerator:
+    ) -> Union[str, AsyncGenerator]:
         """Generate response `str`
         Args:
             prompt (str): Prompt to be send.