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

webscout/Provider/Deepinfra.py

@@ -8,10 +8,12 @@ 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.Litlogger import LitLogger, LogFormat, ColorScheme
 
 class DeepInfra(Provider):
     """
-    A class to interact with the DeepInfra API.
+    A class to interact with the DeepInfra API with logging and LitAgent user-agent.
     """
 
     def __init__(
@@ -25,13 +27,29 @@ class DeepInfra(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "Qwen/Qwen2.5-72B-Instruct",  
+        model: str = "Qwen/Qwen2.5-72B-Instruct",
+        logging: bool = False
     ):
-        """Initializes the DeepInfra API client."""
+        """Initializes the DeepInfra API client with logging support."""
         self.url = "https://api.deepinfra.com/v1/openai/chat/completions"
+        # Use LitAgent for user-agent instead of hardcoded string.
         self.headers = {
-            "Accept": "text/event-stream, application/json",
-
+            'User-Agent': LitAgent().random(),
+            'Accept-Language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+            'Content-Type': 'application/json',
+            'Origin': 'https://deepinfra.com',
+            'Pragma': 'no-cache',
+            'Referer': 'https://deepinfra.com/',
+            'Sec-Fetch-Dest': 'empty',
+            'Sec-Fetch-Mode': 'cors',
+            'Sec-Fetch-Site': 'same-site',
+            'X-Deepinfra-Source': 'web-embed',
+            'accept': 'text/event-stream',
+            'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+            'sec-ch-ua-mobile': '?0',
+            'sec-ch-ua-platform': '"macOS"'
         }
         self.session = requests.Session()
         self.session.headers.update(self.headers)
@@ -61,6 +79,16 @@ class DeepInfra(Provider):
         )
         self.conversation.history_offset = history_offset
 
+        # Initialize logger if enabled
+        self.logger = LitLogger(
+            name="DeepInfra",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("DeepInfra initialized successfully")
+
     def ask(
         self,
         prompt: str,
@@ -69,14 +97,17 @@ class DeepInfra(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Union[Dict[str, Any], Generator]:
-
         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:
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
 
         # Payload construction
@@ -90,17 +121,23 @@ class DeepInfra(Provider):
         }
 
         def for_stream():
+            if self.logger:
+                self.logger.debug("Sending streaming request to DeepInfra API...")
             try:
                 with requests.post(self.url, headers=self.headers, data=json.dumps(payload), stream=True, timeout=self.timeout) as response:
                     if response.status_code != 200:
-                        raise exceptions.FailedToGenerateResponseError(f"Request failed with status code {response.status_code}")
+                        if self.logger:
+                            self.logger.error(f"Request failed with status code {response.status_code}")
 
+                        raise exceptions.FailedToGenerateResponseError(f"Request failed with status code {response.status_code}")
+                    if self.logger:
+                        self.logger.debug(response.text)
                     streaming_text = ""
-                    for line in response.iter_lines(decode_unicode=True):  # Decode lines
+                    for line in response.iter_lines(decode_unicode=True):
                         if line:
                             line = line.strip()
                             if line.startswith("data: "):
-                                json_str = line[6:] #Remove "data: " prefix
+                                json_str = line[6:]  # Remove "data: " prefix
                                 if json_str == "[DONE]":
                                     break
                                 try:
@@ -110,28 +147,27 @@ class DeepInfra(Provider):
                                         if 'delta' in choice and 'content' in choice['delta']:
                                             content = choice['delta']['content']
                                             streaming_text += content
-                                            
-                                            # Yield ONLY the new content:
-                                            resp = dict(text=content) 
+                                            resp = dict(text=content)
                                             yield resp if raw else resp
                                 except json.JSONDecodeError:
-                                    pass  # Or handle the error as needed
-                    self.conversation.update_chat_history(prompt, streaming_text)  # Update history *after* streaming
+                                    if self.logger:
+                                        self.logger.error("JSON decode error in streaming data")
+                                    pass
+                    self.conversation.update_chat_history(prompt, streaming_text)
+                    if self.logger:
+                        self.logger.info("Streaming response completed successfully")
             except requests.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"Request failed: {e}")
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
-
         def for_non_stream():
-            # let's make use of stream
             for _ in for_stream():
                 pass
             return self.last_response
 
-
         return for_stream() if stream else for_non_stream()
 
-
-
     def chat(
         self,
         prompt: str,
@@ -139,34 +175,22 @@ class DeepInfra(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-
         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,
-                )
+                self.ask(prompt, False, optimizer=optimizer, conversationally=conversationally)
             )
-
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
-
-
 if __name__ == "__main__":
     from rich import print
-    ai = DeepInfra(timeout=5000)
+    ai = DeepInfra(timeout=5000, logging=True)
     response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

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 LitLogger, LogFormat, ColorScheme
 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 = LitLogger(
+            name="GliderAI",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) 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,22 @@ 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",
+        "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__(
@@ -337,18 +341,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__(