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

webscout/Provider/chatglm.py

@@ -1,205 +1,205 @@
-import requests
-import json
-from typing import Any, Dict, Optional, Generator, List, Union
-import uuid
-
-from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
-from webscout.AIbase import Provider
-from webscout import exceptions
-
-
-class ChatGLM(Provider):
-    """
-    A class to interact with the ChatGLM API.
-    """
-
-    def __init__(
-        self,
-        is_conversation: bool = True,
-        max_tokens: int = 600,
-        timeout: int = 30,
-        intro: str = None,
-        filepath: str = None,
-        update_file: bool = True,
-        proxies: dict = {},
-        history_offset: int = 10250,
-        act: str = None,
-        model: str = "all-tools-230b",
-    ):
-        """Initializes the ChatGLM API client."""
-        self.session = requests.Session()
-        self.is_conversation = is_conversation
-        self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://chatglm.cn/chatglm/mainchat-api/guest/stream"
-        self.stream_chunk_size = 64
-        self.timeout = timeout
-        self.last_response = {}
-        self.model = model
-        self.headers = {
-            'Accept-Language': 'en-US,en;q=0.9',
-            'App-Name': 'chatglm',
-            'Authorization': 'undefined',
-            'Content-Type': 'application/json',
-            'Origin': 'https://chatglm.cn',
-            'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
-            'X-App-Platform': 'pc',
-            'X-App-Version': '0.0.1',
-            'X-Device-Id': '', #Will be generated each time
-            'Accept': 'text/event-stream',
-        }
-        self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
-            if callable(getattr(Optimizers, method)) and not method.startswith("__")
-        )
-        self.session.headers.update(self.headers)
-        Conversation.intro = (
-            AwesomePrompts().get_act(
-                act, raise_not_found=True, default=None, case_insensitive=True
-            )
-            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
-
-    def ask(
-        self,
-        prompt: str,
-        stream: bool = False,
-        raw: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
-        """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 - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-        Returns:
-            Union[Dict, Generator[Dict, None, None]]: Response generated
-        """
-        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 exceptions.FailedToGenerateResponseError(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
-        device_id = str(uuid.uuid4()).replace('-', '')
-        self.session.headers.update({'X-Device-Id': device_id})
-        payload = {
-            "assistant_id": "65940acff94777010aa6b796",
-            "conversation_id": "",
-            "meta_data": {
-                "if_plus_model": False,
-                "is_test": False,
-                "input_question_type": "xxxx",
-                "channel": "",
-                "draft_id": "",
-                "quote_log_id": "",
-                "platform": "pc",
-            },
-            "messages": [
-                {
-                    "role": "user",
-                    "content": [{"type": "text", "text": conversation_prompt}],
-                }
-            ],
-        }
-
-        def for_stream():
-            try:
-                with self.session.post(
-                    self.api_endpoint, json=payload, stream=True, timeout=self.timeout
-                ) as response:
-                    response.raise_for_status()
-                    
-                    streaming_text = ""
-                    last_processed_content = "" # Track the last processed content
-                    for chunk in response.iter_lines():
-                        if chunk:
-                            decoded_chunk = chunk.decode('utf-8')
-                            if decoded_chunk.startswith('data: '):
-                                try:
-                                    json_data = json.loads(decoded_chunk[6:])
-                                    parts = json_data.get('parts', [])
-                                    if parts:
-                                        content = parts[0].get('content', [])
-                                        if content:
-                                            text = content[0].get('text', '')
-                                            new_text = text[len(last_processed_content):]
-                                            if new_text:  # Check for new content
-                                                streaming_text += new_text
-                                                last_processed_content = text
-                                                yield new_text if raw else dict(text=new_text)
-                                except json.JSONDecodeError:
-                                    continue
-
-                    self.last_response.update(dict(text=streaming_text))
-                    self.conversation.update_chat_history(
-                        prompt, self.get_message(self.last_response)
-                    )
-
-            except requests.exceptions.RequestException as e:
-                raise exceptions.ProviderConnectionError(f"Request failed: {e}")
-            except json.JSONDecodeError as e:
-                raise exceptions.InvalidResponseError(f"Failed to decode JSON: {e}")
-            except Exception as e:
-                raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred: {e}")
-
-        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 | Generator[str, None, None]:
-        """Generate response `str`"""
-
-        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 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 = ChatGLM()
-    response = ai.chat(input(">>> "), stream=True)
-    for chunk in response:
+import requests
+import json
+from typing import Any, Dict, Optional, Generator, List, Union
+import uuid
+
+from webscout.AIutel import Optimizers
+from webscout.AIutel import Conversation
+from webscout.AIutel import AwesomePrompts
+from webscout.AIbase import Provider
+from webscout import exceptions
+
+
+class ChatGLM(Provider):
+    """
+    A class to interact with the ChatGLM API.
+    """
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        model: str = "all-tools-230b",
+    ):
+        """Initializes the ChatGLM API client."""
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://chatglm.cn/chatglm/mainchat-api/guest/stream"
+        self.stream_chunk_size = 64
+        self.timeout = timeout
+        self.last_response = {}
+        self.model = model
+        self.headers = {
+            'Accept-Language': 'en-US,en;q=0.9',
+            'App-Name': 'chatglm',
+            'Authorization': 'undefined',
+            'Content-Type': 'application/json',
+            'Origin': 'https://chatglm.cn',
+            'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
+            'X-App-Platform': 'pc',
+            'X-App-Version': '0.0.1',
+            'X-Device-Id': '', #Will be generated each time
+            'Accept': 'text/event-stream',
+        }
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        self.session.headers.update(self.headers)
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            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
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
+        """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 - `[code, shell_command]`. Defaults to None.
+            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+        Returns:
+            Union[Dict, Generator[Dict, None, None]]: Response generated
+        """
+        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 exceptions.FailedToGenerateResponseError(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+        device_id = str(uuid.uuid4()).replace('-', '')
+        self.session.headers.update({'X-Device-Id': device_id})
+        payload = {
+            "assistant_id": "65940acff94777010aa6b796",
+            "conversation_id": "",
+            "meta_data": {
+                "if_plus_model": False,
+                "is_test": False,
+                "input_question_type": "xxxx",
+                "channel": "",
+                "draft_id": "",
+                "quote_log_id": "",
+                "platform": "pc",
+            },
+            "messages": [
+                {
+                    "role": "user",
+                    "content": [{"type": "text", "text": conversation_prompt}],
+                }
+            ],
+        }
+
+        def for_stream():
+            try:
+                with self.session.post(
+                    self.api_endpoint, json=payload, stream=True, timeout=self.timeout
+                ) as response:
+                    response.raise_for_status()
+                    
+                    streaming_text = ""
+                    last_processed_content = "" # Track the last processed content
+                    for chunk in response.iter_lines():
+                        if chunk:
+                            decoded_chunk = chunk.decode('utf-8')
+                            if decoded_chunk.startswith('data: '):
+                                try:
+                                    json_data = json.loads(decoded_chunk[6:])
+                                    parts = json_data.get('parts', [])
+                                    if parts:
+                                        content = parts[0].get('content', [])
+                                        if content:
+                                            text = content[0].get('text', '')
+                                            new_text = text[len(last_processed_content):]
+                                            if new_text:  # Check for new content
+                                                streaming_text += new_text
+                                                last_processed_content = text
+                                                yield new_text if raw else dict(text=new_text)
+                                except json.JSONDecodeError:
+                                    continue
+
+                    self.last_response.update(dict(text=streaming_text))
+                    self.conversation.update_chat_history(
+                        prompt, self.get_message(self.last_response)
+                    )
+
+            except requests.exceptions.RequestException as e:
+                raise exceptions.ProviderConnectionError(f"Request failed: {e}")
+            except json.JSONDecodeError as e:
+                raise exceptions.InvalidResponseError(f"Failed to decode JSON: {e}")
+            except Exception as e:
+                raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred: {e}")
+
+        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 | Generator[str, None, None]:
+        """Generate response `str`"""
+
+        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 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 = ChatGLM()
+    response = ai.chat(input(">>> "), stream=True)
+    for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/dgaf.py

@@ -8,10 +8,12 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout import LitAgent
+from webscout.Litlogger import Logger, LogFormat
 
 class DGAFAI(Provider):
     """
-    A class to interact with the DGAF.ai API.
+    A class to interact with the DGAF.ai API with logging capabilities.
     """
 
     def __init__(
@@ -25,10 +27,10 @@ class DGAFAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        system_prompt: str = "You are a helpful AI assistant.", 
-
+        system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
     ):
-        """Initializes the DGAFAI API client."""
+        """Initializes the DGAFAI API client with logging support."""
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -37,6 +39,7 @@ class DGAFAI(Provider):
         self.timeout = timeout
         self.last_response = {}
         self.system_prompt = system_prompt
+
         self.headers = {
             "accept": "*/*",
             "accept-encoding": "gzip, deflate, br, zstd",
@@ -52,17 +55,13 @@ class DGAFAI(Provider):
             "sec-fetch-dest": "empty",
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-origin",
-            "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"
-            ),
+            "user-agent": LitAgent().random(),
         }
         self.session.headers.update(self.headers)
         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 = (
@@ -77,6 +76,15 @@ class DGAFAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
+        # Initialize logger if enabled
+        self.logger = Logger(
+            name="DGAFAI",
+            format=LogFormat.MODERN_EMOJI,
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("DGAFAI initialized successfully")
+
     def ask(
         self,
         prompt: str,
@@ -85,39 +93,49 @@ class DGAFAI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Dict[str, Any] | Generator[str, None, None]:
-        """Chat with AI
+        """Chat with AI.
+        
         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.
+            raw (bool, optional): Return raw streaming response as received. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
             conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
         Returns:
-            Union[Dict, Generator[Dict, None, None]]: Response generated
+            Union[Dict, Generator[Dict, None, None]]: Generated response.
         """
+        if self.logger:
+            self.logger.debug(f"Processing ask call with prompt: {prompt[:50]}...")
         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}"
+                    f"Optimizer is not one of {list(self.__available_optimizers)}"
                 )
 
         payload = {
             "messages": [
-                 {"role": "system", "content": self.system_prompt},
+                {"role": "system", "content": self.system_prompt},
                 {"role": "user", "content": conversation_prompt}
             ]
         }
 
         def for_stream():
+            if self.logger:
+                self.logger.debug("Sending streaming request to DGAF.ai API...")
             try:
                 with self.session.post(self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout) as response:
-                    response.raise_for_status() # Check for HTTP errors
-
+                    response.raise_for_status()  # Check for HTTP errors
+                    if self.logger:
+                        self.logger.debug(response.text)
                     streaming_text = ""
                     for line in response.iter_lines(decode_unicode=True):
                         if line:
@@ -126,14 +144,18 @@ class DGAFAI(Provider):
                                 content = match.group(1)
                                 if content:
                                     streaming_text += content
+                                    # if self.logger:
+                                    #     self.logger.debug(f"Received content: {content[:30]}...")
                                     yield content if raw else dict(text=content)
-
                     self.last_response.update(dict(text=streaming_text))
                     self.conversation.update_chat_history(
                         prompt, self.get_message(self.last_response)
                     )
-
+                    if self.logger:
+                        self.logger.info("Streaming response completed successfully")
             except requests.exceptions.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"Request error: {e}")
                 raise exceptions.ProviderConnectionError(f"Request failed: {e}")
 
         def for_non_stream():
@@ -151,36 +173,42 @@ class DGAFAI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
-        """Generate response `str`"""
+        """Generate chat response as a string.
+        
+        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): Use conversational mode when using optimizer. Defaults to False.
+        Returns:
+            str or Generator[str, None, None]: Generated response.
+        """
+        if self.logger:
+            self.logger.debug(f"Chat method invoked with prompt: {prompt[:50]}...")
         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:
-        """Retrieves message only from response"""
+        """Retrieves message only from response.
+        
+        Args:
+            response (dict): Response from the ask method.
+        Returns:
+            str: Extracted message.
+        """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"].replace('\\n', '\n').replace('\\n\\n', '\n\n')
 
-    # @staticmethod
-    # def clean_content(text: str) -> str:
-    #     cleaned_text = re.sub(r'\[REF\]\(https?://[^\s]*\)', '', text)
-    #     return cleaned_text
 
 if __name__ == "__main__":
     from rich import print
-    ai = DGAFAI()
+    ai = DGAFAI(logging=False)
     response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)