webscout 4.5__tar.gz → 4.7__tar.gz

{webscout-4.5/webscout.egg-info → webscout-4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.5
+Version: 4.7
 Summary: Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more
 Author: OEvortex
 Author-email: helpingai5@gmail.com
@@ -61,6 +61,8 @@ Requires-Dist: PyExecJS
 Requires-Dist: ollama
 Requires-Dist: pyfiglet
 Requires-Dist: yaspin
+Requires-Dist: pillow
+Requires-Dist: requests_html
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
 Requires-Dist: pytest>=7.4.2; extra == "dev"
@@ -1175,55 +1177,36 @@ prompt = "Explain the concept of recursion in simple terms."
 response = perplexity.chat(prompt)
 print(response)
 ```
-### 8. `OpenGPT` - chat With OPENGPT
+### 8. `meta ai` - chat With meta ai
 ```python
-from webscout import OPENGPT
+from webscout import Meta
+from rich import print
+# **For unauthenticated usage**
+meta_ai = Meta()
 
-opengpt = OPENGPT(is_conversation=True, max_tokens=8000, timeout=30, assistant_id="bca37014-6f97-4f2b-8928-81ea8d478d88")
-while True:
-    # Prompt the user for input
-    prompt = input("Enter your prompt: ")
-    # Send the prompt to the OPENGPT model and print the response
-    response_str = opengpt.chat(prompt)
-    print(response_str)
-```
-```python
-from webscout import OPENGPTv2
-
-# Initialize the bot with all specified settings
-bot = OPENGPTv2(
-    generate_new_agents=True,  # Set to True to generate new IDs, False to load from file
-    assistant_name="My Custom Assistant",
-    retrieval_description="Helpful information from my files.",
-    agent_system_message="",
-    enable_action_server=False,  # Assuming you want to disable Action Server by Robocorp
-    enable_ddg_search=False,  # Enable DuckDuckGo search tool
-    enable_arxiv=False,  # Assuming you want to disable Arxiv
-    enable_press_releases=False,  # Assuming you want to disable Press Releases (Kay.ai)
-    enable_pubmed=False,  # Assuming you want to disable PubMed
-    enable_sec_filings=False,  # Assuming you want to disable SEC Filings (Kay.ai)
-    enable_retrieval=False,  # Assuming you want to disable Retrieval
-    enable_search_tavily=False,  # Assuming you want to disable Search (Tavily)
-    enable_search_short_answer_tavily=False,  # Assuming you want to disable Search (short answer, Tavily)
-    enable_you_com_search=True,  # Assuming you want to disable You.com Search
-    enable_wikipedia=False,  # Enable Wikipedia tool
-    is_public=True,
-    is_conversation=True,
-    max_tokens=800,
-    timeout=40,
-    filepath="opengpt_conversation_history.txt",
-    update_file=True,
-    history_offset=10250,
-    act=None,
-)
+# Simple text prompt
+response = meta_ai.chat("What is the capital of France?")
+print(response)
 
-# Example interaction loop
-while True:
-    prompt = input("You: ")
-    if prompt.strip().lower() == 'exit':
-        break
-    response = bot.chat(prompt)
-    print(response)
+# Streaming response
+for chunk in meta_ai.chat("Tell me a story about a cat."):
+    print(chunk, end="", flush=True)
+
+# **For authenticated usage (including image generation)**
+fb_email = "abcd@abc.com"
+fb_password = "qwertfdsa"
+meta_ai = Meta(fb_email=fb_email, fb_password=fb_password)
+
+# Text prompt with web search
+response = meta_ai.ask("what is currently happning in bangladesh in aug 2024")
+print(response["message"]) # Access the text message
+print("Sources:", response["sources"]) # Access sources (if any)
+
+# Image generation
+response = meta_ai.ask("Create an image of a cat wearing a hat.") 
+print(response["message"]) # Print the text message from the response
+for media in response["media"]:
+    print(media["url"])  # Access image URLs
 
 ```
 ### 9. `KOBOLDAI` - 
@@ -1368,7 +1351,7 @@ from rich import print
 
 ai = DeepSeek(
     is_conversation=True,
-    api_key='', # Watch this video https://youtu.be/Euin6p5Ryks?si=-84JBtyqGwMzvdIq to know from where u can get this key for free 
+    api_key='23bfff080d38429c9fbbf3c76f88454c', 
     max_tokens=800,
     timeout=30,
     intro=None,
@@ -1380,18 +1363,12 @@ ai = DeepSeek(
     model="deepseek_chat"
 )
 
-# Start an infinite loop for continuous interaction
-while True:
-    # Define a prompt to send to the AI
-    prompt = input("Enter your prompt: ")
-    
-    # Check if the user wants to exit the loop
-    if prompt.lower() == "exit":
-        break
-    
-    # Use the 'chat' method to send the prompt and receive a response
-    r = ai.chat(prompt)
-    print(r)
+
+# Define a prompt to send to the AI
+prompt = "Tell me about india"
+# Use the 'chat' method to send the prompt and receive a response
+r = ai.chat(prompt)
+print(r)
 ```
 ### 18. `Deepinfra`
 ```python
@@ -1492,6 +1469,9 @@ from webscout import AndiSearch
 a = AndiSearch()
 print(a.chat("HelpingAI-9B"))
 ```
+
+### 25. LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai
+code similar to other providers
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.5 → webscout-4.7}/README.md

@@ -1103,55 +1103,36 @@ prompt = "Explain the concept of recursion in simple terms."
 response = perplexity.chat(prompt)
 print(response)
 ```
-### 8. `OpenGPT` - chat With OPENGPT
+### 8. `meta ai` - chat With meta ai
 ```python
-from webscout import OPENGPT
+from webscout import Meta
+from rich import print
+# **For unauthenticated usage**
+meta_ai = Meta()
 
-opengpt = OPENGPT(is_conversation=True, max_tokens=8000, timeout=30, assistant_id="bca37014-6f97-4f2b-8928-81ea8d478d88")
-while True:
-    # Prompt the user for input
-    prompt = input("Enter your prompt: ")
-    # Send the prompt to the OPENGPT model and print the response
-    response_str = opengpt.chat(prompt)
-    print(response_str)
-```
-```python
-from webscout import OPENGPTv2
-
-# Initialize the bot with all specified settings
-bot = OPENGPTv2(
-    generate_new_agents=True,  # Set to True to generate new IDs, False to load from file
-    assistant_name="My Custom Assistant",
-    retrieval_description="Helpful information from my files.",
-    agent_system_message="",
-    enable_action_server=False,  # Assuming you want to disable Action Server by Robocorp
-    enable_ddg_search=False,  # Enable DuckDuckGo search tool
-    enable_arxiv=False,  # Assuming you want to disable Arxiv
-    enable_press_releases=False,  # Assuming you want to disable Press Releases (Kay.ai)
-    enable_pubmed=False,  # Assuming you want to disable PubMed
-    enable_sec_filings=False,  # Assuming you want to disable SEC Filings (Kay.ai)
-    enable_retrieval=False,  # Assuming you want to disable Retrieval
-    enable_search_tavily=False,  # Assuming you want to disable Search (Tavily)
-    enable_search_short_answer_tavily=False,  # Assuming you want to disable Search (short answer, Tavily)
-    enable_you_com_search=True,  # Assuming you want to disable You.com Search
-    enable_wikipedia=False,  # Enable Wikipedia tool
-    is_public=True,
-    is_conversation=True,
-    max_tokens=800,
-    timeout=40,
-    filepath="opengpt_conversation_history.txt",
-    update_file=True,
-    history_offset=10250,
-    act=None,
-)
+# Simple text prompt
+response = meta_ai.chat("What is the capital of France?")
+print(response)
 
-# Example interaction loop
-while True:
-    prompt = input("You: ")
-    if prompt.strip().lower() == 'exit':
-        break
-    response = bot.chat(prompt)
-    print(response)
+# Streaming response
+for chunk in meta_ai.chat("Tell me a story about a cat."):
+    print(chunk, end="", flush=True)
+
+# **For authenticated usage (including image generation)**
+fb_email = "abcd@abc.com"
+fb_password = "qwertfdsa"
+meta_ai = Meta(fb_email=fb_email, fb_password=fb_password)
+
+# Text prompt with web search
+response = meta_ai.ask("what is currently happning in bangladesh in aug 2024")
+print(response["message"]) # Access the text message
+print("Sources:", response["sources"]) # Access sources (if any)
+
+# Image generation
+response = meta_ai.ask("Create an image of a cat wearing a hat.") 
+print(response["message"]) # Print the text message from the response
+for media in response["media"]:
+    print(media["url"])  # Access image URLs
 
 ```
 ### 9. `KOBOLDAI` - 
@@ -1296,7 +1277,7 @@ from rich import print
 
 ai = DeepSeek(
     is_conversation=True,
-    api_key='', # Watch this video https://youtu.be/Euin6p5Ryks?si=-84JBtyqGwMzvdIq to know from where u can get this key for free 
+    api_key='23bfff080d38429c9fbbf3c76f88454c', 
     max_tokens=800,
     timeout=30,
     intro=None,
@@ -1308,18 +1289,12 @@ ai = DeepSeek(
     model="deepseek_chat"
 )
 
-# Start an infinite loop for continuous interaction
-while True:
-    # Define a prompt to send to the AI
-    prompt = input("Enter your prompt: ")
-    
-    # Check if the user wants to exit the loop
-    if prompt.lower() == "exit":
-        break
-    
-    # Use the 'chat' method to send the prompt and receive a response
-    r = ai.chat(prompt)
-    print(r)
+
+# Define a prompt to send to the AI
+prompt = "Tell me about india"
+# Use the 'chat' method to send the prompt and receive a response
+r = ai.chat(prompt)
+print(r)
 ```
 ### 18. `Deepinfra`
 ```python
@@ -1420,6 +1395,9 @@ from webscout import AndiSearch
 a = AndiSearch()
 print(a.chat("HelpingAI-9B"))
 ```
+
+### 25. LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai
+code similar to other providers
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.5 → webscout-4.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="webscout",
-    version="4.5",
+    version="4.7",
     description="Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -65,6 +65,8 @@ setup(
         "ollama",
         "pyfiglet",
         "yaspin",
+        "pillow",
+        "requests_html"
     ],
     entry_points={
         "console_scripts": [

{webscout-4.5 → webscout-4.7}/webscout/AIutel.py

@@ -54,6 +54,7 @@ webai = [
    "geminipro",
    "ollama",
    "andi",
+   "llama3"
 ]
 
 gpt4free_providers = [
@@ -533,6 +534,15 @@ LLM:
 ```python
 print("The essay is about...")
 ```
+
+3. User: Weather in qazigund
+
+LLM:
+```python
+from webscout import weather as w
+weather = w.get("Qazigund")
+w.print_weather(weather)
+```
 """
 
 

{webscout-4.5 → webscout-4.7}/webscout/Extra/gguf.py

@@ -153,7 +153,7 @@ huggingface-cli download "$MODEL_ID" --local-dir "./${MODEL_NAME}" --local-dir-u
 # Convert to fp16
 FP16="${MODEL_NAME}/${MODEL_NAME,,}.fp16.bin"
 echo "Converting the model to fp16..."
-python3 llama.cpp/convert-hf-to-gguf.py "$MODEL_NAME" --outtype f16 --outfile "$FP16"
+python3 llama.cpp/convert_hf_to_gguf.py "$MODEL_NAME" --outtype f16 --outfile "$FP16"
 
 # Quantize the model
 echo "Quantizing the model..."

{webscout-4.5 → webscout-4.7}/webscout/Provider/BasedGPT.py

@@ -40,7 +40,7 @@ class BasedGPT(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        system_prompt: str = "Be Helpful and Friendly",
+        model: str = "gpt-3.5-turbo"
     ):
         """Instantiates BasedGPT
 
@@ -54,25 +54,40 @@ class BasedGPT(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.
-            system_prompt (str, optional): System prompt for BasedGPT. Defaults to "Be Helpful and Friendly".
+            model (str, optional): Model to use for generating text. Defaults to "gpt-3.5-turbo".
         """
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.chat_endpoint = "https://www.basedgpt.chat/api/chat"
-        self.stream_chunk_size = 64
         self.timeout = timeout
         self.last_response = {}
-        self.system_prompt = system_prompt
+        self.model = model
+        self.headers = {
+            "accept": "*/*",
+            "accept-encoding": "gzip, deflate, br, zstd",
+            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
+            "content-length": "109",
+            "content-type": "application/json",
+            "dnt": "1",
+            "origin": "https://www.basedgpt.chat",
+            "priority": "u=1, i",
+            "referer": "https://www.basedgpt.chat/",
+            "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"
+        }
 
         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"}
-        )
+        self.session.headers.update(self.headers)
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -106,25 +121,7 @@ class BasedGPT(Provider):
            dict : {}
         ```json
         {
-            "id": "chatcmpl-TaREJpBZsRVQFRFic1wIA7Q7XfnaD",
-            "object": "chat.completion",
-            "created": 1704623244,
-            "model": "gpt-3.5-turbo",
-            "usage": {
-                "prompt_tokens": 0,
-                "completion_tokens": 0,
-                "total_tokens": 0
-                },
-            "choices": [
-                {
-                    "message": {
-                        "role": "assistant",
-                        "content": "Hello! How can I assist you today?"
-                },
-                "finish_reason": "stop",
-                "index": 0
-                }
-            ]
+           "text" : "How may I assist you today?"
         }
         ```
         """
@@ -139,11 +136,14 @@ class BasedGPT(Provider):
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
 
+        self.session.headers.update(self.headers)
         payload = {
             "messages": [
-                {"role": "system", "content": self.system_prompt},
-                {"role": "user", "content": conversation_prompt},
-            ],
+                {
+                    "role": "user",
+                    "content": conversation_prompt
+                }
+            ]
         }
 
         def for_stream():
@@ -151,22 +151,24 @@ class BasedGPT(Provider):
                 self.chat_endpoint, json=payload, stream=True, timeout=self.timeout
             )
             if not response.ok:
-                raise exceptions.FailedToGenerateResponseError(
+                raise Exception(
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 )
 
-            message_load = ""
+            streaming_text = ""
             for value in response.iter_lines(
                 decode_unicode=True,
-                delimiter="",
-                chunk_size=self.stream_chunk_size,
+                chunk_size=64,
+                delimiter="\n",
             ):
                 try:
-                    message_load += value
-                    yield value if raw else dict(text=message_load)
+                    if bool(value):
+                        streaming_text += value + ("\n" if stream else "")
+                        resp = dict(text=streaming_text)
+                        self.last_response.update(resp)
+                        yield value if raw else resp
                 except json.decoder.JSONDecodeError:
                     pass
-            self.last_response.update(dict(text=message_load))
             self.conversation.update_chat_history(
                 prompt, self.get_message(self.last_response)
             )

{webscout-4.5 → webscout-4.7}/webscout/Provider/Blackboxai.py

@@ -22,14 +22,14 @@ import yaml
 from ..AIutel import Optimizers
 from ..AIutel import Conversation
 from ..AIutel import AwesomePrompts, sanitize_stream
-from ..AIbase import  Provider, AsyncProvider
+from ..AIbase import Provider, AsyncProvider
 from Helpingai_T2 import Perplexity
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
 import logging
 import httpx
 
-#------------------------------------------------------BLACKBOXAI--------------------------------------------------------  
+#------------------------------------------------------BLACKBOXAI--------------------------------------------------------
 class BLACKBOXAI:
     def __init__(
         self,
@@ -234,13 +234,9 @@ class BLACKBOXAI:
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
-    @staticmethod
-    def chat_cli(prompt):
-        """Sends a request to the BLACKBOXAI API and processes the response."""
-        blackbox_ai = BLACKBOXAI()  # Initialize a BLACKBOXAI instance
-        response = blackbox_ai.ask(prompt)  # Perform a chat with the given prompt
-        processed_response = blackbox_ai.get_message(response)  # Process the response
-        print(processed_response)
+
+
+
 class AsyncBLACKBOXAI(AsyncProvider):
     def __init__(
         self,
@@ -437,4 +433,12 @@ class AsyncBLACKBOXAI(AsyncProvider):
             str: Message extracted
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response["text"]
+        return response["text"]
+
+# Function to clean the response text
+def clean_response(response_text: str) -> str:
+    # Remove web search results
+    response_text = re.sub(r'\$@\$v=undefined-rv1\$@\$Sources:.*?\$~~~', '', response_text, flags=re.DOTALL)
+    # Remove any remaining special characters or markers
+    response_text = re.sub(r'\$~~~', '', response_text)
+    return response_text