webscout 3.9__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/Extra/__init__.py

@@ -1,2 +1,4 @@
 from .gguf import *
-from .autollama import *
+from .autollama import *
+from .weather import *
+from .weather_ascii import *

webscout/Extra/weather.py

@@ -0,0 +1,49 @@
+import requests
+
+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"
+    
+    response = requests.get(url)
+
+    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):
+        print(weather_data)
+        return
+
+    current = weather_data['current_condition'][0]
+    location_name = weather_data['nearest_area'][0]['areaName'][0]['value']
+
+    print(f"Weather in {location_name}:")
+    print(f"Temperature: {current['temp_C']}°C / {current['temp_F']}°F")
+    print(f"Condition: {current['weatherDesc'][0]['value']}")
+    print(f"Humidity: {current['humidity']}%")
+    print(f"Wind: {current['windspeedKmph']} km/h, {current['winddir16Point']}")
+
+
+    print("\nForecast:")
+    for day in weather_data['weather']:
+        date = day['date']
+        max_temp = day['maxtempC']
+        min_temp = day['mintempC']
+        desc = day['hourly'][4]['weatherDesc'][0]['value'] 
+        print(f"{date}: {min_temp}°C to {max_temp}°C, {desc}")

webscout/Extra/weather_ascii.py

@@ -0,0 +1,18 @@
+import requests
+
+def get(location):
+    """Fetches ASCII art weather data for the given location.
+    Args:
+        location (str): The location for which to fetch weather data.
+
+    Returns:
+        str: ASCII art weather report if the request is successful,
+             otherwise an error message.
+    """
+    url = f"https://wttr.in/{location}"
+    response = requests.get(url, headers={'User-Agent': 'curl'}) 
+
+    if response.status_code == 200:
+        return "\n".join(response.text.splitlines()[:-1]) 
+    else:
+        return f"Error: Unable to fetch weather data. Status code: {response.status_code}"

webscout/Local/_version.py

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