webscout 4.2__tar.gz → 4.4__tar.gz

{webscout-4.2/webscout.egg-info → webscout-4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.2
+Version: 4.4
 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
@@ -34,6 +34,7 @@ Requires-Dist: tqdm
 Requires-Dist: webdriver-manager
 Requires-Dist: halo>=0.0.31
 Requires-Dist: g4f>=0.2.2.3
+Requires-Dist: g4f[webdriver]
 Requires-Dist: rich
 Requires-Dist: python-dotenv
 Requires-Dist: beautifulsoup4
@@ -55,6 +56,11 @@ Requires-Dist: playsound
 Requires-Dist: poe_api_wrapper
 Requires-Dist: pyreqwest_impersonate
 Requires-Dist: ballyregan
+Requires-Dist: nodriver
+Requires-Dist: PyExecJS
+Requires-Dist: ollama
+Requires-Dist: pyfiglet
+Requires-Dist: yaspin
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
 Requires-Dist: pytest>=7.4.2; extra == "dev"
@@ -1472,6 +1478,34 @@ response = ollama_provider.chat("What is the meaning of life?")
 print(response)
 ```
 
+### 22. GROQ
+```python
+from webscout import GROQ
+ai = GROQ(api_key="")
+response = ai.chat("What is the meaning of life?")
+print(response)
+
+```
+
+### 23. Freegemini - chat with gemini for free
+```python
+from webscout import FreeGemini
+ai = FreeGemini()
+response = ai.chat("What is the meaning of life?")
+print(response)
+```
+
+### 24. LLama 70b - chat with meta's llama 3 70b
+```python
+
+from webscout import LLAMA
+
+llama = LLAMA()
+
+r = llama.chat("What is the meaning of life?")
+print(r)
+```
+
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.2 → webscout-4.4}/README.md

@@ -1406,6 +1406,34 @@ response = ollama_provider.chat("What is the meaning of life?")
 print(response)
 ```
 
+### 22. GROQ
+```python
+from webscout import GROQ
+ai = GROQ(api_key="")
+response = ai.chat("What is the meaning of life?")
+print(response)
+
+```
+
+### 23. Freegemini - chat with gemini for free
+```python
+from webscout import FreeGemini
+ai = FreeGemini()
+response = ai.chat("What is the meaning of life?")
+print(response)
+```
+
+### 24. LLama 70b - chat with meta's llama 3 70b
+```python
+
+from webscout import LLAMA
+
+llama = LLAMA()
+
+r = llama.chat("What is the meaning of life?")
+print(r)
+```
+
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.2 → webscout-4.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="webscout",
-    version="4.2",
+    version="4.4",
     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",
@@ -38,6 +38,7 @@ setup(
         "webdriver-manager",
         "halo>=0.0.31",
         "g4f>=0.2.2.3",
+        "g4f[webdriver]",
         "rich",
         "python-dotenv",
         "beautifulsoup4",
@@ -58,7 +59,12 @@ setup(
         "playsound",
         "poe_api_wrapper",
         "pyreqwest_impersonate",
-        "ballyregan"
+        "ballyregan",
+        "nodriver",
+        "PyExecJS",
+        "ollama",
+        "pyfiglet",
+        "yaspin",
     ],
     entry_points={
         "console_scripts": [

{webscout-4.2 → webscout-4.4}/webscout/AIauto.py

@@ -1,8 +1,7 @@
 from webscout.AIbase import Provider, AsyncProvider
 from webscout.Provider.ThinkAnyAI import ThinkAnyAI
 from webscout.Provider.Xjai import Xjai
-from webscout.Provider.Llama2 import LLAMA2
-from webscout.Provider.Llama2 import AsyncLLAMA2
+from webscout.Provider.Llama import LLAMA
 from webscout.Provider.Leo import LEO
 from webscout.Provider.Leo import AsyncLEO
 from webscout.Provider.Koboldai import KOBOLDAI
@@ -44,7 +43,7 @@ provider_map: dict[
     Union[
         ThinkAnyAI,
         Xjai,
-        LLAMA2,
+        LLAMA,
         LEO,
         KOBOLDAI,
         OPENGPT,
@@ -69,7 +68,7 @@ provider_map: dict[
 ] = {
     "ThinkAnyAI": ThinkAnyAI,
     "Xjai": Xjai,
-    "LLAMA2": LLAMA2,
+    "LLAMA2": LLAMA,
     "LEO": LEO,
     "KOBOLDAI": KOBOLDAI,
     "OPENGPT": OPENGPT,
@@ -124,7 +123,7 @@ class AUTO(Provider):
         self.provider: Union[
             ThinkAnyAI,
             Xjai,
-            LLAMA2,
+            LLAMA,
             LEO,
             KOBOLDAI,
             OPENGPT,
@@ -353,13 +352,12 @@ class AsyncAUTO(AsyncProvider):
             AsyncOPENGPT,
             AsyncKOBOLDAI,
             AsyncPhindSearch,
-            AsyncLLAMA2,
             AsyncBLACKBOXAI,
             AsyncGPT4FREE,
             AsyncLEO,
             ThinkAnyAI,
             Xjai,
-            LLAMA2,
+            LLAMA,
             LEO,
             KOBOLDAI,
             OPENGPT,

{webscout-4.2 → webscout-4.4}/webscout/AIutel.py

@@ -220,17 +220,16 @@ class Conversation:
         ), f"File '{filepath}' does not exist"
         if not os.path.isfile(filepath):
             logging.debug(f"Creating new chat-history file - '{filepath}'")
-            with open(filepath, "w") as fh:  # Try creating new file
-                # lets add intro here
+            with open(filepath, "w", encoding="utf-8") as fh:  # Try creating new file with UTF-8 encoding
                 fh.write(self.intro)
         else:
             logging.debug(f"Loading conversation from '{filepath}'")
-            with open(filepath) as fh:
+            with open(filepath, encoding="utf-8") as fh:  # Open with UTF-8 encoding
                 file_contents = fh.readlines()
                 if file_contents:
                     self.intro = file_contents[0]  # Presume first line is the intro.
                     self.chat_history = "\n".join(file_contents[1:])
-
+    
     def __trim_chat_history(self, chat_history: str, intro: str) -> str:
         """Ensures the len(prompt) and max_tokens_to_sample is not > 4096"""
         len_of_intro = len(intro)
@@ -243,7 +242,6 @@ class Conversation:
             # Remove head of total (n) of chat_history
             trimmed_chat_history = chat_history[truncate_at:]
             return "... " + trimmed_chat_history
-            # print(len(self.chat_history))
         else:
             return chat_history
 
@@ -281,12 +279,12 @@ class Conversation:
         new_history = self.history_format % dict(user=prompt, llm=response)
         if self.file and self.update_file:
             if os.path.exists(self.file):
-                with open(self.file, "w") as fh:
+                with open(self.file, "w", encoding="utf-8") as fh:  # Specify UTF-8 encoding
                     fh.write(self.intro + "\n" + new_history)
             else:
-                with open(self.file, "a") as fh:
+                with open(self.file, "a", encoding="utf-8") as fh:  # Specify UTF-8 encoding
                     fh.write(new_history)
-        self.chat_history += new_history
+            self.chat_history += new_history
 
 
 

{webscout-4.2 → webscout-4.4}/webscout/Extra/autollama.py

@@ -1,6 +1,14 @@
 import subprocess
 import argparse
 import os
+from rich.console import Console
+from rich.panel import Panel
+from rich.progress import track
+from yaspin import yaspin
+from pyfiglet import figlet_format
+import time
+
+console = Console()
 
 def autollama(model_path, gguf_file):
     """Manages models with Ollama using the autollama.sh script.
@@ -9,6 +17,7 @@ def autollama(model_path, gguf_file):
         model_path (str): The path to the Hugging Face model.
         gguf_file (str): The name of the GGUF file. 
     """
+    console.print(f"[bold green]{figlet_format('Autollama')}[/]\n", justify="center")
 
     # Check if autollama.sh exists in the current working directory
     script_path = os.path.join(os.getcwd(), "autollama.sh")
@@ -172,25 +181,27 @@ echo "Use Ollama run $MODEL_NAME"
     # Execute the command
     process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
 
-    # Print the output and error in real-time
-    for line in process.stdout:
-        print(line, end='')
-
-    for line in process.stderr:
-        print(line, end='')
+    for line in iter(process.stdout.readline, ''): 
+        console.print(Panel(line.strip(), title="Autollama Output", expand=False)) 
 
+    for line in iter(process.stderr.readline, ''): 
+        console.print(Panel(line.strip(), title="Autollama Errors (if any)", expand=False))
+    
     process.wait()
+    console.print("[green]Model is ready![/]")
 
 def main():
     parser = argparse.ArgumentParser(description='Automatically create and run an Ollama model in Ollama')
-    parser.add_argument('-m', '--model_path', required=True, help='Set the hunggingface model id to the Hugging Face model')
+    parser.add_argument('-m', '--model_path', required=True, help='Set the huggingface model id to the Hugging Face model')
     parser.add_argument('-g', '--gguf_file', required=True, help='Set the GGUF file name')
     args = parser.parse_args()
 
     try:
-        autollama(args.model_path, args.gguf_file)
+        with yaspin(text="Processing...") as spinner:
+            autollama(args.model_path, args.gguf_file)
+        spinner.ok("Done!")
     except Exception as e:
-        print(f"Error: {e}")
+        console.print(f"[red]Error: {e}[/]")
         exit(1)
 
 if __name__ == "__main__":

{webscout-4.2 → webscout-4.4}/webscout/Extra/gguf.py

@@ -1,7 +1,10 @@
 # webscout/Extra/gguf.py
 import subprocess
-import argparse
 import os 
+from pyfiglet import figlet_format
+from rich.console import Console
+
+console = Console()
 
 def convert(model_id, username=None, token=None, quantization_methods="q4_k_m,q5_k_m"):
     """Converts and quantizes a Hugging Face model to GGUF format.
@@ -17,6 +20,7 @@ def convert(model_id, username=None, token=None, quantization_methods="q4_k_m,q5
         ValueError: If an invalid quantization method is provided.
     """
 
+    console.print(f"[bold green]{figlet_format('GGUF Converter')}[/]\n", justify="center")
     # List of valid quantization methods
     valid_methods = [
         "q2_k", "q3_k_l", "q3_k_m", "q3_k_s", 
@@ -220,21 +224,3 @@ echo "Script completed."
     process.wait()
 
 
-def main():
-    parser = argparse.ArgumentParser(description='Convert and quantize model using gguf.sh')
-    parser.add_argument('-m', '--model_id', required=True, help='Set the HF model ID (e.g., "google/flan-t5-xl")')
-    parser.add_argument('-u', '--username', help='Set your Hugging Face username (required for uploads)')
-    parser.add_argument('-t', '--token', help='Set your Hugging Face API token (required for uploads)')
-    parser.add_argument('-q', '--quantization_methods', default="q4_k_m,q5_k_m", 
-                        help='Comma-separated quantization methods (default: q4_k_m,q5_k_m). Valid methods: q2_k, q3_k_l, q3_k_m, q3_k_s, q4_0, q4_1, q4_k_m, q4_k_s, q5_0, q5_1, q5_k_m, q5_k_s, q6_k, q8_0')
-    
-    args = parser.parse_args()
-    
-    try:
-        convert(args.model_id, args.username, args.token, args.quantization_methods)
-    except ValueError as e:
-        print(e)
-        exit(1)
-
-if __name__ == "__main__":
-    main()

webscout-4.4/webscout/Extra/weather.py

@@ -0,0 +1,67 @@
+import requests
+from rich.console import Console
+from rich.table import Table
+from yaspin import yaspin
+from pyfiglet import figlet_format
+
+console = Console()
+
+def get(location):
+    """Fetches weather data for the given location.
+
+    Args:
+        location (str): The location for which to fetch weather data.
+
+    Returns:
+        dict: A dictionary containing weather data if the request is successful,
+              otherwise a string indicating the error.
+    """
+    url = f"https://wttr.in/{location}?format=j1"
+    
+    with yaspin(text="Fetching weather data...") as spinner:
+        response = requests.get(url)
+        spinner.ok("✅ ")
+
+    if response.status_code == 200:
+        return response.json()
+    else:
+        return f"Error: Unable to fetch weather data. Status code: {response.status_code}"
+
+def print_weather(weather_data):
+    """Prints the weather data in a user-friendly format.
+
+    Args:
+        weather_data (dict or str): The weather data returned from get_weather() 
+                                  or an error message.
+    """
+    if isinstance(weather_data, str):
+        console.print(f"[bold red]Error:[/] {weather_data}")
+        return
+
+    current = weather_data['current_condition'][0]
+    location_name = weather_data['nearest_area'][0]['areaName'][0]['value']
+
+    console.print(f"[bold blue]\n{figlet_format('Weather Report')}[/]\n", justify="center")
+    console.print(f"[bold green]Weather in {location_name}:[/]\n")
+
+    table = Table(show_header=False, show_lines=True)
+    table.add_row("Temperature:", f"{current['temp_C']}°C / {current['temp_F']}°F")
+    table.add_row("Condition:", current['weatherDesc'][0]['value'])
+    table.add_row("Humidity:", f"{current['humidity']}%")
+    table.add_row("Wind:", f"{current['windspeedKmph']} km/h, {current['winddir16Point']}")
+    console.print(table)
+
+    console.print(f"\n[bold green]Forecast:[/]")
+    table = Table(show_header=True, header_style="bold cyan")
+    table.add_column("Date", style="dim", width=12)
+    table.add_column("Temperature Range")
+    table.add_column("Description")
+    
+    for day in weather_data['weather']:
+        date = day['date']
+        max_temp = day['maxtempC']
+        min_temp = day['mintempC']
+        desc = day['hourly'][4]['weatherDesc'][0]['value'] 
+        table.add_row(date, f"{min_temp}°C to {max_temp}°C", desc)
+    console.print(table)
+

{webscout-4.2 → webscout-4.4}/webscout/Extra/weather_ascii.py

@@ -1,5 +1,8 @@
 import requests
+from rich.console import Console
+from pyfiglet import figlet_format
 
+console = Console()
 def get(location):
     """Fetches ASCII art weather data for the given location.
     Args:
@@ -9,6 +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")
     url = f"https://wttr.in/{location}"
     response = requests.get(url, headers={'User-Agent': 'curl'}) 
 
@@ -16,3 +20,4 @@ def get(location):
         return "\n".join(response.text.splitlines()[:-1]) 
     else:
         return f"Error: Unable to fetch weather data. Status code: {response.status_code}"
+