webscout 4.0__py3-none-any.whl → 4.1__py3-none-any.whl

webscout/AIauto.py

@@ -1,29 +1,33 @@
 from webscout.AIbase import Provider, AsyncProvider
-from webscout import OPENGPT, AsyncOPENGPT
-from webscout import KOBOLDAI, AsyncKOBOLDAI
-from webscout import PhindSearch, AsyncPhindSearch
-from webscout import LLAMA2, AsyncLLAMA2
-from webscout import BLACKBOXAI, AsyncBLACKBOXAI
-from webscout import PERPLEXITY
-from webscout import ThinkAnyAI
-from webscout import YouChat
-from webscout import YEPCHAT
-from webscout.AIbase import Provider, AsyncProvider
-from webscout import KOBOLDAI, AsyncKOBOLDAI
-from webscout import PhindSearch, AsyncPhindSearch
-from webscout import LLAMA2, AsyncLLAMA2
-from webscout import BLACKBOXAI, AsyncBLACKBOXAI
-from webscout import PERPLEXITY
-from webscout import ThinkAnyAI
-from webscout import YouChat
-from webscout import YEPCHAT, AsyncYEPCHAT
-from webscout import LEO, AsyncLEO
-from webscout import GROQ, AsyncGROQ
-from webscout import OPENAI, AsyncOPENAI
-from webscout import REKA
-from webscout import Xjai
-from webscout import Berlin4h
-from webscout import ChatGPTUK
+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.Leo import LEO
+from webscout.Provider.Leo import AsyncLEO
+from webscout.Provider.Koboldai import KOBOLDAI
+from webscout.Provider.Koboldai import AsyncKOBOLDAI
+from webscout.Provider.OpenGPT import OPENGPT
+from webscout.Provider.OpenGPT import OPENGPTv2
+from webscout.Provider.OpenGPT import AsyncOPENGPT
+from webscout.Provider.Perplexity import PERPLEXITY
+from webscout.Provider.Blackboxai import BLACKBOXAI
+from webscout.Provider.Blackboxai import AsyncBLACKBOXAI
+from webscout.Provider.Phind import PhindSearch
+from webscout.Provider.Phind import AsyncPhindSearch
+from webscout.Provider.Phind import Phindv2
+from webscout.Provider.Phind import AsyncPhindv2
+from webscout.Provider.Yepchat import YEPCHAT
+from webscout.Provider.Yepchat import AsyncYEPCHAT
+from webscout.Provider.Berlin4h import Berlin4h
+from webscout.Provider.ChatGPTUK import ChatGPTUK
+from webscout.Provider.Poe import POE
+from webscout.Provider.BasedGPT import BasedGPT
+from webscout.Provider.Deepseek import DeepSeek
+from webscout.Provider.Deepinfra import DeepInfra, VLM, AsyncDeepInfra
+from webscout.Provider.VTLchat import VTLchat
+from webscout.Provider.Geminipro import GEMINIPRO
+from webscout.Provider.Geminiflash import GEMINIFLASH
 from webscout.g4f import GPT4FREE, AsyncGPT4FREE
 from webscout.g4f import TestProviders
 from webscout.exceptions import AllProvidersFailure
@@ -36,43 +40,56 @@ import logging
 
 
 provider_map: dict[
-    str, Union[    ThinkAnyAI,
-    Xjai,
-    LLAMA2,
-    AsyncLLAMA2,
-    LEO,
-    AsyncLEO,
-    KOBOLDAI,
-    AsyncKOBOLDAI,
-    OPENGPT,
-    AsyncOPENGPT,
-    PERPLEXITY,
-    BLACKBOXAI,
-    AsyncBLACKBOXAI,
-    PhindSearch,
-    AsyncPhindSearch,
-    YEPCHAT,
-    AsyncYEPCHAT,
-    YouChat,
-    Berlin4h,
-    ChatGPTUK,]
+    str,
+    Union[
+        ThinkAnyAI,
+        Xjai,
+        LLAMA2,
+        LEO,
+        KOBOLDAI,
+        OPENGPT,
+        OPENGPTv2,
+        PERPLEXITY,
+        BLACKBOXAI,
+        PhindSearch,
+        Phindv2,
+        YEPCHAT,
+        Berlin4h,
+        ChatGPTUK,
+        POE,
+        BasedGPT,
+        DeepSeek,
+        DeepInfra,
+        VLM,
+        VTLchat,
+        GEMINIPRO,
+        GEMINIFLASH,
+        GPT4FREE,
+    ],
 ] = {
+    "ThinkAnyAI": ThinkAnyAI,
+    "Xjai": Xjai,
+    "LLAMA2": LLAMA2,
+    "LEO": LEO,
+    "KOBOLDAI": KOBOLDAI,
+    "OPENGPT": OPENGPT,
+    "OPENGPTv2": OPENGPTv2,
+    "PERPLEXITY": PERPLEXITY,
+    "BLACKBOXAI": BLACKBOXAI,
     "PhindSearch": PhindSearch,
-    "perplexity": PERPLEXITY,
-    "opengpt": OPENGPT,
-    "koboldai": KOBOLDAI,
-    "llama2": LLAMA2,
-    "blackboxai": BLACKBOXAI,
-    "gpt4free": GPT4FREE,
-    "thinkany": ThinkAnyAI,
-    "yepchat": YEPCHAT,
-    "you": YouChat,
-    "leo": LEO,
-    "xjai": Xjai,
-    "berlin4h": Berlin4h,
-    "chatgptuk": ChatGPTUK,
+    "Phindv2": Phindv2,
+    "YEPCHAT": YEPCHAT,
+    "Berlin4h": Berlin4h,
+    "ChatGPTUK": ChatGPTUK,
+    "POE": POE,
+    "BasedGPT": BasedGPT,
+    "DeepSeek": DeepSeek,
+    "DeepInfra": DeepInfra,
+    "VLM": VLM,
+    "VTLchat": VTLchat,
+    "GEMINIPRO": GEMINIPRO,
+    "GEMINIFLASH": GEMINIFLASH,
     "gpt4free": GPT4FREE,
-    
 }
 
 
@@ -104,7 +121,31 @@ class AUTO(Provider):
             act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
             exclude(list[str], optional): List of providers to be excluded. Defaults to [].
         """
-        self.provider: Union[OPENGPT, KOBOLDAI, PhindSearch, LLAMA2, BLACKBOXAI, PERPLEXITY, GPT4FREE, ThinkAnyAI, YEPCHAT, YouChat] = None
+        self.provider: Union[
+            ThinkAnyAI,
+            Xjai,
+            LLAMA2,
+            LEO,
+            KOBOLDAI,
+            OPENGPT,
+            OPENGPTv2,
+            PERPLEXITY,
+            BLACKBOXAI,
+            PhindSearch,
+            Phindv2,
+            YEPCHAT,
+            Berlin4h,
+            ChatGPTUK,
+            POE,
+            BasedGPT,
+            DeepSeek,
+            DeepInfra,
+            VLM,
+            VTLchat,
+            GEMINIPRO,
+            GEMINIFLASH,
+            GPT4FREE,
+        ] = None
         self.provider_name: str = None
         self.is_conversation = is_conversation
         self.max_tokens = max_tokens
@@ -315,6 +356,30 @@ class AsyncAUTO(AsyncProvider):
             AsyncLLAMA2,
             AsyncBLACKBOXAI,
             AsyncGPT4FREE,
+            AsyncLEO,
+            ThinkAnyAI,
+            Xjai,
+            LLAMA2,
+            LEO,
+            KOBOLDAI,
+            OPENGPT,
+            OPENGPTv2,
+            PERPLEXITY,
+            BLACKBOXAI,
+            PhindSearch,
+            Phindv2,
+            YEPCHAT,
+            Berlin4h,
+            ChatGPTUK,
+            POE,
+            BasedGPT,
+            DeepSeek,
+            DeepInfra,
+            VLM,
+            VTLchat,
+            GEMINIPRO,
+            GEMINIFLASH,
+            GPT4FREE
         ] = None
         self.provider_name: str = None
         self.is_conversation = is_conversation
@@ -490,4 +555,4 @@ class AsyncAUTO(AsyncProvider):
             str: Message extracted
         """
         assert self.provider is not None, "Chat with AI first"
-        return await self.provider.get_message(response)
+        return await self.provider.get_message(response)

webscout/AIutel.py

@@ -196,7 +196,7 @@ class Conversation:
         """
         self.status = status
         self.max_tokens_to_sample = max_tokens
-        self.chat_history = self.intro
+        self.chat_history = ""
         self.history_format = "\nUser : %(user)s\nLLM :%(llm)s"
         self.file = filepath
         self.update_file = update_file
@@ -219,19 +219,20 @@ 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", encoding='utf-8') as fh:  # Try creating new file
+            with open(filepath, "w") as fh:  # Try creating new file
                 # lets add intro here
                 fh.write(self.intro)
         else:
             logging.debug(f"Loading conversation from '{filepath}'")
-            with open(filepath, encoding='utf-8') as fh:
-                file_contents = fh.read()
-                # Presume intro prompt is part of the file content
-                self.chat_history = file_contents
+            with open(filepath) as fh:
+                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) -> str:
+    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(self.intro)
+        len_of_intro = len(intro)
         len_of_chat_history = len(chat_history)
         total = (
             self.max_tokens_to_sample + len_of_intro + len_of_chat_history
@@ -239,25 +240,28 @@ class Conversation:
         if total > self.history_offset:
             truncate_at = (total - self.history_offset) + self.prompt_allowance
             # Remove head of total (n) of chat_history
-            new_chat_history = chat_history[truncate_at:]
-            self.chat_history = self.intro + "\n... " + new_chat_history
+            trimmed_chat_history = chat_history[truncate_at:]
+            return "... " + trimmed_chat_history
             # print(len(self.chat_history))
-            return self.chat_history
-        # print(len(chat_history))
-        return chat_history
+        else:
+            return chat_history
 
-    def gen_complete_prompt(self, prompt: str) -> str:
+    def gen_complete_prompt(self, prompt: str, intro: str = None) -> str:
         """Generates a kinda like incomplete conversation
 
         Args:
-            prompt (str): _description_
+            prompt (str): Chat prompt
+            intro (str): Override class' intro. Defaults to None.
 
         Returns:
             str: Updated incomplete chat_history
         """
         if self.status:
-            resp = self.chat_history + self.history_format % dict(user=prompt, llm="")
-            return self.__trim_chat_history(resp)
+            intro = self.intro if intro is None else intro
+            incomplete_chat_history = self.chat_history + self.history_format % dict(
+                user=prompt, llm=""
+            )
+            return intro + self.__trim_chat_history(incomplete_chat_history, intro)
 
         return prompt
 
@@ -275,11 +279,16 @@ class Conversation:
             return
         new_history = self.history_format % dict(user=prompt, llm=response)
         if self.file and self.update_file:
-            with open(self.file, "a", encoding='utf-8') as fh:
-                fh.write(new_history)
+            if os.path.exists(self.file):
+                with open(self.file, "w") as fh:
+                    fh.write(self.intro + "\n" + new_history)
+            else:
+                with open(self.file, "a") as fh:
+                    fh.write(new_history)
         self.chat_history += new_history
 
 
+
 class AwesomePrompts:
     awesome_prompt_url = (
         "https://raw.githubusercontent.com/OE-LUCIFER/prompts/main/prompt.json"

webscout/Local/_version.py

@@ -1,3 +1,3 @@
 from llama_cpp import __version__ as __llama_cpp_version__
 
-__version__ = '4.0'
+__version__ = '4.1'

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "4.0"
+__version__ = "4.1"
 __prog__ = "webscout"

{webscout-4.0.dist-info → webscout-4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.0
+Version: 4.1
 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

{webscout-4.0.dist-info → webscout-4.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-webscout/AIauto.py,sha256=xPGr_Z0h27XXNh4Wiufjn9TksDOqxqlaGcLUYKNP55w,18246
+webscout/AIauto.py,sha256=DycblRfFsQiLJVeP1sRQ0C-eNX7iO3a_y1wt8wChM8Y,20005
 webscout/AIbase.py,sha256=GoHbN8r0gq2saYRZv6LA-Fr9Jlcjv80STKFXUq2ZeGU,4710
-webscout/AIutel.py,sha256=akfyVlJnIdo8jf8c1vzKDITtNdwAJHFqC5bEVGh7554,33597
+webscout/AIutel.py,sha256=RIS66j1QP_7zCL7o0uCBbz0A20yunH4onTtTHkkIN-k,33959
 webscout/DWEBS.py,sha256=QLuT1IKu0lnwdl7W6c-ctBAO7Jj0Zk3PYm6-13BC7rU,25740
 webscout/LLM.py,sha256=LbGCZdJf8A5dwfoGS4tyy39tAh5BDdhMZP0ScKaaQfU,4184
 webscout/YTdownloader.py,sha256=uWpUWnw9pxeEGw9KJ_3XDyQ5gd38gH1dJpr-HJo4vzU,39144
@@ -14,7 +14,7 @@ webscout/models.py,sha256=5iQIdtedT18YuTZ3npoG7kLMwcrKwhQ7928dl_7qZW0,692
 webscout/tempid.py,sha256=5oc3UbXhPGKxrMRTfRABT-V-dNzH_hOKWtLYM6iCWd4,5896
 webscout/transcriber.py,sha256=EddvTSq7dPJ42V3pQVnGuEiYQ7WjJ9uyeR9kMSxN7uY,20622
 webscout/utils.py,sha256=CxeXvp0rWIulUrEaPZMaNfg_tSuQLRSV8uuHA2chyKE,2603
-webscout/version.py,sha256=C0IzPbZ-mJMLVhRlP1RJVlkEwxd4laWg3poOFNNmh3c,44
+webscout/version.py,sha256=2jE62l770oovuLzelP3RWCvIn45U-DuZHeNGLvMIszs,44
 webscout/voice.py,sha256=0QjXTHAQmCK07IDZXRc7JXem47cnPJH7u3X0sVP1-UQ,967
 webscout/webai.py,sha256=4_v28Tg25N71utqg34hFd0vF4zK1lEtaMXj-5H6hw1o,88311
 webscout/webscout_search.py,sha256=lFAot1-Qil_YfXieeLakDVDEX8Ckcima4ueXdOYwiMc,42804
@@ -26,7 +26,7 @@ webscout/Extra/gguf.py,sha256=5zTNE5HxM_VQ5ONoocL8GG5fRXrgyLdEEjNzndG0oUw,7811
 webscout/Extra/weather.py,sha256=ocGwJYp5B9FwVWvIZ9wtoJTQsPFt64Vt8TitxJcdvAU,1687
 webscout/Extra/weather_ascii.py,sha256=sy6EEh2kN1CO1hKda8chD-mVCxH4p0NHyP7Uxr0-rgo,630
 webscout/Local/__init__.py,sha256=RN6klpbabPGNX2YzPm_hdeUcQvieUwvJt22uAO2RKSM,238
-webscout/Local/_version.py,sha256=VW47MxDM1blUtu1nHY5hCRS7k5A8iiOHmFV2vAj8YXU,83
+webscout/Local/_version.py,sha256=cDatVldm_Tvfl9Vo4E6_GueNJoFGOBH6PA42hSdBFUA,83
 webscout/Local/formats.py,sha256=BiZZSoN3e8S6-S-ykBL9ogSUs0vK11GaZ3ghc9U8GRk,18994
 webscout/Local/model.py,sha256=T_bzNNrxEyOyLyhp6fKwiuVBBkXC2a37LzJVCxFIxOU,30710
 webscout/Local/rawdog.py,sha256=ojY_O8Vb1KvR34OwWdfLgllgaAK_7HMf64ElMATvCXs,36689
@@ -59,9 +59,9 @@ webscout/Provider/Xjai.py,sha256=BIlk2ouz9Kh_0Gg9hPvTqhI7XtcmWdg5vHSX_4uGrIs,903
 webscout/Provider/Yepchat.py,sha256=2Eit-A7w1ph1GQKNQuur_yaDzI64r0yBGxCIjDefJxQ,19875
 webscout/Provider/Youchat.py,sha256=fhMpt94pIPE_XDbC4z9xyfgA7NbkNE2wlRFJabsjv90,8069
 webscout/Provider/__init__.py,sha256=nFRM7vno2a7y2lG-7mDXvzytI8irb_loC0BPGZtrh7w,1923
-webscout-4.0.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
-webscout-4.0.dist-info/METADATA,sha256=-9kFMI8TSAnp-wZ3nUI0_eVbyDmRbnO_Dzetn2P10qw,56855
-webscout-4.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-webscout-4.0.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
-webscout-4.0.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
-webscout-4.0.dist-info/RECORD,,
+webscout-4.1.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
+webscout-4.1.dist-info/METADATA,sha256=a7qUaB7wlic1oP1ZEIX0p6BTJRpJvRbUqLv3QNgdgSo,56855
+webscout-4.1.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+webscout-4.1.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
+webscout-4.1.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
+webscout-4.1.dist-info/RECORD,,