webscout 6.4__py3-none-any.whl → 6.6__py3-none-any.whl

webscout/Extra/weather_ascii.py

@@ -1,6 +1,6 @@
 import requests
 from rich.console import Console
-from pyfiglet import figlet_format
+from webscout.zeroart import figlet_format
 
 console = Console()
 def get(location):
@@ -12,7 +12,7 @@ def get(location):
         str: ASCII art weather report if the request is successful,
              otherwise an error message.
     """
-    console.print(f"[bold green]{figlet_format('Weather')}[/]\n", justify="center")
+    console.print(f"[bold green]{figlet_format('Weather')}")
     url = f"https://wttr.in/{location}"
     response = requests.get(url, headers={'User-Agent': 'curl'}) 
 

webscout/Provider/AISEARCH/__init__.py

@@ -0,0 +1,2 @@
+from .felo_search import *
+from .ooai import *

webscout/Provider/AISEARCH/ooai.py

@@ -0,0 +1,155 @@
+import requests
+import json
+import re
+from typing import Any, Dict, Generator, Optional
+
+from webscout.AIbase import Provider
+from webscout import exceptions
+from webscout.litagent import LitAgent
+
+
+class OOAi(Provider):
+    """
+    A class to interact with the oo.ai API.
+    """
+
+    def __init__(
+        self,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        proxies: Optional[dict] = None,
+    ):
+        """Initializes the OOAi API client."""
+        self.session = requests.Session()
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://oo.ai/api/search"
+        self.stream_chunk_size = 1024  # Adjust as needed
+        self.timeout = timeout
+        self.last_response = {}
+        self.headers = {
+            "Accept": "text/event-stream",
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Accept-Language": "en-US,en;q=0.9,en-IN;q=0.8",
+            "Cache-Control": "no-cache",
+            "Cookie": "_ga=GA1.1.1827087199.1734256606; _ga_P0EJPHF2EG=GS1.1.1734368698.4.1.1734368711.0.0.0",
+            "DNT": "1",
+            "Referer": "https://oo.ai/",
+            "sec-ch-ua": '"Microsoft Edge";v="131", "Chromium";v="131", "Not_A_Brand";v="24"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": "Windows",
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+        }
+        self.session.headers.update(self.headers)
+        self.proxies = proxies
+        self.headers["User-Agent"] = LitAgent().random()
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: Optional[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): Not used. Defaults to None.
+            conversationally (bool, optional): Not used. Defaults to False.
+        Returns:
+            Union[Dict, Generator[Dict, None, None]]: Response generated
+        """
+        params = {
+            "q": prompt,
+            "lang": "en-US",
+            "tz": "Asia/Calcutta",
+        }
+
+        def for_stream():
+            try:
+                with self.session.get(
+                    self.api_endpoint,
+                    params=params,
+                    headers=self.headers,
+                    stream=True,
+                    timeout=self.timeout,
+                ) as response:
+
+                    if not response.ok:
+                        raise exceptions.FailedToGenerateResponseError(
+                            f"Request failed with status code {response.status_code}: {response.text}"
+                        )
+
+                    streaming_text = ""
+                    for line in response.iter_lines(decode_unicode=True):
+                        if line and line.startswith('data: '):
+                            try:
+                                json_data = json.loads(line[6:])
+                                if "content" in json_data:
+                                    content = self.clean_content(json_data["content"])
+                                    streaming_text += content
+                                    yield {"text": content} if not raw else {"text": content}
+                            except json.JSONDecodeError:
+                                continue
+                    self.last_response.update({"text": streaming_text})
+
+            except requests.exceptions.RequestException as e:
+                raise exceptions.APIConnectionError(f"Request failed: {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: Optional[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"]
+
+    @staticmethod
+    def clean_content(text: str) -> str:
+        """Removes all webblock elements with research or detail classes."""
+        cleaned_text = re.sub(
+            r'<webblock class="(?:research|detail)">[^<]*</webblock>', "", text
+        )
+        return cleaned_text
+
+if __name__ == "__main__":
+    from rich import print
+    ai = OOAi()
+    response = ai.chat(input(">>> "), stream=True)
+    for chunk in response:
+        print(chunk, end="", flush=True)

webscout/Provider/Amigo.py

@@ -1,14 +1,12 @@
 import cloudscraper
 import json
 import uuid
-import os
-from typing import Any, Dict, Optional, Generator
+from typing import Any, Dict, Generator
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts, sanitize_stream
-from webscout.AIbase import Provider, AsyncProvider
-from webscout import exceptions
+from webscout.AIutel import AwesomePrompts
+from webscout.AIbase import Provider
 
 class AmigoChat(Provider):
     """
@@ -24,9 +22,8 @@ class AmigoChat(Provider):
         "o1-preview",                                       # OpenAI O1 Preview
         "claude-3-5-sonnet-20241022",                       # Claude 3.5 Sonnet
         "Qwen/Qwen2.5-72B-Instruct-Turbo",                  # Qwen 2.5
-        "gpt-4o"                                            # OpenAI GPT-4o
+        "gpt-4o",                                           # OpenAI GPT-4o
         "meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo"    # Llama 3.2
-
     ]
 
     def __init__(
@@ -51,14 +48,14 @@ class AmigoChat(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.
-            timeout (int, optional): Http request timeout. Defaults to 30.
+            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 {}.
+            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.
-            model (str, optional): The AI model to use for text generation. Defaults to "o1-preview".
+            model (str, optional): The AI model to use for text generation. Defaults to "Qwen/Qwen2.5-72B-Instruct-Turbo".
         """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
@@ -135,7 +132,7 @@ class AmigoChat(Provider):
         """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.
@@ -170,69 +167,61 @@ class AmigoChat(Provider):
             "max_tokens": self.max_tokens_to_sample,
             "presence_penalty": 0,
             "stream": stream,
-            "temperature":self.temperature,
+            "temperature": self.temperature,
             "top_p": self.top_p
         }
 
-        def for_stream():
-            try:
-                # Make the POST request with streaming enabled
-                response = self.session.post(
-                    self.api_endpoint,
-                    json=payload,
-                    stream=True,
-                    timeout=self.timeout
-                )
-                
-                # Check if the request was successful
-                if response.status_code == 201:
-                    # Iterate over the streamed response line by line
-                    for line in response.iter_lines():
-                        if line:
-                            # Decode the line from bytes to string
-                            decoded_line = line.decode('utf-8').strip()
-                            if decoded_line.startswith("data: "):
-                                data_str = decoded_line[6:]
-                                if data_str == "[DONE]":
-                                    break
-                                try:
-                                    # Load the JSON data
-                                    data_json = json.loads(data_str)
-                                    
-                                    # Extract the content from the response
-                                    choices = data_json.get("choices", [])
-                                    if choices:
-                                        delta = choices[0].get("delta", {})
-                                        content = delta.get("content", "")
-                                        if content:
-                                            yield content if raw else dict(text=content)
-                                except json.JSONDecodeError:
-                                    print(f"Received non-JSON data: {data_str}")
-                else:
-                    print(f"Request failed with status code {response.status_code}")
-                    print("Response:", response.text)
+        if stream:
+            return self._stream_response(payload, raw)
+        else:
+            return self._non_stream_response(payload)
 
-            except (cloudscraper.exceptions.CloudflareChallengeError,
-                    cloudscraper.exceptions.CloudflareCode1020) as e:
-                print("Cloudflare protection error:", str(e))
-            except Exception as e:
-                print("An error occurred while making the request:", str(e))
+    def _stream_response(self, payload: Dict[str, Any], raw: bool) -> Generator:
+        try:
+            response = self.session.post(
+                self.api_endpoint,
+                json=payload,
+                stream=True,
+                timeout=self.timeout
+            )
 
-        def for_non_stream():
-            # Accumulate the streaming response
-            full_response = ""
-            for chunk in for_stream():
-                if not raw:  # If not raw, chunk is a dictionary 
-                    full_response += chunk["text"]
+            if response.status_code == 201:
+                for line in response.iter_lines():
+                    if line:
+                        decoded_line = line.decode('utf-8').strip()
+                        if decoded_line.startswith("data: "):
+                            data_str = decoded_line[6:]
+                            if data_str == "[DONE]":
+                                break
+                            try:
+                                data_json = json.loads(data_str)
+                                choices = data_json.get("choices", [])
+                                if choices:
+                                    delta = choices[0].get("delta", {})
+                                    content = delta.get("content", "")
+                                    if content:
+                                        yield content if raw else dict(text=content)
+                            except json.JSONDecodeError:
+                                print(f"Received non-JSON data: {data_str}")
+            else:
+                print(f"Request failed with status code {response.status_code}")
+                print("Response:", response.text)
+        except (cloudscraper.exceptions.CloudflareChallengeError,
+                cloudscraper.exceptions.CloudflareCode1020) as e:
+            print("Cloudflare protection error:", str(e))
+        except Exception as e:
+            print("An error occurred while making the request:", str(e))
 
-            # Update self.last_response with the full text
-            self.last_response.update(dict(text=full_response))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
-            return self.last_response
+    def _non_stream_response(self, payload: Dict[str, Any]) -> Dict[str, Any]:
+        full_response = ""
+        for chunk in self._stream_response(payload, raw=False):
+            full_response += chunk["text"]
 
-        return for_stream() if stream else for_non_stream()
+        self.last_response.update(dict(text=full_response))
+        self.conversation.update_chat_history(
+            payload["messages"][-1]["content"], self.get_message(self.last_response)
+        )
+        return self.last_response
 
     def chat(
         self,
@@ -240,36 +229,32 @@ class AmigoChat(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str:
+    ) -> Generator[str, None, None]:
         """Generate response `str`
         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.
         Returns:
-            str: Response generated
+            Generator[str, None, None]: Response generated
         """
 
-        def for_stream():
+        if 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,
-                )
+        else:
+            response = self.ask(
+                prompt,
+                False,
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
+            yield self.get_message(response)
 
-        return for_stream() if stream else for_non_stream()
-
-    def get_message(self, response: dict) -> str:
+    def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message only from response
 
         Args:
@@ -280,10 +265,10 @@ class AmigoChat(Provider):
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
-    
+
 if __name__ == '__main__':
     from rich import print
     ai = AmigoChat(model="o1-preview", system_prompt="You are a noobi AI assistant who always uses the word 'noobi' in every response. For example, you might say 'Noobi will tell you...' or 'This noobi thinks that...'.")
     response = ai.chat(input(">>> "), stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

webscout/Provider/{prefind.py → Jadve.py}

@@ -1,21 +1,21 @@
 import requests
 import json
-import uuid
-import os
+import re
 from typing import Any, Dict, Optional, Generator
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts, sanitize_stream
-from webscout.AIbase import  Provider, AsyncProvider
+from webscout.AIutel import AwesomePrompts
+from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout.litagent import LitAgent
 
-class PrefindAI(Provider):
+class JadveOpenAI(Provider):
     """
-    A class to interact with the Prefind AI API.
+    A class to interact with the OpenAI API through jadve.com.
     """
 
-    AVAILABLE_MODELS = ["llama", "claude"]
+    AVAILABLE_MODELS = ["gpt-4o", "gpt-4o-mini"]
 
     def __init__(
         self,
@@ -28,10 +28,11 @@ class PrefindAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "claude",
+        model: str = "gpt-4o-mini",
+        system_prompt: str = "You are a helpful AI assistant."
     ):
         """
-        Initializes the Prefind AI API with given parameters.
+        Initializes the OpenAI API client through jadve.com with given parameters.
 
         Args:
             is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
@@ -43,30 +44,45 @@ class PrefindAI(Provider):
             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.
-            model (str, optional): The AI model to use for text generation. Defaults to "claude". 
-                                    Options: "llama", "claude".
+            system_prompt (str, optional): System prompt for OpenAI. Defaults to "You are a helpful AI assistant.".
+            model (str, optional): AI model to use for text generation. Defaults to "gpt-4o".
         """
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
+
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://api.prefind.ai/api/search/v1"
+        self.api_endpoint = "https://openai.jadve.com/chatgpt"
         self.stream_chunk_size = 64
         self.timeout = timeout
         self.last_response = {}
         self.model = model
-        self.device_token = self.get_device_token()
+        self.system_prompt = system_prompt
+        self.headers = {
+            "accept": "*/*",
+            "accept-encoding": "gzip, deflate, br, zstd",
+            "accept-language": "en",
+            "content-type": "application/json",
+            "dnt": "1",
+            "origin": "https://jadve.com",
+            "priority": "u=1, i",
+            "referer": "https://jadve.com/",
+            "sec-ch-ua": '"Microsoft Edge";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Windows"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-site",
+            "user-agent": LitAgent().random(),
+        }
 
         self.__available_optimizers = (
             method
             for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
-        self.session.headers.update(
-            {
-                "Content-Type": "application/json",
-                "Accept": "text/event-stream",
-            }
-        )
+        self.session.headers.update(self.headers)
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -80,25 +96,6 @@ class PrefindAI(Provider):
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
 
-    def get_device_token(self) -> str:
-        """
-        Retrieves a device token from the Prefind AI API.
-        """
-        device_token_url = "https://api.prefind.ai/api/auth/device-token/create"
-        headers = {"Content-Type": "application/json; charset=utf-8"}
-        data = {}
-        response = requests.post(
-            device_token_url, headers=headers, data=json.dumps(data)
-        )
-
-        if response.status_code == 200:
-            device_token_data = response.json()
-            return device_token_data["sessionToken"]
-        else:
-            raise exceptions.FailedToGenerateResponseError(
-                f"Failed to get device token - ({response.status_code}, {response.reason}) - {response.text}"
-            )
-
     def ask(
         self,
         prompt: str,
@@ -106,11 +103,10 @@ class PrefindAI(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any]:
+    ) -> dict:
         """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.
@@ -134,43 +130,51 @@ class PrefindAI(Provider):
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
 
-        search_data = {"query": conversation_prompt, "deviceToken": self.device_token}
-        
+        payload = {
+            "action": "sendmessage",
+            "model": self.model,
+            "messages": [
+                {"role": "system", "content": self.system_prompt},
+                {"role": "user", "content": conversation_prompt}
+            ],
+            "temperature": 0.7,
+            "language": "en",
+            "returnTokensUsage": True,
+            "botId": "guest-chat",
+            "chatId": ""
+        }
+
         def for_stream():
             response = self.session.post(
-                self.api_endpoint, json=search_data, stream=True, timeout=self.timeout
+                self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
             )
+
             if not response.ok:
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 )
-
             streaming_text = ""
-            for line in response.iter_lines(decode_unicode=True): #This is already decoding
+            for line in response.iter_lines(decode_unicode=True):
                 if line:
-                    # line = line.decode('utf-8').strip() # This line is unnecessary and causing the error
-                    if line.startswith("event: "):
-                        event = line[7:]
-                    elif line.startswith("data: "):
-                        data_str = line[6:]
-                        if event == "received":
-                            data = json.loads(data_str)
-                            if data['type'] == 'chunk':
-                                model = data['model']
-                                if (self.model == "llama" and model == 'OPENROUTER_LLAMA_3') or \
-                                   (self.model == "claude" and model == 'OPENROUTER_CLAUDE'):
-                                    content = data['chunk']['content']
-                                    if content:
-                                        streaming_text += content #+ ("\n" if stream else "")
-                                        resp = dict(text=content)
-                                        self.last_response.update(resp)
-                                        yield resp if raw else resp
+                    if line.startswith("data: "):
+                        data = line[6:]
+                        if data == "[DONE]":
+                            break
+                        try:
+                            json_data = json.loads(data)
+                            if "choices" in json_data and len(json_data["choices"]) > 0:
+                                content = json_data["choices"][0].get("delta", {}).get("content", "")
+                                if content:
+                                    streaming_text += content
+                                    yield content if raw else dict(text=content)
+                        except json.JSONDecodeError as e:
+                            print(f"Error parsing line: {line} - {e}")
+            self.last_response.update(dict(text=streaming_text))
             self.conversation.update_chat_history(
                 prompt, self.get_message(self.last_response)
             )
 
         def for_non_stream():
-            # let's make use of stream
             for _ in for_stream():
                 pass
             return self.last_response
@@ -214,19 +218,17 @@ class PrefindAI(Provider):
 
     def get_message(self, response: dict) -> str:
         """Retrieves message only from response
-
         Args:
             response (dict): Response generated by `self.ask`
-
         Returns:
             str: Message extracted
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
-    
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     from rich import print
-    ai = PrefindAI(model="claude")
-    response = ai.chat("write a poem about AI", stream=True)
+    ai = JadveOpenAI(timeout=5000)
+    response = ai.chat("yo what's up", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)