webscout 4.2__py3-none-any.whl → 4.4__py3-none-any.whl

webscout/Provider/FreeGemini.py

@@ -0,0 +1,169 @@
+import time
+import uuid
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+import click
+import requests
+from requests import get
+from uuid import uuid4
+from re import findall
+from requests.exceptions import RequestException
+from curl_cffi.requests import get, RequestsError
+import g4f
+from random import randint
+from PIL import Image
+import io
+import re
+import json
+import yaml
+from ..AIutel import Optimizers
+from ..AIutel import Conversation
+from ..AIutel import AwesomePrompts, sanitize_stream
+from ..AIbase import Provider, AsyncProvider
+from webscout import exceptions
+from typing import Any, AsyncGenerator, Dict
+import logging
+import httpx
+
+class FreeGemini(Provider):
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 60,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+    ):
+        """Instantiates FreeGemini
+
+        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.
+            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 {}.
+            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.
+        """
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.chat_endpoint = "https://api.safone.dev/bard"
+        self.timeout = timeout
+        self.last_response = {}
+
+        self.headers = {
+            "accept": "application/json",
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+        }
+
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        self.session.headers.update(self.headers)
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            if act
+            else intro or Conversation.intro
+        )
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+        self.session.proxies = proxies
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> dict:
+        """Chat with AI
+
+        Args:
+            prompt (str): Prompt to be send.
+            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.
+            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+        """
+        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
+                )
+            else:
+                raise Exception(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+        self.session.headers.update(self.headers)
+        payload = {"message": conversation_prompt}
+
+        response = self.session.post(
+            self.chat_endpoint, json=payload, timeout=self.timeout
+        )
+
+        if not response.ok:
+            raise exceptions.FailedToGenerateResponseError(
+                f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+            )
+
+        resp = response.json()
+        message_load = self.get_message(resp)
+        self.conversation.update_chat_history(
+            prompt, message_load
+        )
+        return resp
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> str:
+        """Generate response `str`
+        Args:
+            prompt (str): Prompt to be send.
+            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
+        """
+        return self.get_message(
+            self.ask(
+                prompt,
+                optimizer=optimizer,
+                conversationally=conversationally,
+            )
+        )
+
+    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["message"]

webscout/Provider/Llama.py

@@ -0,0 +1,211 @@
+import time
+import uuid
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+import click
+import requests
+from requests import get
+from uuid import uuid4
+from re import findall
+from requests.exceptions import RequestException
+from curl_cffi.requests import get, RequestsError
+import g4f
+from random import randint
+from PIL import Image
+import io
+import re
+import json
+import yaml
+from ..AIutel import Optimizers
+from ..AIutel import Conversation
+from ..AIutel import AwesomePrompts, sanitize_stream
+from ..AIbase import Provider, AsyncProvider
+from webscout import exceptions
+from typing import Any, AsyncGenerator, Dict
+import logging
+import httpx
+
+class LLAMA(Provider):
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+    ):
+        """Instantiates LLAMA
+
+        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.
+            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 {}.
+            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): LLM model name. Defaults to "llama3-70b-8192".
+        """
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.timeout = timeout
+        self.last_response = {}
+        self.model = "llama3-70b-8192",
+        self.api_endpoint = "https://api.safone.dev/llama"
+        self.headers = {
+            "accept": "application/json",
+        }
+
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            if act
+            else intro or Conversation.intro
+        )
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+        self.session = requests.Session()
+        self.session.proxies = proxies
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> dict | AsyncGenerator:
+        """Chat with AI
+
+        Args:
+            prompt (str): Prompt to be send.
+            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.
+            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+        Returns:
+           dict|AsyncGenerator : ai content
+        ```json
+        {
+           "text" : "print('How may I help you today?')"
+        }
+        ```
+        """
+        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
+                )
+            else:
+                raise Exception(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+        
+        self.session.headers.update(self.headers)
+        payload = {
+            "message": conversation_prompt
+        }
+
+        def for_stream():
+            response = self.session.get(
+                self.api_endpoint, params=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}"
+                )
+            
+            message_load = ""
+            for chunk in response.iter_lines():
+                try:
+                    resp = json.loads(chunk)
+                    message_load += resp['message']
+                    yield chunk if raw else dict(text=message_load)
+                    self.last_response.update(resp)
+                except:
+                    pass
+            self.conversation.update_chat_history(
+                prompt, self.get_message(self.last_response)
+            )
+
+        def for_non_stream():
+            response = self.session.get(
+                self.api_endpoint, params=payload, stream=False, timeout=self.timeout
+            )
+            if not response.ok:
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+                )
+            resp = response.json()
+            self.last_response.update(resp)
+            self.conversation.update_chat_history(
+                prompt, self.get_message(self.last_response)
+            )
+            return resp
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> str | AsyncGenerator:
+        """Generate response `str`
+        Args:
+            prompt (str): Prompt to be send.
+            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
+        """
+
+        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
+
+        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["message"]

webscout/Provider/__init__.py

@@ -2,8 +2,7 @@
 
 from .ThinkAnyAI import ThinkAnyAI
 from .Xjai import Xjai
-from .Llama2 import LLAMA2
-from .Llama2 import AsyncLLAMA2
+from .Llama import LLAMA
 from .Cohere import Cohere
 from .Reka import REKA
 from .Groq import GROQ
@@ -38,11 +37,11 @@ from .VTLchat import VTLchat
 from .Geminipro import GEMINIPRO
 from .Geminiflash import GEMINIFLASH
 from .OLLAMA import OLLAMA
+from .FreeGemini import FreeGemini
 __all__ = [
     'ThinkAnyAI',
     'Xjai',
-    'LLAMA2', 
-    'AsyncLLAMA2',
+    'LLAMA', 
     'Cohere',
     'REKA',
     'GROQ',
@@ -78,7 +77,8 @@ __all__ = [
     'OPENGPTv2',
     'GEMINIPRO',
     'GEMINIFLASH',
-    'OLLAMA'
+    'OLLAMA',
+    'FreeGemini'
 
 
 ]

webscout/__init__.py

@@ -5,16 +5,16 @@ from .DWEBS import *
 from .transcriber import transcriber
 from .voice import play_audio
 from .websx_search import WEBSX
-
-from .LLM import LLM
+from .LLM import VLM, LLM
 from .YTdownloader import *
-# from .Local import *
+from .GoogleS import *
 import g4f
 from .YTdownloader import *
 from .Provider import *
 from .Extra import gguf
 from .Extra import autollama
 from .Extra import weather_ascii, weather
+
 __repo__ = "https://github.com/OE-LUCIFER/Webscout"
 
 webai = [
@@ -58,12 +58,15 @@ __all__ = [
    "WEBS",
    "AsyncWEBS",
    "__version__",
-   "DeepWEBS",
+   "DWEBS",
    "transcriber",
    "play_audio",
    "TempMailClient", 
    "TemporaryPhoneNumber",
    "LLM",
+   "YTdownloader",
+   "WEBSX",
+   "VLM",
    # Localai models and utilities 
    # "Model",
    # "Thread",

webscout/async_providers.py

@@ -2,7 +2,6 @@ from webscout import AsyncPhindSearch
 from webscout import AsyncYEPCHAT
 from webscout import AsyncOPENGPT
 from webscout import AsyncOPENAI
-from webscout import AsyncLLAMA2
 from webscout import AsyncLEO
 from webscout import AsyncKOBOLDAI
 from webscout import AsyncGROQ
@@ -15,7 +14,6 @@ mapper: dict[str, object] = {
     "koboldai": AsyncKOBOLDAI,
     "blackboxai": AsyncBLACKBOXAI,
     "gpt4free": AsyncGPT4FREE,
-    "llama2": AsyncLLAMA2,
     "yepchat": AsyncYEPCHAT,
     "leo": AsyncLEO,
     "groq": AsyncGROQ,

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/version.py

@@ -1,2 +1,2 @@
-__version__ = "4.2"
+__version__ = "4.3"
 __prog__ = "webscout"

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",
@@ -2606,6 +2608,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: