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

webscout/Provider/llmchat.py

@@ -1,3 +1,4 @@
+
 import requests
 import json
 from typing import Any, Dict, Optional, Generator, List
@@ -7,10 +8,12 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
 from webscout import LitAgent as Lit
+
 class LLMChat(Provider):
     """
-    A class to interact with the LLMChat API.
+    A class to interact with the LLMChat API with comprehensive logging.
     """
 
     AVAILABLE_MODELS = [
@@ -33,13 +36,25 @@ class LLMChat(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "@cf/meta/llama-3.1-70b-instruct",  # Default model
+        model: str = "@cf/meta/llama-3.1-70b-instruct",
         system_prompt: str = "You are a helpful assistant.",
+        logging: bool = False
     ):
         """
-        Initializes the LLMChat API with given parameters.
+        Initializes the LLMChat API with given parameters and logging capabilities.
         """
+        self.logger = LitLogger(
+            name="LLMChat",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info(f"Initializing LLMChat with model: {model}")
+
         if model not in self.AVAILABLE_MODELS:
+            if self.logger:
+                self.logger.error(f"Invalid model selected: {model}")
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
         self.session = requests.Session()
@@ -50,6 +65,7 @@ class LLMChat(Provider):
         self.last_response = {}
         self.model = model
         self.system_prompt = system_prompt
+        
         self.headers = {
             "Content-Type": "application/json",
             "Accept": "*/*",
@@ -57,11 +73,13 @@ class LLMChat(Provider):
             "Origin": "https://llmchat.in",
             "Referer": "https://llmchat.in/"
         }
+
         self.__available_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
@@ -69,12 +87,16 @@ class LLMChat(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("LLMChat initialized successfully")
+
     def ask(
         self,
         prompt: str,
@@ -83,24 +105,22 @@ class LLMChat(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Dict[str, Any]:
-        """Chat with LLMChat
-
-        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 - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-        Returns:
-            dict: Response dictionary.
-        """
+        """Chat with LLMChat 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:
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
                 raise exceptions.FailedToGenerateResponseError(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
@@ -117,8 +137,15 @@ class LLMChat(Provider):
 
         def for_stream():
             try:
+                if self.logger:
+                    self.logger.debug("Initiating streaming request to API")
+
                 with requests.post(url, json=payload, headers=self.headers, stream=True, timeout=self.timeout) as response:
                     response.raise_for_status()
+                    
+                    if self.logger:
+                        self.logger.info(f"API connection established successfully. Status: {response.status_code}")
+
                     full_response = ""
                     for line in response.iter_lines():
                         if line:
@@ -132,19 +159,31 @@ class LLMChat(Provider):
                                         yield response_text if raw else dict(text=response_text)
                                 except json.JSONDecodeError:
                                     if line.strip() != 'data: [DONE]':
-                                        print(f"Failed to parse line: {line}")
+                                        if self.logger:
+                                            self.logger.warning(f"Failed to parse line: {line}")
                                     continue
+
                     self.last_response.update(dict(text=full_response))
                     self.conversation.update_chat_history(
                         prompt, self.get_message(self.last_response)
                     )
+
             except requests.exceptions.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"API 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")
+            
             full_response = ""
             for line in for_stream():
                 full_response += line['text'] if not raw else line
+            
+            if self.logger:
+                self.logger.debug("Response processing completed")
+            
             return dict(text=full_response)
 
         return for_stream() if stream else for_non_stream()
@@ -156,15 +195,9 @@ class LLMChat(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
-        """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(
@@ -185,21 +218,14 @@ class LLMChat(Provider):
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: Dict[str, Any]) -> 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 = LLMChat(model='@cf/meta/llama-3.1-70b-instruct')
+    # Enable logging for testing
+    ai = LLMChat(model='@cf/meta/llama-3.1-70b-instruct', logging=True)
     response = ai.chat("What's the meaning of life?", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

webscout/Provider/meta.py

@@ -146,7 +146,7 @@ def get_fb_session(email, password, proxies=None):
         "sec-fetch-site": "same-origin",
         "sec-fetch-user": "?1",
         "upgrade-insecure-requests": "1",
-        "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        "user-agent": Lit().random(),
         "viewport-width": "1728",
     }
 
@@ -191,7 +191,8 @@ def get_fb_session(email, password, proxies=None):
         "referer": "https://www.meta.ai/",
         "sec-fetch-mode": "cors",
         "sec-fetch-site": "same-origin",
-        "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        "user-agent": Lit().random(),
+        "viewport-width": "1728",
     }
 
     response = requests.request("POST", url, headers=headers, data=payload, proxies=proxies)
@@ -211,7 +212,7 @@ def get_fb_session(email, password, proxies=None):
         "sec-fetch-site": "cross-site",
         "sec-fetch-user": "?1",
         "upgrade-insecure-requests": "1",
-        "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        "user-agent": Lit().random(),
     }
     session = requests.session()
     session.proxies = proxies
@@ -223,7 +224,7 @@ def get_fb_session(email, password, proxies=None):
 
     payload = {}
     headers = {
-        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:125.0) Gecko/20100101 Firefox/125.0",
+        "User-Agent": Lit().random(),
         "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
         "Accept-Language": "en-US,en;q=0.5",
         "Accept-Encoding": "gzip, deflate, br",
@@ -330,8 +331,7 @@ class Meta(Provider):
         self.session = requests.Session()
         self.session.headers.update(
             {
-                "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 "
-                "(KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+                "user-agent": Lit().random(),
             }
         )
         self.access_token = None