webscout 4.2__tar.gz → 4.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.2
+Version: 4.3
 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
@@ -1472,6 +1472,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.3}/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.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="webscout",
-    version="4.2",
+    version="4.3",
     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",

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

@@ -1,8 +1,8 @@
 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 LLAMA2
+from webscout.Provider.Llama import AsyncLLAMA2
 from webscout.Provider.Leo import LEO
 from webscout.Provider.Leo import AsyncLEO
 from webscout.Provider.Koboldai import KOBOLDAI

{webscout-4.2 → webscout-4.3}/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.3}/webscout/Local/_version.py

@@ -1,3 +1,3 @@
 from llama_cpp import __version__ as __llama_cpp_version__
 
-__version__ = '4.2'
+__version__ = '4.3'

webscout-4.3/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-4.3/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-4.2 → webscout-4.3}/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-4.2 → webscout-4.3}/webscout/__init__.py

@@ -6,7 +6,7 @@ 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 *
 import g4f

{webscout-4.2 → webscout-4.3}/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-4.2 → webscout-4.3}/webscout/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.2
+Version: 4.3
 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
@@ -1472,6 +1472,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.3}/webscout.egg-info/SOURCES.txt

@@ -49,13 +49,14 @@ webscout/Provider/ChatGPTUK.py
 webscout/Provider/Cohere.py
 webscout/Provider/Deepinfra.py
 webscout/Provider/Deepseek.py
+webscout/Provider/FreeGemini.py
 webscout/Provider/Gemini.py
 webscout/Provider/Geminiflash.py
 webscout/Provider/Geminipro.py
 webscout/Provider/Groq.py
 webscout/Provider/Koboldai.py
 webscout/Provider/Leo.py
-webscout/Provider/Llama2.py
+webscout/Provider/Llama.py
 webscout/Provider/OLLAMA.py
 webscout/Provider/OpenGPT.py
 webscout/Provider/Openai.py