webscout 7.0__py3-none-any.whl → 7.2__py3-none-any.whl

webscout/Provider/Gemini.py

@@ -1,61 +1,90 @@
-from ..AIutel import Optimizers
-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
-import logging 
-from ..Bard import Chatbot
-import logging
+
 from os import path
-from json import load
-from json import dumps
+from json import load, dumps
 import warnings
-logging.getLogger("httpx").setLevel(logging.ERROR)
+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 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
+        """
+        Initializes GEMINI with model support and optional debugging.
 
         Args:
-            cookie_file (str): Path to `bard.google.com.cookies.json` file
-            proxy (dict, optional): Http request proxy. Defaults to {}.
-            timeout (int, optional): Http request timeout. Defaults to 30.
+            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)
-        self.session_auth1 = None
-        self.session_auth2 = None
-        assert isinstance(
-            cookie_file, str
-        ), f"cookie_file should be of {str} only not '{type(cookie_file)}'"
-        if path.isfile(cookie_file):
-            # let's assume auth is a path to exported .json cookie-file
-            with open(cookie_file) as fh:
-                entries = load(fh)
-            for entry in entries:
-                if entry["name"] == "__Secure-1PSID":
-                    self.session_auth1 = entry["value"]
-                elif entry["name"] == "__Secure-1PSIDTS":
-                    self.session_auth2 = entry["value"]
-
-            assert all(
-                [self.session_auth1, self.session_auth2]
-            ), f"Failed to extract the required cookie value from file '{cookie_file}'"
-        else:
+
+        # 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")
 
-        self.session = Chatbot(self.session_auth1, self.session_auth2, proxy, timeout)
+        # 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("__")
+            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,
@@ -65,53 +94,17 @@ class GEMINI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> dict:
-        """Chat with AI
-
-            Args:
-                prompt (str): Prompt to be send.
-                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 - `[code, shell_command]`. Defeaults to None
-                conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-            Returns:
-               dict : {}
-            ```json
-            {
-                "content": "General Kenobi! \n\n(I couldn't help but respond with the iconic Star Wars greeting since you used it first. )\n\nIs there anything I can help you with today?\n[Image of Hello there General Kenobi]",
-                "conversation_id": "c_f13f6217f9a997aa",
-                "response_id": "r_d3665f95975c368f",
-                "factualityQueries": null,
-                "textQuery": [
-                    "hello there",
-                    1
-                    ],
-                "choices": [
-                    {
-                        "id": "rc_ea075c9671bfd8cb",
-                        "content": [
-                            "General Kenobi! \n\n(I couldn't help but respond with the iconic Star Wars greeting since you used it first. )\n\nIs there anything I can help you with today?\n[Image of Hello there General Kenobi]"
-                        ]
-                    },
-                    {
-                        "id": "rc_de6dd3fb793a5402",
-                        "content": [
-                            "General Kenobi! (or just a friendly hello, whichever you prefer!). \n\nI see you're a person of culture as well. *Star Wars* references are always appreciated.  \n\nHow can I help you today?\n"
-                            ]
-                    },
-                {
-                    "id": "rc_a672ac089caf32db",
-                    "content": [
-                        "General Kenobi! (or just a friendly hello if you're not a Star Wars fan!). \n\nHow can I help you today? Feel free to ask me anything, or tell me what you'd like to chat about. I'm here to assist in any way I can.\n[Image of Obi-Wan Kenobi saying hello there]"
-                    ]
-                }
-            ],
-
-            "images": [
-                "https://i.pinimg.com/originals/40/74/60/407460925c9e419d82b93313f0b42f71.jpg"
-            ]
-        }
-
-            ```
+        """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:
@@ -120,24 +113,21 @@ class GEMINI(Provider):
                     conversation_prompt if conversationally else prompt
                 )
             else:
-                raise Exception(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
+                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)
-            )
+            self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
             yield dumps(response) if raw else response
 
         def for_non_stream():
-            # let's make use of 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(
@@ -147,48 +137,43 @@ class GEMINI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-        """Generate response `str`
+        """Generate response text.
+
         Args:
-            prompt (str): Prompt to be send.
+            prompt (str): Prompt to be sent.
             stream (bool, optional): Flag for streaming response. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
             conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+
         Returns:
-            str: Response generated
+            str: Response generated.
         """
-
         def for_stream():
-            for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
-            ):
+            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 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 only from response
+        """Retrieves message content from the response.
 
         Args:
-            response (dict): Response generated by `self.ask`
+            response (dict): Response generated by `self.ask`.
 
         Returns:
-            str: Message extracted
+            str: Extracted message content.
         """
-        assert isinstance(response, dict), "Response should be of dict data-type only"
+        if not isinstance(response, dict):
+            raise TypeError("Response should be of type dict")
         return response["content"]
 
     def reset(self):
-        """Reset the current conversation"""
+        """Reset the current conversation."""
         self.session.async_chatbot.conversation_id = ""
         self.session.async_chatbot.response_id = ""
-        self.session.async_chatbot.choice_id = ""
+        self.session.async_chatbot.choice_id = ""
+        if self.logger:
+            self.logger.debug("Conversation reset")

webscout/Provider/Glider.py

@@ -2,49 +2,52 @@ import requests
 import json
 from typing import Any, Dict, Generator, Optional
 
-from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout.Litlogger import Logger, LogFormat
 from webscout import LitAgent as Lit
+
 class GliderAI(Provider):
     """
-    A class to interact with the Glider.so API.
+    A class to interact with the Glider.so API with comprehensive logging.
     """
 
-    AVAILABLE_MODELS = [
+    AVAILABLE_MODELS = {
         "chat-llama-3-1-70b",
         "chat-llama-3-1-8b",
         "chat-llama-3-2-3b",
         "deepseek-ai/DeepSeek-R1",
-    ]
-
-    model_aliases = {
-        "llama-3.1-70b": "chat-llama-3-1-70b",
-        "llama-3.1-8b": "chat-llama-3-1-8b",
-        "llama-3.2-3b": "chat-llama-3-2-3b",
-        "deepseek-r1": "deepseek-ai/DeepSeek-R1",
     }
 
-
     def __init__(
         self,
         is_conversation: bool = True,
         max_tokens: int = 600,
         timeout: int = 30,
-        intro: str = None,
-        filepath: str = None,
+        intro: Optional[str] = None,
+        filepath: Optional[str] = None,
         update_file: bool = True,
         proxies: dict = {},
         history_offset: int = 10250,
-        act: str = None,
-        model: str = "llama-3.1-70b",
+        act: Optional[str] = None,
+        model: str = "chat-llama-3-1-70b",
         system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
     ):
-        """Initializes the GliderAI API client."""
-        if model not in self.AVAILABLE_MODELS and model not in self.model_aliases:
+        """Initializes the GliderAI API client with logging capabilities."""
+        if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {', '.join(self.AVAILABLE_MODELS)}")
+        
+        self.logger = Logger(
+            name="GliderAI",
+            format=LogFormat.MODERN_EMOJI,
+
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info(f"Initializing GliderAI with model: {model}")
+
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -52,7 +55,7 @@ class GliderAI(Provider):
         self.stream_chunk_size = 64
         self.timeout = timeout
         self.last_response = {}
-        self.model = self.model_aliases.get(model,model)
+        self.model = model
         self.system_prompt = system_prompt
         self.headers = {
             "accept": "*/*",
@@ -66,10 +69,10 @@ class GliderAI(Provider):
         self.session.proxies = proxies
 
         self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
+            method for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
+
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -82,40 +85,44 @@ class GliderAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
+        if self.logger:
+            self.logger.info("GliderAI initialized successfully")
+
     def ask(
         self,
         prompt: str,
         stream: bool = False,
         raw: bool = False,
-        optimizer: str = None,
+        optimizer: Optional[str] = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator:
-        """Chat with AI
+    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
+        """Chat with AI with logging capabilities.
 
         Args:
-            prompt (str): Prompt to be send.
+            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 - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+            raw (bool, optional): Return raw response chunks instead of dict. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Use conversationally modified prompt when optimizer specified. Defaults to False.
         Returns:
-           dict : {}
-        ```json
-        {
-            "text" : "How may I assist you today?"
-        }
-        ```
+            dict or Generator[dict, None, None]: The response from the API.
         """
+        if self.logger:
+            self.logger.debug(f"Processing request - Prompt: {prompt[:50]}...")
+            self.logger.debug(f"Stream: {stream}, Optimizer: {optimizer}")
+
         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
                 )
+                if self.logger:
+                    self.logger.debug(f"Applied optimizer: {optimizer}")
             else:
-                raise Exception(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
+                raise Exception(f"Optimizer is not one of {list(self.__available_optimizers)}")
 
         payload = {
             "messages": [
@@ -126,14 +133,19 @@ class GliderAI(Provider):
         }
 
         def for_stream():
+            if self.logger:
+                self.logger.debug("Initiating streaming request to API")
             response = self.session.post(
                 self.api_endpoint, json=payload, stream=True, timeout=self.timeout
             )
             if not response.ok:
+                if self.logger:
+                    self.logger.error(
+                        f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+                    )
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 )
-
             streaming_text = ""
             for value in response.iter_lines(decode_unicode=True):
                 if value:
@@ -143,46 +155,50 @@ class GliderAI(Provider):
                             content = data['choices'][0].get('delta', {}).get("content", "")
                             if content:
                                 streaming_text += content
-                                yield content if raw else dict(text=content)
+                                yield content if raw else {"text": content}
                         except json.JSONDecodeError:
-                             if "stop" in value :
-                                 break
-                            
+                            if "stop" in value:
+                                break
             self.last_response.update(dict(text=streaming_text))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
+            self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
+            if self.logger:
+                self.logger.debug("Response processing completed")
+
         def for_non_stream():
+            if self.logger:
+                self.logger.debug("Processing non-streaming request")
             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,
+        optimizer: Optional[str] = None,
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
-        """Generate response `str`
+        """Generate response as a string with logging.
+
         Args:
-            prompt (str): Prompt to be send.
+            prompt (str): Prompt to be sent.
             stream (bool, optional): Flag for streaming response. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Use conversationally modified prompt when optimizer specified. Defaults to False.
         Returns:
-            str: Response generated
+            str or Generator[str, None, None]: The response generated.
         """
+        if self.logger:
+            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
         def for_stream():
             for response in self.ask(
                 prompt, True, optimizer=optimizer, conversationally=conversationally
             ):
-                 yield self.get_message(response)
+                yield self.get_message(response)
         def for_non_stream():
-             return self.get_message(
+            return self.get_message(
                 self.ask(
                     prompt,
                     False,
@@ -192,16 +208,15 @@ class GliderAI(Provider):
             )
         return for_stream() if stream else for_non_stream()
 
-
     def get_message(self, response: dict) -> str:
-        """Retrieves message only from response"""
+        """Retrieves message only from response."""
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
-
 if __name__ == "__main__":
     from rich import print
-    ai = GliderAI(model="llama-3.1-70b")
+    # For testing with logging enabled
+    ai = GliderAI(model="chat-llama-3-1-70b", logging=True)
     response = ai.chat("Meaning of Life", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/Groq.py

@@ -16,18 +16,26 @@ class GROQ(Provider):
     """
 
     AVAILABLE_MODELS = [
-        "llama-3.1-405b-reasoning",
-        "llama-3.1-70b-versatile",
-        "llama-3.1-8b-instant",
-        "llama3-groq-70b-8192-tool-use-preview",
-        "llama3-groq-8b-8192-tool-use-preview",
-        "llama-guard-3-8b",
+        # "whisper-large-v3",
         "llama3-70b-8192",
+        "qwen-2.5-32b",
+        "qwen-2.5-coder-32b",
+        "deepseek-r1-distill-qwen-32b",
+        "deepseek-r1-distill-llama-70b",
+        "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",
-        "gemma-7b-it",
-        "gemma2-9b-it",
-        "whisper-large-v3"
+        "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"
     ]
 
     def __init__(
@@ -337,18 +345,22 @@ class AsyncGROQ(AsyncProvider):
     """
 
     AVAILABLE_MODELS = [
-        "llama-3.1-405b-reasoning",
-        "llama-3.1-70b-versatile",
-        "llama-3.1-8b-instant",
-        "llama3-groq-70b-8192-tool-use-preview",
-        "llama3-groq-8b-8192-tool-use-preview",
-        "llama-guard-3-8b",
+        # "whisper-large-v3",
         "llama3-70b-8192",
+        "llama-3.2-3b-preview",
+        "gemma2-9b-it",
+        "llama-3.2-11b-vision-preview",
         "llama3-8b-8192",
+        "llama-3.3-70b-versatile",
+        "deepseek-r1-distill-llama-70b",
+        # "distil-whisper-large-v3-en",
         "mixtral-8x7b-32768",
-        "gemma-7b-it",
-        "gemma2-9b-it",
-        "whisper-large-v3"
+        "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"
     ]
 
     def __init__(