webscout 4.3__py3-none-any.whl → 4.5__py3-none-any.whl

webscout/cli.py

@@ -20,8 +20,10 @@ from rich.table import Table
 from rich.style import Style
 from rich.text import Text
 from rich.align import Align
-from rich.progress import track
+from rich.progress import track, Progress
 from rich.prompt import Prompt, Confirm
+from rich.columns import Columns
+from pyfiglet import figlet_format
 
 logger = logging.getLogger(__name__)
 
@@ -45,13 +47,12 @@ COLORS = {
 }
 
 def _print_data(data):
-    """Prints data using rich panels and markdown, asynchronously."""
+    """Prints data using rich panels and markdown."""
     console = Console()
     if data:
         for i, e in enumerate(data, start=1):
-            # Create a table for each result
-            table = Table(title=f"{i}.", show_lines=True)
-            table.add_column("Key", style="cyan", no_wrap=True)
+            table = Table(show_header=False, show_lines=True, expand=True, box=None)  # Removed duplicate title
+            table.add_column("Key", style="cyan", no_wrap=True, width=15)
             table.add_column("Value", style="white")
 
             for j, (k, v) in enumerate(e.items(), start=1):
@@ -59,21 +60,22 @@ def _print_data(data):
                     width = 300 if k in ("content", "href", "image", "source", "thumbnail", "url") else 78
                     k = "language" if k == "detected_language" else k
                     text = click.wrap_text(
-                        f"{v}", width=width, initial_indent="", subsequent_indent=" " * 12, preserve_paragraphs=True
-                    )
+                        f"{v}", width=width, initial_indent="", subsequent_indent=" " * 18, preserve_paragraphs=True
+                    ).replace("\n", "\n\n")
                 else:
                     text = v
                 table.add_row(k, text)
 
-            # Wrap the table in a panel with a title
-            console.print(Panel(Align(table, align="left"), title=f"Result {i}", expand=False))
-            console.print("\n")
+            # Only the Panel has the title now
+            console.print(Panel(table, title=f"Result {i}", expand=False, style="green on black"))
+            console.print("\n") 
+            
 
 def _sanitize_keywords(keywords):
     """Sanitizes keywords for file names and paths. Removes invalid characters like ':'. """
     keywords = (
         keywords.replace("filetype", "")
-        .replace(":", "")  # Remove colons
+        .replace(":", "")
         .replace('"', "'")
         .replace("site", "")
         .replace(" ", "_")
@@ -86,8 +88,8 @@ def _sanitize_keywords(keywords):
 @click.group(chain=True)
 def cli():
     """webscout CLI tool - Search the web with a rich UI."""
-    pass
-
+    console = Console()
+    console.print(f"[bold blue]{figlet_format('Webscout')}[/]\n", justify="center")
 
 def safe_entry_point():
     try:
@@ -100,7 +102,7 @@ def safe_entry_point():
 def version():
     """Shows the current version of webscout."""
     console = Console()
-    console.print(Panel(Text(f"webscout v{__version__}", style="cyan"), title="Version"))
+    console.print(Panel(Text(f"webscout v{__version__}", style="cyan"), title="Version", expand=False))
 
 
 @cli.command()
@@ -111,16 +113,15 @@ def chat(proxy):
     client = WEBS(proxy=proxy)
 
     console = Console()
-    console.print(Panel(Text("Available AI Models:", style="cyan"), title="DuckDuckGo AI Chat"))
-    for idx, model in enumerate(models, start=1):
-        console.print(f"{idx}. {model}")
-    chosen_model_idx = Prompt.ask("Choose a model by entering its number [1]", choices=[str(i) for i in range(1, len(models) + 1)], default="1")
+    console.print(Panel(Text("Available AI Models:", style="cyan"), title="DuckDuckGo AI Chat", expand=False))
+    console.print(Columns([Panel(Text(model, justify="center"), expand=True) for model in models]))
+    chosen_model_idx = Prompt.ask("[bold cyan]Choose a model by entering its number[/] [1]", choices=[str(i) for i in range(1, len(models) + 1)], default="1")
     chosen_model_idx = int(chosen_model_idx) - 1
     model = models[chosen_model_idx]
-    console.print(f"Using model: {model}")
+    console.print(f"[bold green]Using model:[/] {model}")
 
     while True:
-        user_input = input(f"{'-'*78}\nYou: ")
+        user_input = Prompt.ask(f"{'-'*78}\n[bold blue]You:[/]")
         if not user_input.strip():
             break
 
@@ -129,7 +130,7 @@ def chat(proxy):
         console.print(Panel(Text(f"AI: {text}", style="green"), title="AI Response"))
 
         if "exit" in user_input.lower() or "quit" in user_input.lower():
-            console.print(Panel(Text("Exiting chat session.", style="cyan"), title="Goodbye"))
+            console.print(Panel(Text("Exiting chat session.", style="cyan"), title="Goodbye", expand=False))
             break
 
 

webscout/utils.py

@@ -4,23 +4,33 @@ from html import unescape
 from math import atan2, cos, radians, sin, sqrt
 from typing import Any, Dict, List, Union
 from urllib.parse import unquote
-import orjson
 
 from .exceptions import WebscoutE
 
+try:
+    HAS_ORJSON = True
+    import orjson
+except ImportError:
+    HAS_ORJSON = False
+    import json
+
 REGEX_STRIP_TAGS = re.compile("<.*?>")
 
 
 def json_dumps(obj: Any) -> str:
     try:
-        return orjson.dumps(obj).decode("utf-8")
+        return (
+            orjson.dumps(obj, option=orjson.OPT_INDENT_2).decode()
+            if HAS_ORJSON
+            else json.dumps(obj, ensure_ascii=False, indent=2)
+        )
     except Exception as ex:
         raise WebscoutE(f"{type(ex).__name__}: {ex}") from ex
 
 
 def json_loads(obj: Union[str, bytes]) -> Any:
     try:
-        return orjson.loads(obj)
+        return orjson.loads(obj) if HAS_ORJSON else json.loads(obj)
     except Exception as ex:
         raise WebscoutE(f"{type(ex).__name__}: {ex}") from ex
 

webscout/voice.py

@@ -24,4 +24,11 @@ def play_audio(message: str, voice: str = "Brian") -> typing.Union[str, typing.N
         result = requests.get(url=url, headers=headers)
         return result.content
     except:
-        return None
+        return None
+
+if __name__ == "__main__":
+    # Example usage of the play_audio function
+    message = "Hello, world!"
+    voice = "Brian"
+    audio_result = play_audio(message, voice)
+    print(audio_result)

webscout/webai.py

@@ -37,11 +37,13 @@ from dotenv import load_dotenv
 import g4f
 import webscout
 import webscout.AIutel
+from pyfiglet import figlet_format
 
 init_colorama(autoreset=True)
 
 load_dotenv()  # loads .env variables
 
+console = Console()
 logging.basicConfig(
     format="%(asctime)s - %(levelname)s : %(message)s ",  
     datefmt="%H:%M:%S",
@@ -763,7 +765,20 @@ class Main(cmd.Cmd):
                     model=getOr(model, "Phind Model"),
                     quiet=quiet,
                 )
+            elif provider == "andi":
+                from webscout import AndiSearch
 
+                self.bot = AndiSearch(
+                    is_conversation=disable_conversation,
+                    max_tokens=max_tokens,
+                    timeout=timeout,
+                    intro=intro,
+                    filepath=filepath,
+                    update_file=update_file,
+                    proxies=proxies,
+                    history_offset=history_offset,
+                    act=awesome_prompt,
+                )
             elif provider == "blackboxai":
 
                 from webscout import BLACKBOXAI
@@ -2606,6 +2621,7 @@ def make_commands():
 # @this.handle_exception
 def main(*args):
     """Fireup console programmically"""
+    console.print(f"[bold green]{figlet_format('WebAI')}[/]\n", justify="center")
     sys.argv += list(args)
     args = sys.argv
     if len(args) == 1:

webscout/webscout_search.py

@@ -5,11 +5,14 @@ from datetime import datetime, timezone
 from decimal import Decimal
 from functools import cached_property
 from itertools import cycle, islice
+from random import choice
 from threading import Event
 from types import TracebackType
 from typing import Dict, List, Optional, Tuple, Type, Union, cast
 
-import pyreqwest_impersonate as pri  # type: ignore
+import pyreqwest_impersonate as pri
+
+from .utils import _calculate_distance, _extract_vqd, _normalize, _normalize_url, _text_extract_json, json_loads  # type: ignore
 
 try:
     from lxml.etree import _Element
@@ -20,15 +23,8 @@ try:
 except ImportError:
     LXML_AVAILABLE = False
 
-from .exceptions import WebscoutE, RatelimitE, TimeoutE
-from .utils import (
-    _calculate_distance,
-    _extract_vqd,
-    _normalize,
-    _normalize_url,
-    _text_extract_json,
-    json_loads,
-)
+from .exceptions import *
+
 
 logger = logging.getLogger("webscout.WEBS")
 
@@ -37,6 +33,15 @@ class WEBS:
     """webscout class to get search results from duckduckgo.com."""
 
     _executor: ThreadPoolExecutor = ThreadPoolExecutor()
+    _impersonates = (
+        "chrome_99", "chrome_100", "chrome_101", "chrome_104", "chrome_105", "chrome_106", "chrome_108", 
+        "chrome_107", "chrome_109", "chrome_114", "chrome_116", "chrome_117", "chrome_118", "chrome_119", 
+        "chrome_120", #"chrome_123", "chrome_124", "chrome_126",
+        "safari_ios_16.5", "safari_ios_17.2", "safari_ios_17.4.1", "safari_15.3", "safari_15.5", 
+        "safari_15.6.1", "safari_16", "safari_16.5", "safari_17.2.1", "safari_17.4.1", "safari_17.5",
+        #"okhttp_3.9", "okhttp_3.11", "okhttp_3.13", "okhttp_3.14", "okhttp_4.9", "okhttp_4.10", "okhttp_5",
+        "edge_99", "edge_101", "edge_122",
+    )  # fmt: skip
 
     def __init__(
         self,
@@ -66,7 +71,7 @@ class WEBS:
             timeout=timeout,
             cookie_store=True,
             referer=True,
-            impersonate="chrome_124",
+            impersonate=choice(self._impersonates),
             follow_redirects=False,
             verify=False,
         )
@@ -120,13 +125,14 @@ class WEBS:
         resp_content = self._get_url("POST", "https://duckduckgo.com", data={"q": keywords})
         return _extract_vqd(resp_content, keywords)
 
-    def chat(self, keywords: str, model: str = "gpt-3.5") -> str:
+    def chat(self, keywords: str, model: str = "gpt-3.5", timeout: int = 20) -> str:
         """Initiates a chat session with DuckDuckGo AI.
 
         Args:
             keywords (str): The initial message or question to send to the AI.
             model (str): The model to use: "gpt-3.5", "claude-3-haiku", "llama-3-70b", "mixtral-8x7b".
                 Defaults to "gpt-3.5".
+            timeout (int): Timeout value for the HTTP client. Defaults to 20.
 
         Returns:
             str: The response from the AI.
@@ -136,6 +142,7 @@ class WEBS:
             "gpt-3.5": "gpt-3.5-turbo-0125",
             "llama-3-70b": "meta-llama/Llama-3-70b-chat-hf",
             "mixtral-8x7b": "mistralai/Mixtral-8x7B-Instruct-v0.1",
+            "gpt-4o-mini": "gpt-4o-mini",
         }
         # vqd
         if not self._chat_vqd:
@@ -149,18 +156,16 @@ class WEBS:
             "messages": self._chat_messages,
         }
         resp = self.client.post(
-            "https://duckduckgo.com/duckchat/v1/chat", headers={"x-vqd-4": self._chat_vqd}, json=json_data
+            "https://duckduckgo.com/duckchat/v1/chat",
+            headers={"x-vqd-4": self._chat_vqd},
+            json=json_data,
+            timeout=timeout,
         )
         self._chat_vqd = resp.headers.get("x-vqd-4", "")
 
-        messages = []
-        for line in resp.text.replace("data: ", "").replace("[DONE]", "").split("\n\n"):
-            x = line.strip()
-            if x:
-                j = json_loads(x)
-                message = j.get("message", "")
-                messages.append(message)
-        result = "".join(messages)
+        data = ",".join(x for line in resp.text.rstrip("[DONE]\n").split("data:") if (x := line.strip()))
+        result = "".join(x.get("message", "") for x in json_loads("[" + data + "]"))
+
         self._chat_messages.append({"role": "assistant", "content": result})
         return result
 
@@ -347,7 +352,7 @@ class WEBS:
             for e in elements:
                 if isinstance(e, _Element):
                     hrefxpath = e.xpath("./a/@href")
-                    href = str(hrefxpath[0]) if isinstance(hrefxpath, List) else None
+                    href = str(hrefxpath[0]) if hrefxpath and isinstance(hrefxpath, List) else None
                     if (
                         href
                         and href not in cache
@@ -357,9 +362,9 @@ class WEBS:
                     ):
                         cache.add(href)
                         titlexpath = e.xpath("./h2/a/text()")
-                        title = str(titlexpath[0]) if isinstance(titlexpath, List) else ""
+                        title = str(titlexpath[0]) if titlexpath and isinstance(titlexpath, List) else ""
                         bodyxpath = e.xpath("./a//text()")
-                        body = "".join(str(x) for x in bodyxpath) if isinstance(bodyxpath, List) else ""
+                        body = "".join(str(x) for x in bodyxpath) if bodyxpath and isinstance(bodyxpath, List) else ""
                         result = {
                             "title": _normalize(title),
                             "href": _normalize_url(href),
@@ -449,10 +454,14 @@ class WEBS:
                         else:
                             cache.add(href)
                             titlexpath = e.xpath(".//a//text()")
-                            title = str(titlexpath[0]) if isinstance(titlexpath, List) else ""
+                            title = str(titlexpath[0]) if titlexpath and isinstance(titlexpath, List) else ""
                     elif i == 2:
                         bodyxpath = e.xpath(".//td[@class='result-snippet']//text()")
-                        body = "".join(str(x) for x in bodyxpath) if isinstance(bodyxpath, List) else ""
+                        body = (
+                            "".join(str(x) for x in bodyxpath).strip()
+                            if bodyxpath and isinstance(bodyxpath, List)
+                            else ""
+                        )
                         if href:
                             result = {
                                 "title": _normalize(title),