webscout 1.3.0__tar.gz → 1.3.1__tar.gz

{webscout-1.3.0 → webscout-1.3.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 1.3.0
-Summary: Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models and now can transcribe yt videos
+Version: 1.3.1
+Summary: Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models, can transcribe yt videos and have TTS support
 Author: OEvortex
 Author-email: helpingai5@gmail.com
 License: HelpingAI Simplified Universal License
@@ -99,6 +99,7 @@ Search for words, documents, images, videos, news, maps and text translation usi
     - [9. `KOBOLDIA` -](#9-koboldia--)
   - [usage of special .LLM file from webscout (webscout.LLM)](#usage-of-special-llm-file-from-webscout-webscoutllm)
     - [`LLM`](#llm)
+    - [`LLM` with internet](#llm-with-internet)
 
 ## Install
 ```python
@@ -704,11 +705,102 @@ print(message)
 ```python
 from webscout.LLM import LLM
 
-def chat(model_name, system_message="You are Jarvis"):# system prompt
-    AI = LLM(model_name, system_message)
-    AI.chat()
+# Read the system message from the file
+with open('system.txt', 'r') as file:
+    system_message = file.read()
+
+# Initialize the LLM class with the model name and system message
+llm = LLM(model="microsoft/WizardLM-2-8x22B", system_message=system_message)
+
+while True:
+    # Get the user input
+    user_input = input("User: ")
+
+    # Define the messages to be sent
+    messages = [
+        {"role": "user", "content": user_input}
+    ]
+
+    # Use the mistral_chat method to get the response
+    response = llm.chat(messages)
+
+    # Print the response
+    print("AI: ", response)
+```
+### `LLM` with internet
+```python
+from __future__ import annotations
+from typing import List, Optional
+
+from webscout import LLM
+from webscout import WEBS
+import warnings
+
+system_message: str = (
+    "As AI, you possess internet access and are capable of executing real-time web searches based on user inputs. "
+    "You shall utilize this capability to enrich conversations, offer informed insights, and augment your ability to "
+    "respond accurately and thoroughly. However, refrain from stating 'You have provided a list of strings,' ensuring "
+    "seamless interactions with users. Embrace a responsive demeanor, harnessing available online resources to address "
+    "queries, share pertinent content, and facilitate meaningful exchanges. By doing so, you create value through "
+    "connection and engagement, ultimately enhancing overall user satisfaction and experience. Additionally, "
+    "continue upholding the principles of respect, impartiality, and intellectual integrity throughout all interactions."
+)
+
+# Ignore the specific UserWarning
+warnings.filterwarnings("ignore", category=UserWarning, module="curl_cffi.aio", lineno=205)
+LLM = LLM(model="meta-llama/Meta-Llama-3-70B-Instruct", system_message=system_message)
+
+
+def chat(
+    user_input: str, webs: WEBS, max_results: int = 10
+) -> Optional[str]:
+    """
+    Chat function to perform a web search based on the user input and generate a response using the LLM model.
+
+    Parameters
+    ----------
+    user_input : str
+        The user input to be used for the web search
+    webs : WEBS
+        The web search instance to be used to perform the search
+    max_results : int, optional
+        The maximum number of search results to include in the response, by default 10
+
+    Returns
+    -------
+    Optional[str]
+        The response generated by the LLM model, or None if there is no response
+    """
+    # Perform a web search based on the user input
+    search_results: List[str] = []
+    for r in webs.text(
+        user_input, region="wt-wt", safesearch="off", timelimit="y", max_results=max_results
+    ):
+        search_results.append(str(r))  # Convert each result to a string
+
+    # Define the messages to be sent, including the user input, search results, and system message
+    messages = [
+        {"role": "user", "content": user_input + "\n" + "websearch results are:" + "\n".join(search_results)},
+    ]
+
+    # Use the chat method to get the response
+    response = LLM.chat(messages)
+
+    return response
+
 
 if __name__ == "__main__":
-    model_name = "mistralai/Mistral-7B-Instruct-v0.2" # name of the model you wish to use It supports ALL text generation models on deepinfra.com.
-    chat(model_name)
+    while True:
+        # Get the user input
+        user_input = input("User: ")
+
+        # Perform a web search based on the user input
+        with WEBS() as webs:
+            response = chat(user_input, webs)
+
+        # Print the response
+        if response:
+            print("AI:", response)
+        else:
+            print("No response")
 ```

{webscout-1.3.0 → webscout-1.3.1}/README.md

@@ -47,6 +47,7 @@ Search for words, documents, images, videos, news, maps and text translation usi
     - [9. `KOBOLDIA` -](#9-koboldia--)
   - [usage of special .LLM file from webscout (webscout.LLM)](#usage-of-special-llm-file-from-webscout-webscoutllm)
     - [`LLM`](#llm)
+    - [`LLM` with internet](#llm-with-internet)
 
 ## Install
 ```python
@@ -652,11 +653,102 @@ print(message)
 ```python
 from webscout.LLM import LLM
 
-def chat(model_name, system_message="You are Jarvis"):# system prompt
-    AI = LLM(model_name, system_message)
-    AI.chat()
+# Read the system message from the file
+with open('system.txt', 'r') as file:
+    system_message = file.read()
 
-if __name__ == "__main__":
-    model_name = "mistralai/Mistral-7B-Instruct-v0.2" # name of the model you wish to use It supports ALL text generation models on deepinfra.com.
-    chat(model_name)
+# Initialize the LLM class with the model name and system message
+llm = LLM(model="microsoft/WizardLM-2-8x22B", system_message=system_message)
+
+while True:
+    # Get the user input
+    user_input = input("User: ")
+
+    # Define the messages to be sent
+    messages = [
+        {"role": "user", "content": user_input}
+    ]
+
+    # Use the mistral_chat method to get the response
+    response = llm.chat(messages)
+
+    # Print the response
+    print("AI: ", response)
 ```
+### `LLM` with internet
+```python
+from __future__ import annotations
+from typing import List, Optional
+
+from webscout import LLM
+from webscout import WEBS
+import warnings
+
+system_message: str = (
+    "As AI, you possess internet access and are capable of executing real-time web searches based on user inputs. "
+    "You shall utilize this capability to enrich conversations, offer informed insights, and augment your ability to "
+    "respond accurately and thoroughly. However, refrain from stating 'You have provided a list of strings,' ensuring "
+    "seamless interactions with users. Embrace a responsive demeanor, harnessing available online resources to address "
+    "queries, share pertinent content, and facilitate meaningful exchanges. By doing so, you create value through "
+    "connection and engagement, ultimately enhancing overall user satisfaction and experience. Additionally, "
+    "continue upholding the principles of respect, impartiality, and intellectual integrity throughout all interactions."
+)
+
+# Ignore the specific UserWarning
+warnings.filterwarnings("ignore", category=UserWarning, module="curl_cffi.aio", lineno=205)
+LLM = LLM(model="meta-llama/Meta-Llama-3-70B-Instruct", system_message=system_message)
+
+
+def chat(
+    user_input: str, webs: WEBS, max_results: int = 10
+) -> Optional[str]:
+    """
+    Chat function to perform a web search based on the user input and generate a response using the LLM model.
+
+    Parameters
+    ----------
+    user_input : str
+        The user input to be used for the web search
+    webs : WEBS
+        The web search instance to be used to perform the search
+    max_results : int, optional
+        The maximum number of search results to include in the response, by default 10
+
+    Returns
+    -------
+    Optional[str]
+        The response generated by the LLM model, or None if there is no response
+    """
+    # Perform a web search based on the user input
+    search_results: List[str] = []
+    for r in webs.text(
+        user_input, region="wt-wt", safesearch="off", timelimit="y", max_results=max_results
+    ):
+        search_results.append(str(r))  # Convert each result to a string
+
+    # Define the messages to be sent, including the user input, search results, and system message
+    messages = [
+        {"role": "user", "content": user_input + "\n" + "websearch results are:" + "\n".join(search_results)},
+    ]
+
+    # Use the chat method to get the response
+    response = LLM.chat(messages)
+
+    return response
+
+
+if __name__ == "__main__":
+    while True:
+        # Get the user input
+        user_input = input("User: ")
+
+        # Perform a web search based on the user input
+        with WEBS() as webs:
+            response = chat(user_input, webs)
+
+        # Print the response
+        if response:
+            print("AI:", response)
+        else:
+            print("No response")
+```

{webscout-1.3.0 → webscout-1.3.1}/setup.py

@@ -1,16 +1,12 @@
 from setuptools import setup, find_packages
 
-# version = None
-# with open("webscout/version.py") as version_file:
-#     exec(version_file.read())
-
 with open("README.md", encoding="utf-8") as f:
     README = f.read()
 
 setup(
     name="webscout",
-    version="1.3.0", 
-    description="Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models and now can transcribe yt videos",
+    version="1.3.1", 
+    description="Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models, can transcribe yt videos and have TTS support",
     long_description=README,
     long_description_content_type="text/markdown",
     author="OEvortex",

{webscout-1.3.0 → webscout-1.3.1}/webscout/LLM.py

@@ -8,7 +8,7 @@ class LLM:
         self.model = model
         self.conversation_history = [{"role": "system", "content": system_message}]
 
-    def mistral_chat(self, messages: List[Dict[str, str]]) -> Union[str, None]:
+    def chat(self, messages: List[Dict[str, str]]) -> Union[str, None]:
         url = "https://api.deepinfra.com/v1/openai/chat/completions"
         headers = {
             'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
@@ -43,26 +43,3 @@ class LLM:
             return result.json()['choices'][0]['message']['content']
         except:
             return None
-
-    def chat(self):
-        while True:
-            prompt = input("👦: ")
-            user_message = {"role": "user", "content": prompt}
-            self.conversation_history.append(user_message)
-            try:
-                resp = self.mistral_chat(self.conversation_history)
-                print(f"🤖: {resp}")
-                self.conversation_history.append({"role": "assistant", "content": resp})
-            except Exception as e:
-                print(f"🤖: Oops, something went wrong: {e}! Looks like even AI needs some oiling sometimes.")
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='LLM CLI', epilog='To use a specific model, run:\n'
-                                                                     'python -m webscout.LLM model_name\n'
-                                                                     'Replace "model_name" with the name of the model you wish to use It supports ALL text generation models on deepinfra.com.')
-    parser.add_argument('model', type=str, help='Model to use for text generation. Specify the full model name, e.g., "mistralai/Mistral-7B-Instruct-v0.1".')
-    parser.add_argument('--system-message', type=str, default="You are a Helpful AI.", help='Custom system prompt for the AI.')
-    args = parser.parse_args()
-
-    LLM = LLM(args.model, args.system_message)
-    LLM.chat()

{webscout-1.3.0 → webscout-1.3.1}/webscout/__init__.py

@@ -11,6 +11,7 @@ from .version import __version__
 from .DWEBS import DeepWEBS
 from .transcriber import transcriber
 from .voice import play_audio
+from .LLM import LLM
 
 
 __all__ = ["WEBS", "AsyncWEBS", "__version__", "cli"]

webscout-1.3.1/webscout/version.py

@@ -0,0 +1,2 @@
+__version__ = "1.3.1"
+

{webscout-1.3.0 → webscout-1.3.1}/webscout.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 1.3.0
-Summary: Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models and now can transcribe yt videos
+Version: 1.3.1
+Summary: Search for words, documents, images, videos, news, maps and text translation using the Google, DuckDuckGo.com, yep.com, phind.com, you.com, etc Also containes AI models, can transcribe yt videos and have TTS support
 Author: OEvortex
 Author-email: helpingai5@gmail.com
 License: HelpingAI Simplified Universal License
@@ -99,6 +99,7 @@ Search for words, documents, images, videos, news, maps and text translation usi
     - [9. `KOBOLDIA` -](#9-koboldia--)
   - [usage of special .LLM file from webscout (webscout.LLM)](#usage-of-special-llm-file-from-webscout-webscoutllm)
     - [`LLM`](#llm)
+    - [`LLM` with internet](#llm-with-internet)
 
 ## Install
 ```python
@@ -704,11 +705,102 @@ print(message)
 ```python
 from webscout.LLM import LLM
 
-def chat(model_name, system_message="You are Jarvis"):# system prompt
-    AI = LLM(model_name, system_message)
-    AI.chat()
+# Read the system message from the file
+with open('system.txt', 'r') as file:
+    system_message = file.read()
+
+# Initialize the LLM class with the model name and system message
+llm = LLM(model="microsoft/WizardLM-2-8x22B", system_message=system_message)
+
+while True:
+    # Get the user input
+    user_input = input("User: ")
+
+    # Define the messages to be sent
+    messages = [
+        {"role": "user", "content": user_input}
+    ]
+
+    # Use the mistral_chat method to get the response
+    response = llm.chat(messages)
+
+    # Print the response
+    print("AI: ", response)
+```
+### `LLM` with internet
+```python
+from __future__ import annotations
+from typing import List, Optional
+
+from webscout import LLM
+from webscout import WEBS
+import warnings
+
+system_message: str = (
+    "As AI, you possess internet access and are capable of executing real-time web searches based on user inputs. "
+    "You shall utilize this capability to enrich conversations, offer informed insights, and augment your ability to "
+    "respond accurately and thoroughly. However, refrain from stating 'You have provided a list of strings,' ensuring "
+    "seamless interactions with users. Embrace a responsive demeanor, harnessing available online resources to address "
+    "queries, share pertinent content, and facilitate meaningful exchanges. By doing so, you create value through "
+    "connection and engagement, ultimately enhancing overall user satisfaction and experience. Additionally, "
+    "continue upholding the principles of respect, impartiality, and intellectual integrity throughout all interactions."
+)
+
+# Ignore the specific UserWarning
+warnings.filterwarnings("ignore", category=UserWarning, module="curl_cffi.aio", lineno=205)
+LLM = LLM(model="meta-llama/Meta-Llama-3-70B-Instruct", system_message=system_message)
+
+
+def chat(
+    user_input: str, webs: WEBS, max_results: int = 10
+) -> Optional[str]:
+    """
+    Chat function to perform a web search based on the user input and generate a response using the LLM model.
+
+    Parameters
+    ----------
+    user_input : str
+        The user input to be used for the web search
+    webs : WEBS
+        The web search instance to be used to perform the search
+    max_results : int, optional
+        The maximum number of search results to include in the response, by default 10
+
+    Returns
+    -------
+    Optional[str]
+        The response generated by the LLM model, or None if there is no response
+    """
+    # Perform a web search based on the user input
+    search_results: List[str] = []
+    for r in webs.text(
+        user_input, region="wt-wt", safesearch="off", timelimit="y", max_results=max_results
+    ):
+        search_results.append(str(r))  # Convert each result to a string
+
+    # Define the messages to be sent, including the user input, search results, and system message
+    messages = [
+        {"role": "user", "content": user_input + "\n" + "websearch results are:" + "\n".join(search_results)},
+    ]
+
+    # Use the chat method to get the response
+    response = LLM.chat(messages)
+
+    return response
+
 
 if __name__ == "__main__":
-    model_name = "mistralai/Mistral-7B-Instruct-v0.2" # name of the model you wish to use It supports ALL text generation models on deepinfra.com.
-    chat(model_name)
+    while True:
+        # Get the user input
+        user_input = input("User: ")
+
+        # Perform a web search based on the user input
+        with WEBS() as webs:
+            response = chat(user_input, webs)
+
+        # Print the response
+        if response:
+            print("AI:", response)
+        else:
+            print("No response")
 ```

webscout-1.3.0/webscout/version.py

@@ -1,2 +0,0 @@
-__version__ = "1.3.0"
-