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

webscout/Provider/gaurish.py

@@ -1,7 +1,6 @@
 import requests
 import json
-import os
-from typing import Any, Dict, Optional, Generator, List, Union
+from typing import Any, Dict, Generator, Union
 import uuid
 
 from webscout.AIutel import Optimizers
@@ -9,11 +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 GaurishCerebras(Provider):
     """
-    A class to interact with the Gaurish Cerebras API.
+    A class to interact with the Gaurish Cerebras API with comprehensive logging.
     """
 
     def __init__(
@@ -27,52 +27,40 @@ class GaurishCerebras(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        system_prompt: str = "You are a helpful assistant.", 
+        system_prompt: str = "You are a helpful assistant.",
+        logging: bool = False
     ):
-        """Initializes the Gaurish Cerebras API client."""
-        self.url = "https://proxy.gaurish.xyz/api/cerebras/v1/chat/completions"
+        """Initializes the Gaurish Cerebras API client with logging capabilities."""
+        self.logger = LitLogger(
+            name="GaurishCerebras",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("Initializing GaurishCerebras client")
+
+        self.chat_endpoint = "https://proxy.gaurish.xyz/api/cerebras/v1/chat/completions"
+
         self.headers = {
             "Content-Type": "application/json",
-            "Accept": "text/event-stream",
-            "access-control-allow-credentials": "true",
-            "access-control-allow-headers": "*",
-            "access-control-allow-methods": "*",
-            "access-control-allow-origin": "*",
-            "cache-control": "public, max-age=0, must-revalidate",
-            "referrer-policy": "strict-origin-when-cross-origin",
-            "content-type": "text/event-stream; charset=utf-8",
-            "strict-transport-security": "max-age=3600; includeSubDomains",
-            "x-content-type-options": "nosniff",
-            "x-matched-path": "/api/cerebras/[...path]",
-            "x-ratelimit-limit-requests-day": "30000",
-            "x-ratelimit-limit-tokens-minute": "60000",
-            "x-ratelimit-remaining-requests-day": "29984",
-            "x-ratelimit-remaining-tokens-minute": "60000",
-            "x-ratelimit-reset-requests-day": "24092.23299384117",
-            "x-ratelimit-reset-tokens-minute": "32.232993841171265",
-            "x-request-id": "0vWYzSEvd9Ytk5Zvl8NGRfT_Ekjm0ErInwwxlihBPyqUBAjJpyXwCg==",
-            "x-vercel-id": "bom1::nsbfd-1729703907288-16e74bb1db50",
-            "accept": "application/json",
+            "Accept": "application/json",
+            "authorization": "Bearer 123",
             "accept-encoding": "gzip, deflate, br, zstd",
             "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
             "dnt": "1",
             "origin": "https://chat.gaurish.xyz",
             "priority": "u=1, i",
             "referer": "https://chat.gaurish.xyz/",
-            "sec-ch-ua": "\"Chromium\";v=\"130\", \"Microsoft Edge\";v=\"130\", \"Not?A_Brand\";v=\"99\"",
+            "sec-ch-ua": '"Not A(Brand";v="8", "Chromium";v="132", "Microsoft Edge";v="132"',
             "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": "\"Windows\"",
+            "sec-ch-ua-platform": '"Windows"',
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-site",
-            "user-agent": LitAgent().random(),
-            "x-stainless-arch": "unknown",
-            "x-stainless-lang": "js",
-            "x-stainless-os": "Unknown",
-            "x-stainless-package-version": "4.67.3",
-            "x-stainless-retry-count": "0",
-            "x-stainless-runtime": "browser:chrome",
-            "x-stainless-runtime-version": "130.0.0",
+            "user-agent": ("Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
+                           "AppleWebKit/537.36 (KHTML, like Gecko) "
+                           "Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0"),
         }
         self.session = requests.Session()
         self.session.headers.update(self.headers)
@@ -82,6 +70,11 @@ class GaurishCerebras(Provider):
 
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
+
+        if self.logger:
+            self.logger.debug(f"Session configured with timeout: {timeout}")
+            self.logger.debug(f"Max tokens set to: {max_tokens}")
+
         self.__available_optimizers = (
             method
             for method in dir(Optimizers)
@@ -98,8 +91,10 @@ class GaurishCerebras(Provider):
             is_conversation, self.max_tokens_to_sample, filepath, update_file
         )
         self.conversation.history_offset = history_offset
-        self.system_prompt = system_prompt  # Store the system prompt
+        self.system_prompt = system_prompt
 
+        if self.logger:
+            self.logger.info("GaurishCerebras initialization completed successfully")
 
     def ask(
         self,
@@ -109,6 +104,13 @@ class GaurishCerebras(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Union[Dict, Generator]:
+        """
+        Sends a prompt to the API and returns the response with logging.
+        If stream is True, returns a generator for streamed responses.
+        """
+        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:
@@ -116,57 +118,81 @@ class GaurishCerebras(Provider):
                 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": [
                 {"role": "system", "content": self.system_prompt},
                 {"role": "user", "content": conversation_prompt},
             ],
-            "model": "llama3.1-70b",
+            "model": "llama3.3-70b",
+            "max_tokens": self.max_tokens_to_sample,
             "temperature": 0.75,
             "stream": stream,
         }
 
         def for_stream():
             try:
-                with self.session.post(self.url, headers=self.headers, data=json.dumps(payload), stream=True, timeout=self.timeout) as response:
-                    response.raise_for_status()
+                if self.logger:
+                    self.logger.debug("Initiating streaming request to API")
+
+                with self.session.post(self.chat_endpoint, json=payload, stream=True, timeout=self.timeout) as response:
+                    if response.status_code != 200:
+                        if self.logger:
+                            self.logger.error(f"API request failed. Status: {response.status_code}")
+                        raise exceptions.FailedToGenerateResponseError(
+                            f"Request failed with status code {response.status_code}"
+                        )
+
+                    if self.logger:
+                        self.logger.info(f"API connection established successfully. Status: {response.status_code}")
+
                     streaming_text = ""
                     for line in response.iter_lines(decode_unicode=True):
                         if line:
                             line = line.strip()
                             if line.startswith("data: "):
-                                line = line[6:]
-                                if line == "[DONE]":
+                                json_str = line[6:]
+                                if json_str == "[DONE]":
+                                    if self.logger:
+                                        self.logger.debug("Stream completed")
                                     break
                                 try:
-                                    data = json.loads(line)
-                                    if "choices" in data and data["choices"][0]["delta"].get("content"):
-                                        content = data["choices"][0]["delta"]["content"]
-                                        streaming_text += content
-                                        resp = dict(text=content)  # Yield only the new content
-                                        yield resp if raw else resp
-                                except json.JSONDecodeError:
-                                    # print(f"[Warning] Invalid JSON chunk received: {line}")
+                                    json_data = json.loads(json_str)
+                                    if 'choices' in json_data:
+                                        choice = json_data['choices'][0]
+                                        if 'delta' in choice and 'content' in choice['delta']:
+                                            content = choice['delta']['content']
+                                            streaming_text += content
+                                            yield dict(text=content) if raw else dict(text=content)
+                                except json.JSONDecodeError as e:
+                                    if self.logger:
+                                        self.logger.error(f"JSON parsing error: {str(e)}")
                                     pass
+
                     self.conversation.update_chat_history(prompt, streaming_text)
-                    self.last_response.update({"text": streaming_text})
+                    if self.logger:
+                        self.logger.debug("Response processing completed")
 
-            except requests.exceptions.RequestException as e:
+            except requests.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"Request failed: {str(e)}")
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
-
         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,
@@ -174,33 +200,47 @@ class GaurishCerebras(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Union[str, Generator]:
+        """
+        A convenience method to return just the text message from the response with logging.
+        """
+        if self.logger:
+            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
 
         def for_stream():
             for response in self.ask(
                 prompt, stream=True, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response)
+                yield response if isinstance(response, str) else self.get_message(response)
 
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt, stream=False, optimizer=optimizer, conversationally=conversationally
-                )
+            resp = self.ask(
+                prompt, stream=False, optimizer=optimizer, conversationally=conversationally
             )
+            return resp if isinstance(resp, str) else self.get_message(resp)
 
         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"]
+        """
+        Retrieve the message text from the API response with logging.
+        """
+        if not isinstance(response, dict):
+            if self.logger:
+                self.logger.warning("Invalid response format received")
+            return ""
 
+        if "text" in response and response["text"]:
+            return response["text"]
 
+        if self.logger:
+            self.logger.warning("No valid message content found in response")
+        return ""
 
 if __name__ == "__main__":
     from rich import print
-    bot = GaurishCerebras()
+    bot = GaurishCerebras(logging=True)
     try:
-        response = bot.chat("What is the capital of France?", stream=True)
+        response = bot.chat("what is meaning of life", stream=True)
         for chunk in response:
             print(chunk, end="", flush=True)
     except Exception as e:

webscout/Provider/llamatutor.py

@@ -1,3 +1,4 @@
+
 import requests
 import json
 
@@ -7,9 +8,11 @@ from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout import LitAgent as Lit
+from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+
 class LlamaTutor(Provider):
     """
-    A class to interact with the LlamaTutor API (Together.ai).
+    A class to interact with the LlamaTutor API (Together.ai) with comprehensive logging.
     """
 
     def __init__(
@@ -24,23 +27,20 @@ class LlamaTutor(Provider):
         history_offset: int = 10250,
         act: str = None,
         system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
     ):
         """
-        Initializes the LlamaTutor API with given parameters.
-
-        Args:
-            is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
-            max_tokens (int, optional): Maximum number of tokens to be generated upon completion. 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|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
-            system_prompt (str, optional): System prompt for LlamaTutor. 
-                                   Defaults to "You are a helpful AI assistant.".
+        Initializes the LlamaTutor API with given parameters and logging capabilities.
         """
+        self.logger = LitLogger(
+            name="LlamaTutor",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("Initializing LlamaTutor API")
+
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -49,6 +49,7 @@ class LlamaTutor(Provider):
         self.timeout = timeout
         self.last_response = {}
         self.system_prompt = system_prompt
+        
         self.headers = {
             "Content-Type": "application/json",
             "Accept": "*/*",
@@ -71,7 +72,12 @@ class LlamaTutor(Provider):
             for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
+        
         self.session.headers.update(self.headers)
+        
+        if self.logger:
+            self.logger.debug("Headers configured and session updated")
+
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -79,12 +85,16 @@ class LlamaTutor(Provider):
             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
         self.session.proxies = proxies
 
+        if self.logger:
+            self.logger.info("LlamaTutor initialized successfully")
+
     def ask(
         self,
         prompt: str,
@@ -93,32 +103,23 @@ class LlamaTutor(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> dict:
-        """Chat with LlamaTutor
-
-        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]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-        Returns:
-           dict : {}
-        ```json
-        {
-           "text" : "How may I assist you today?"
-        }
-        ```
-        """
+        """Chat with LlamaTutor with logging capabilities"""
+        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 {self.__available_optimizers}")
         
         payload = {
             "messages": [
@@ -135,19 +136,35 @@ class LlamaTutor(Provider):
 
         def for_stream():
             try:
-                response = requests.post(self.api_endpoint, headers=self.headers, data=json.dumps(payload), stream=True, timeout=self.timeout)
+                if self.logger:
+                    self.logger.debug("Initiating streaming request to API")
+
+                response = requests.post(
+                    self.api_endpoint,
+                    headers=self.headers,
+                    data=json.dumps(payload),
+                    stream=True,
+                    timeout=self.timeout
+                )
                 response.raise_for_status()
                 
-                # Stream and process the response line by line
+                if self.logger:
+                    self.logger.info(f"API connection established successfully. Status: {response.status_code}")
+                
                 full_response = ''
                 for line in response.iter_lines(decode_unicode=True):
                     if line:
-                        decoded_line = line.decode('utf-8')
-                        if decoded_line.startswith("data: "):
-                            json_data = json.loads(decoded_line[6:])
-                            if "text" in json_data:
-                                full_response += json_data["text"]
-                                yield json_data["text"] if raw else dict(text=json_data["text"])
+                        try:
+                            decoded_line = line.decode('utf-8')
+                            if decoded_line.startswith("data: "):
+                                json_data = json.loads(decoded_line[6:])
+                                if "text" in json_data:
+                                    full_response += json_data["text"]
+                                    yield json_data["text"] if raw else dict(text=json_data["text"])
+                        except json.JSONDecodeError as e:
+                            if self.logger:
+                                self.logger.warning(f"Failed to parse response line: {e}")
+                            continue
 
                 self.last_response.update(dict(text=full_response))
                 self.conversation.update_chat_history(
@@ -155,11 +172,17 @@ class LlamaTutor(Provider):
                 )
 
             except requests.exceptions.HTTPError as http_err:
+                if self.logger:
+                    self.logger.error(f"HTTP error occurred: {http_err}")
                 raise exceptions.FailedToGenerateResponseError(f"HTTP error occurred: {http_err}")
             except requests.exceptions.RequestException as err:
+                if self.logger:
+                    self.logger.error(f"Request error occurred: {err}")
                 raise exceptions.FailedToGenerateResponseError(f"An error occurred: {err}")
 
         def for_non_stream():
+            if self.logger:
+                self.logger.debug("Processing non-streaming request")
             for _ in for_stream():
                 pass
             return self.last_response
@@ -173,15 +196,9 @@ class LlamaTutor(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-        """Generate response `str`
-        Args:
-            prompt (str): Prompt to be send.
-            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.
-        Returns:
-            str: Response generated
-        """
+        """Generate response with logging capabilities"""
+        if self.logger:
+            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
 
         def for_stream():
             for response in self.ask(
@@ -202,21 +219,14 @@ class LlamaTutor(Provider):
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
-        """Retrieves message only from response
-
-        Args:
-            response (dict): Response generated by `self.ask`
-
-        Returns:
-            str: Message extracted
-        """
+        """Retrieves message from response with validation"""
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
 if __name__ == "__main__":
     from rich import print
-
-    ai = LlamaTutor()
-    response = ai.chat("write a poem about AI", stream=True)
+    # Enable logging for testing
+    ai = LlamaTutor(logging=True)
+    response = ai.chat("Write a poem about AI", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)