webscout 6.5__py3-none-any.whl → 6.7__py3-none-any.whl

webscout/Provider/tutorai.py

@@ -1,113 +1,15 @@
 import requests
 import os
-import time
 from typing import List, Optional
 from string import punctuation
 from random import choice
-from requests.exceptions import RequestException
 import json
-from html.parser import HTMLParser
-import re
-import html.entities
-
 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 TerminalFormatter(HTMLParser):
-    """
-    A custom HTML parser that converts HTML content to terminal-friendly formatted text
-    using ANSI escape codes.
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.output = []
-        self.list_stack = []
-        self.ol_counters = []
-        self.bold = False
-        self.italic = False
-
-    def handle_starttag(self, tag, attrs):
-        if tag in ["strong", "b"]:
-            self.output.append("\033[1m")  # Bold
-            self.bold = True
-        elif tag in ["em", "i"]:
-            self.output.append("\033[3m")  # Italic
-            self.italic = True
-        elif tag == "br":
-            self.output.append("\n")
-        elif tag in ["p", "div", "h1", "h2", "h3", "h4", "h5", "h6"]:
-            self.output.append("\n")
-        elif tag == "ul":
-            self.list_stack.append("ul")
-            self.output.append("\n")
-        elif tag == "ol":
-            self.list_stack.append("ol")
-            self.ol_counters.append(1)
-            self.output.append("\n")
-        elif tag == "li":
-            if self.list_stack:
-                if self.list_stack[-1] == "ul":
-                    self.output.append("• ")  # Bullet point
-                elif self.list_stack[-1] == "ol":
-                    number = self.ol_counters[-1]
-                    self.output.append(f"{number}. ")
-                    self.ol_counters[-1] += 1
-
-    def handle_endtag(self, tag):
-        if tag in ["strong", "b"]:
-            self.output.append("\033[0m")  # Reset
-            self.bold = False
-        elif tag in ["em", "i"]:
-            self.output.append("\033[0m")  # Reset
-            self.italic = False
-        elif tag in ["p", "div", "h1", "h2", "h3", "h4", "h5", "h6"]:
-            self.output.append("\n")
-        elif tag == "ul":
-            if self.list_stack and self.list_stack[-1] == "ul":
-                self.list_stack.pop()
-                self.output.append("\n")
-        elif tag == "ol":
-            if self.list_stack and self.list_stack[-1] == "ol":
-                self.list_stack.pop()
-                self.ol_counters.pop()
-                self.output.append("\n")
-        elif tag == "li":
-            self.output.append("\n")
-
-    def handle_data(self, data):
-        # Remove ANSI escape codes from the data
-        data = re.sub(r'\033\[[0-9;]*m', '', data)  
-        data = re.sub(r"\s+", " ", data)
-        self.output.append(data)
-
-    def handle_entityref(self, name):
-        entity = f"&{name};"
-        char = html.entities.name2codepoint.get(name, entity)
-        self.output.append(chr(char))
-
-    def handle_charref(self, name):
-        try:
-            if name.startswith("x") or name.startswith("X"):
-                char = chr(int(name[1:], 16))
-            else:
-                char = chr(int(name))
-            self.output.append(char)
-        except ValueError:
-            self.output.append(f"&#{name};")
-
-    def get_text(self):
-        return "".join(self.output).strip()
-
-
-def html_to_terminal(html_content):
-    parser = TerminalFormatter()
-    parser.feed(html_content)
-    return parser.get_text()
-
+from webscout.litagent import LitAgent
 
 class TutorAI(Provider):
     """
@@ -132,7 +34,7 @@ class TutorAI(Provider):
 
         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.
+            max_tokens (int, optional): Maximum number of tokens to be generated upon completion. Defaults to 1024.
             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.
@@ -173,11 +75,7 @@ class TutorAI(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/129.0.0.0 Safari/537.36 Edg/128.0.0.0"
-            ),
+            "User-Agent": LitAgent().random()
         }
 
         self.__available_optimizers = (
@@ -229,9 +127,7 @@ class TutorAI(Provider):
         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
-                )
+                conversation_prompt = getattr(Optimizers, optimizer)(conversation_prompt if conversationally else prompt)
             else:
                 raise Exception(
                     f"Optimizer is not one of {self.__available_optimizers}"
@@ -268,7 +164,7 @@ class TutorAI(Provider):
                     homeworkify_html = response_data.get("homeworkifyResponse", "")
                     if not homeworkify_html:
                         raise exceptions.FailedToGenerateResponseError("\nNo 'homeworkifyResponse' found in the response.")
-                    clean_text = html_to_terminal(homeworkify_html)
+                    clean_text = homeworkify_html  # Removed html_to_terminal call
                     self.last_response.update(dict(text=clean_text))
                     self.conversation.update_chat_history(
                         prompt, self.get_message(self.last_response)
@@ -288,7 +184,7 @@ class TutorAI(Provider):
             homeworkify_html = response_data.get("homeworkifyResponse", "")
             if not homeworkify_html:
                 return {"text": "No content found in the response"}  # Default in case content not found
-            clean_text = html_to_terminal(homeworkify_html)
+            clean_text = homeworkify_html  # Removed html_to_terminal call
 
             # Simulate streaming by yielding chunks of the content
             chunk_size = self.stream_chunk_size
@@ -349,6 +245,6 @@ if __name__ == "__main__":
     from rich import print
 
     ai = TutorAI()
-    response = ai.chat(input(">>> "), attachment_path=None)
+    response = ai.chat("hello buddy", attachment_path=None)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

webscout/Provider/typegpt.py

@@ -7,7 +7,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-
+from webscout.litagent import LitAgent
 class TypeGPT(Provider):
     """
     A class to interact with the TypeGPT.net API.  Improved to match webscout standards.
@@ -207,7 +207,6 @@ class TypeGPT(Provider):
         self.presence_penalty = presence_penalty
         self.frequency_penalty = frequency_penalty
         self.top_p = top_p
-
         self.headers = {
             "authority": "chat.typegpt.net",
             "accept": "application/json, text/event-stream",
@@ -215,7 +214,7 @@ class TypeGPT(Provider):
             "content-type": "application/json",
             "origin": "https://chat.typegpt.net",
             "referer": "https://chat.typegpt.net/",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
+            "user-agent": LitAgent().random()
         }
 
 
@@ -352,7 +351,7 @@ class TypeGPT(Provider):
 
 if __name__ == "__main__":
        
-    ai = TypeGPT()
-    response = ai.chat(input(">>> "), stream=True)
+    ai = TypeGPT(model="claude-3-5-sonnet-20240620")
+    response = ai.chat("hi", stream=True)
     for chunks in response:
         print(chunks, end="", flush=True)

webscout/Provider/x0gpt.py

@@ -1,7 +1,6 @@
 from typing import Any, Dict
 from uuid import uuid4
 import requests
-
 import re
 
 from webscout.AIutel import Optimizers
@@ -9,10 +8,21 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout.litagent import LitAgent
 
 class X0GPT(Provider):
     """
     A class to interact with the x0-gpt.devwtf.in API.
+
+    Attributes:
+        system_prompt (str): The system prompt to define the assistant's role.
+
+    Examples:
+        >>> from webscout.Provider.x0gpt import X0GPT
+        >>> ai = X0GPT()
+        >>> response = ai.chat("What's the weather today?")
+        >>> print(response)
+        'The weather today is sunny with a high of 75°F.'
     """
 
     def __init__(
@@ -26,9 +36,27 @@ class X0GPT(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
+        system_prompt: str = "You are a helpful assistant."
     ):
         """
         Initializes the X0GPT API with given parameters.
+
+        Args:
+            is_conversation (bool): Whether the provider is in conversation mode.
+            max_tokens (int): Maximum number of tokens to sample.
+            timeout (int): Timeout for API requests.
+            intro (str): Introduction message for the conversation.
+            filepath (str): Filepath for storing conversation history.
+            update_file (bool): Whether to update the conversation history file.
+            proxies (dict): Proxies for the API requests.
+            history_offset (int): Offset for conversation history.
+            act (str): Act for the conversation.
+            system_prompt (str): The system prompt to define the assistant's role.
+
+        Examples:
+            >>> ai = X0GPT(system_prompt="You are a friendly assistant.")
+            >>> print(ai.system_prompt)
+            'You are a friendly assistant.'
         """
         self.session = requests.Session()
         self.is_conversation = is_conversation
@@ -36,6 +64,11 @@ class X0GPT(Provider):
         self.api_endpoint = "https://x0-gpt.devwtf.in/api/stream/reply"
         self.timeout = timeout
         self.last_response = {}
+        self.system_prompt = system_prompt
+
+        # Initialize LitAgent for user agent generation
+        self.agent = LitAgent()
+
         self.headers = {
             "authority": "x0-gpt.devwtf.in",
             "method": "POST",
@@ -53,10 +86,7 @@ class X0GPT(Provider):
             "sec-ch-ua": '"Not)A;Brand";v="99", "Microsoft Edge";v="127", "Chromium";v="127"',
             "sec-ch-ua-mobile": "?0",
             "sec-ch-ua-platform": '"Windows"',
-            "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/127.0.0.0 Safari/537.36 Edg/127.0.0.0"
+            "user-agent": self.agent.random()  # Use LitAgent to generate a random user agent
         }
 
         self.__available_optimizers = (
@@ -88,6 +118,22 @@ class X0GPT(Provider):
     ) -> Dict[str, Any]:
         """
         Sends a prompt to the x0-gpt.devwtf.in API and returns the response.
+
+        Args:
+            prompt (str): The prompt to send to the API.
+            stream (bool): Whether to stream the response.
+            raw (bool): Whether to return the raw response.
+            optimizer (str): Optimizer to use for the prompt.
+            conversationally (bool): Whether to generate the prompt conversationally.
+
+        Returns:
+            Dict[str, Any]: The API response.
+
+        Examples:
+            >>> ai = X0GPT()
+            >>> response = ai.ask("Tell me a joke!")
+            >>> print(response)
+            {'text': 'Why did the scarecrow win an award? Because he was outstanding in his field!'}
         """
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
@@ -102,10 +148,8 @@ class X0GPT(Provider):
 
         payload = {
             "messages": [
-                {
-                    "role": "user",
-                    "content": conversation_prompt
-                }
+                {"role": "system", "content": self.system_prompt},
+                {"role": "user", "content": conversation_prompt}
             ],
             "chatId": uuid4().hex,
             "namespace": None
@@ -146,6 +190,21 @@ class X0GPT(Provider):
     ) -> str:
         """
         Generates a response from the X0GPT API.
+
+        Args:
+            prompt (str): The prompt to send to the API.
+            stream (bool): Whether to stream the response.
+            optimizer (str): Optimizer to use for the prompt.
+            conversationally (bool): Whether to generate the prompt conversationally.
+
+        Returns:
+            str: The API response.
+
+        Examples:
+            >>> ai = X0GPT()
+            >>> response = ai.chat("What's the weather today?")
+            >>> print(response)
+            'The weather today is sunny with a high of 75°F.'
         """
 
         def for_stream():
@@ -169,6 +228,19 @@ class X0GPT(Provider):
     def get_message(self, response: dict) -> str:
         """
         Extracts the message from the API response.
+
+        Args:
+            response (dict): The API response.
+
+        Returns:
+            str: The message content.
+
+        Examples:
+            >>> ai = X0GPT()
+            >>> response = ai.ask("Tell me a joke!")
+            >>> message = ai.get_message(response)
+            >>> print(message)
+            'Why did the scarecrow win an award? Because he was outstanding in his field!'
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         formatted_text = response["text"].replace('\\n', '\n').replace('\\n\\n', '\n\n')