webscout 5.3__tar.gz → 5.4__tar.gz

{webscout-5.3/webscout.egg-info → webscout-5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 5.3
+Version: 5.4
 Summary: Search for anything using Google, DuckDuckGo, 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
@@ -29,44 +29,29 @@ Requires-Dist: click
 Requires-Dist: curl_cffi
 Requires-Dist: lxml
 Requires-Dist: nest-asyncio
-Requires-Dist: selenium
-Requires-Dist: tqdm
-Requires-Dist: webdriver-manager
-Requires-Dist: halo>=0.0.31
 Requires-Dist: g4f>=0.2.2.3
 Requires-Dist: g4f[webdriver]
 Requires-Dist: rich
-Requires-Dist: python-dotenv
 Requires-Dist: beautifulsoup4
 Requires-Dist: markdownify
 Requires-Dist: pydantic
 Requires-Dist: requests
-Requires-Dist: sse_starlette
 Requires-Dist: termcolor
-Requires-Dist: tiktoken
-Requires-Dist: tldextract
 Requires-Dist: orjson
 Requires-Dist: PyYAML
 Requires-Dist: appdirs
-Requires-Dist: GoogleBard1>=2.1.4
 Requires-Dist: tls_client
 Requires-Dist: clipman
-Requires-Dist: Helpingai-T2
 Requires-Dist: playsound
 Requires-Dist: poe_api_wrapper
 Requires-Dist: pyreqwest_impersonate
-Requires-Dist: ballyregan
-Requires-Dist: nodriver
-Requires-Dist: PyExecJS
 Requires-Dist: ollama
 Requires-Dist: pyfiglet
-Requires-Dist: yaspin
 Requires-Dist: pillow
 Requires-Dist: requests_html
 Requires-Dist: bson
 Requires-Dist: cloudscraper
 Requires-Dist: emoji
-Requires-Dist: colorlog
 Requires-Dist: openai
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
@@ -871,7 +856,7 @@ from webscout import WEBS as w
 R = w().chat("Who are you", model='gpt-4o-mini') # GPT-3.5 Turbo, mixtral-8x7b, llama-3-70b, claude-3-haiku, gpt-4o-mini
 print(R)
 ```
-###  `PhindSearch` - Search using Phind.com 
+###  `PhindSearch` - Search using Phind.com
 
 ```python
 from webscout import PhindSearch
@@ -907,34 +892,6 @@ message = ph.get_message(response)
 print(message)
 ```
 
-
-### `You.com` - search/chat with you.com - Not working
-```python
-
-from webscout import YouChat
-from rich import print
-
-ai = YouChat(
-    is_conversation=True,
-    max_tokens=800,
-    timeout=30,
-    intro=None,
-    filepath=None,
-    update_file=True,
-    proxies={},
-    history_offset=10250,
-    act=None,
-)
-
-prompt = "what is meaning of life"
-
-response = ai.ask(prompt)
-
-# Extract and print the message from the response
-message = ai.get_message(response)
-print(message)
-```
-
 ### `Gemini` - search with google gemini
 
 ```python
@@ -953,26 +910,43 @@ gemini = GEMINI(cookie_file=COOKIE_FILE, proxy=PROXIES)
 response = gemini.chat("websearch about HelpingAI and who is its developer")
 print(response)
 ```
-### `Berlin4h` - chat with Berlin4h
+### `YEPCHAT` 
 ```python
-from webscout import Berlin4h
+from webscout import YEPCHAT
+ai = YEPCHAT(Tools=False)
+response = ai.chat(input(">>> "))
+for chunk in response:
+    print(chunk, end="", flush=True)
+#---------------Tool Call-------------
 
-ai = Berlin4h(
-    is_conversation=True,
-    max_tokens=800,
-    timeout=30,
-    intro=None,
-    filepath=None,
-    update_file=True,
-    proxies={},
-    history_offset=10250,
-    act=None,
+from rich import print
+from webscout import YEPCHAT
+def get_current_time():
+    import datetime
+    return f"The current time is {datetime.datetime.now().strftime('%H:%M:%S')}"
+def get_weather(location: str) -> str:
+    return f"The weather in {location} is sunny."
+
+
+ai = YEPCHAT(Tools=True) # Set Tools=True to use tools in the chat.
+
+ai.tool_registry.register_tool("get_current_time", get_current_time, "Gets the current time.")
+ai.tool_registry.register_tool(
+    "get_weather",
+    get_weather,
+    "Gets the weather for a given location.",
+    parameters={
+        "type": "object",
+        "properties": {
+            "location": {"type": "string", "description": "The city and state, or zip code"}
+        },
+        "required": ["location"],
+    },
 )
 
-# Example usage:
-prompt = "Explain the concept of recursion in simple terms."
-response = ai.chat(prompt)
-print(response)
+response = ai.chat(input(">>> "))
+for chunk in response:
+    print(chunk, end="", flush=True)
 ```
 ###  `BlackBox` - Search/chat With BlackBox
 ```python
@@ -1122,7 +1096,7 @@ print(message)
 Usage code similar to other proviers
 
 ###  `BasedGPT` - chat with GPT
-```
+```py
 from webscout import BasedGPT
 
 # Initialize the BasedGPT provider
@@ -1431,7 +1405,7 @@ if "error" not in function_call_data:
 else:
     print(f"Error: {function_call_data['error']}")
 ```
-###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, XDASH, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, NetFly, Editee, AI21, Chatify, Cerebras, X0GPT
+###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, XDASH, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, NetFly, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Genspark
 code similar to other provider
 ### `LLM` 
 ```python

{webscout-5.3 → webscout-5.4}/README.md

@@ -792,7 +792,7 @@ from webscout import WEBS as w
 R = w().chat("Who are you", model='gpt-4o-mini') # GPT-3.5 Turbo, mixtral-8x7b, llama-3-70b, claude-3-haiku, gpt-4o-mini
 print(R)
 ```
-###  `PhindSearch` - Search using Phind.com 
+###  `PhindSearch` - Search using Phind.com
 
 ```python
 from webscout import PhindSearch
@@ -828,34 +828,6 @@ message = ph.get_message(response)
 print(message)
 ```
 
-
-### `You.com` - search/chat with you.com - Not working
-```python
-
-from webscout import YouChat
-from rich import print
-
-ai = YouChat(
-    is_conversation=True,
-    max_tokens=800,
-    timeout=30,
-    intro=None,
-    filepath=None,
-    update_file=True,
-    proxies={},
-    history_offset=10250,
-    act=None,
-)
-
-prompt = "what is meaning of life"
-
-response = ai.ask(prompt)
-
-# Extract and print the message from the response
-message = ai.get_message(response)
-print(message)
-```
-
 ### `Gemini` - search with google gemini
 
 ```python
@@ -874,26 +846,43 @@ gemini = GEMINI(cookie_file=COOKIE_FILE, proxy=PROXIES)
 response = gemini.chat("websearch about HelpingAI and who is its developer")
 print(response)
 ```
-### `Berlin4h` - chat with Berlin4h
+### `YEPCHAT` 
 ```python
-from webscout import Berlin4h
+from webscout import YEPCHAT
+ai = YEPCHAT(Tools=False)
+response = ai.chat(input(">>> "))
+for chunk in response:
+    print(chunk, end="", flush=True)
+#---------------Tool Call-------------
 
-ai = Berlin4h(
-    is_conversation=True,
-    max_tokens=800,
-    timeout=30,
-    intro=None,
-    filepath=None,
-    update_file=True,
-    proxies={},
-    history_offset=10250,
-    act=None,
+from rich import print
+from webscout import YEPCHAT
+def get_current_time():
+    import datetime
+    return f"The current time is {datetime.datetime.now().strftime('%H:%M:%S')}"
+def get_weather(location: str) -> str:
+    return f"The weather in {location} is sunny."
+
+
+ai = YEPCHAT(Tools=True) # Set Tools=True to use tools in the chat.
+
+ai.tool_registry.register_tool("get_current_time", get_current_time, "Gets the current time.")
+ai.tool_registry.register_tool(
+    "get_weather",
+    get_weather,
+    "Gets the weather for a given location.",
+    parameters={
+        "type": "object",
+        "properties": {
+            "location": {"type": "string", "description": "The city and state, or zip code"}
+        },
+        "required": ["location"],
+    },
 )
 
-# Example usage:
-prompt = "Explain the concept of recursion in simple terms."
-response = ai.chat(prompt)
-print(response)
+response = ai.chat(input(">>> "))
+for chunk in response:
+    print(chunk, end="", flush=True)
 ```
 ###  `BlackBox` - Search/chat With BlackBox
 ```python
@@ -1043,7 +1032,7 @@ print(message)
 Usage code similar to other proviers
 
 ###  `BasedGPT` - chat with GPT
-```
+```py
 from webscout import BasedGPT
 
 # Initialize the BasedGPT provider
@@ -1352,7 +1341,7 @@ if "error" not in function_call_data:
 else:
     print(f"Error: {function_call_data['error']}")
 ```
-###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, XDASH, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, NetFly, Editee, AI21, Chatify, Cerebras, X0GPT
+###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, XDASH, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, NetFly, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Genspark
 code similar to other provider
 ### `LLM` 
 ```python

{webscout-5.3 → webscout-5.4}/setup.py

@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
-
+from webscout.version import __prog__, __version__
 with open("README.md", encoding="utf-8") as f:
     README = f.read()
 
 setup(
     name="webscout",
-    version="5.3",
+    version=__version__,
     description="Search for anything using Google, DuckDuckGo, 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",
@@ -33,44 +33,29 @@ setup(
         "curl_cffi",
         "lxml",
         "nest-asyncio",
-        "selenium",
-        "tqdm",
-        "webdriver-manager",
-        "halo>=0.0.31",
         "g4f>=0.2.2.3",
         "g4f[webdriver]",
         "rich",
-        "python-dotenv",
         "beautifulsoup4",
         "markdownify",
         "pydantic",
         "requests",
-        "sse_starlette",
         "termcolor",
-        "tiktoken",
-        "tldextract",
         "orjson",
         "PyYAML",
         "appdirs",
-        "GoogleBard1>=2.1.4",
         "tls_client",
         "clipman",
-        "Helpingai-T2",
         "playsound",
         "poe_api_wrapper",
         "pyreqwest_impersonate",
-        "ballyregan",
-        "nodriver",
-        "PyExecJS",
         "ollama",
         "pyfiglet",
-        "yaspin",
         "pillow",
         "requests_html",
         "bson",
         "cloudscraper",
         "emoji",
-        "colorlog",
         "openai",
     ],
     entry_points={

{webscout-5.3 → webscout-5.4}/webscout/AIauto.py

@@ -9,11 +9,8 @@ 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.yep import YEPCHAT
-from webscout.Provider.Berlin4h import Berlin4h
 from webscout.Provider.Poe import POE
 from webscout.Provider.BasedGPT import BasedGPT
 from webscout.Provider.Deepseek import DeepSeek
@@ -25,7 +22,7 @@ from webscout.Provider.DARKAI import DARKAI
 from webscout.Provider.koala import KOALA
 from webscout.Provider.RUBIKSAI import RUBIKSAI
 from webscout.Provider.meta import Meta
-from webscout.Provider.liaobots import LiaoBots
+
 from webscout.Provider.DiscordRocks import DiscordRocks
 from webscout.Provider.felo_search import Felo
 from webscout.Provider.xdash import XDASH
@@ -35,7 +32,7 @@ from webscout.Provider.Cloudflare import Cloudflare
 from webscout.Provider.turboseek import TurboSeek
 from webscout.Provider.NetFly import NetFly
 from webscout.Provider.EDITEE import Editee
-# from webscout.Provider.Chatify import Chatify # TODO: UNFINISHED
+from webscout.Provider.Chatify import Chatify
 from webscout.Provider.PI import PiAI 
 from webscout.g4f import GPT4FREE, AsyncGPT4FREE
 from webscout.g4f import TestProviders
@@ -58,7 +55,6 @@ provider_map: dict[
         PhindSearch,
         Phindv2,
         YEPCHAT,
-        Berlin4h,
         POE,
         BasedGPT,
         DeepSeek,
@@ -72,7 +68,7 @@ provider_map: dict[
         KOALA,
         RUBIKSAI,
         Meta,
-        LiaoBots,
+
         DiscordRocks,
         Felo,
         XDASH,
@@ -82,7 +78,7 @@ provider_map: dict[
         TurboSeek,
         NetFly,
         Editee,
-        # Chatify,
+        Chatify,
         PiAI,
     ],
 ] = {
@@ -94,7 +90,7 @@ provider_map: dict[
     "PhindSearch": PhindSearch,
     "Phindv2": Phindv2,
     "YEPCHAT": YEPCHAT,
-    "Berlin4h": Berlin4h,
+
     "POE": POE,
     "BasedGPT": BasedGPT,
     "DeepSeek": DeepSeek,
@@ -108,7 +104,7 @@ provider_map: dict[
     "koala": KOALA,
     "rubiksai": RUBIKSAI,
     "meta": Meta,
-    "liaobots": LiaoBots,
+
     "discordrocks": DiscordRocks,
     "felo": Felo,
     "xdash": XDASH,
@@ -160,7 +156,7 @@ class AUTO(Provider):
             PhindSearch,
             Phindv2,
             YEPCHAT,
-            Berlin4h,
+
             POE,
             BasedGPT,
             DeepSeek,
@@ -174,7 +170,7 @@ class AUTO(Provider):
             KOALA,
             RUBIKSAI,
             Meta,
-            LiaoBots,
+
             DiscordRocks,
             Felo,
             XDASH,

{webscout-5.3 → webscout-5.4}/webscout/Agents/Onlinesearcher.py

@@ -10,7 +10,7 @@ import logging
 class WebSearchAgent:
     def __init__(self):
         self.webs = WEBS()
-        self.ai = LLAMA3(system="You are an advanced AI assistant specialized in generating optimal search queries and providing comprehensive answers based on web search results.")
+        self.ai = LLAMA3(system="You are an advanced AI assistant specialized in generating optimal search queries and providing comprehensive answers based on web search results.", is_conversation=False)
 
     def generate_search_queries(self, information, num_queries=3):
         prompt = f"""
@@ -94,8 +94,8 @@ class WebSearchAgent:
                 paragraphs = soup.find_all('p')
                 text = ' '.join([p.get_text() for p in paragraphs])
                 words = text.split()
-                if len(words) > 150:
-                    text = ' '.join(words[:150]) + '...'
+                if len(words) > 600:
+                    text = ' '.join(words[:600]) + '...'
                 return text
             else:
                 return f"Failed to fetch {url}: HTTP {response.status}"
@@ -112,7 +112,7 @@ class WebSearchAgent:
 class OnlineSearcher:
     def __init__(self):
         self.agent = WebSearchAgent()
-        self.ai = LLAMA3(system="You are an advanced AI assistant specialized in providing comprehensive and accurate answers based on web search results and your general knowledge.")
+        self.ai = LLAMA3(system="You are an advanced AI assistant specialized in providing comprehensive and accurate answers based on web search results and your general knowledge.", is_conversation=False)
 
     def answer_question(self, question: str):
         search_results = self.agent.search(question)
@@ -125,7 +125,7 @@ class OnlineSearcher:
 
         context += "Extracted webpage contents:\n"
         for i, webpage in enumerate(webpage_contents):
-            context += f"{i}. URL: {webpage['url']}\n   Content: {webpage['content'][:150]}...\n\n"
+            context += f"{i}. URL: {webpage['url']}\n   Content: {webpage['content'][:600]}...\n\n"
 
         prompt = f"""
         Task: Provide a comprehensive and accurate answer to the given question based on the provided web search results and your general knowledge.

webscout-5.4/webscout/Agents/functioncall.py

@@ -0,0 +1,198 @@
+from datetime import date
+import json
+# import logging
+import time
+from typing import Any, Dict, Optional
+import requests
+from webscout import WEBS, Julius
+
+class FunctionCallingAgent:
+    def __init__(self, model: str = "GPT-4o", 
+                 tools: list = None):
+        self.ai = Julius(model=model, timeout=300, intro=None)
+        self.tools = tools if tools is not None else []
+        self.knowledge_cutoff = "September 2022" 
+
+    def function_call_handler(self, message_text: str) -> dict:
+        system_message = self._generate_system_message(message_text)
+        response = self.ai.chat(system_message)
+        # logging.info(f"Raw response: {response}")
+        return self._parse_function_call(response)
+
+    def _generate_system_message(self, user_message: str) -> str:
+        tools_description = ""
+        for tool in self.tools:
+            tools_description += f"- {tool['function']['name']}: {tool['function'].get('description', '')}\n"
+            tools_description += "    Parameters:\n"
+            for key, value in tool['function']['parameters']['properties'].items():
+                tools_description += f"      - {key}: {value.get('description', '')} ({value.get('type')})\n"
+        
+        current_date = date.today().strftime("%B %d, %Y")
+        return f"""Today is {current_date}. Your knowledge is current up to {self.knowledge_cutoff}.
+
+You are an advanced AI assistant tasked with analyzing user requests and determining the most appropriate action. You have access to the following tools:
+
+{tools_description}
+
+Instructions:
+1. Carefully analyze the user's request.
+2. If the user request is about controlling the web browser (opening websites, searching, playing videos, etc.), ALWAYS use the 'browser_control' tool.
+3. If the user request is something else, determine if any of the other provided tools are necessary to fulfill the request.
+4. If a tool is needed, select the MOST APPROPRIATE one. Do not use a tool if it's not directly relevant to the user's request.
+5. If you decide to use a tool, respond ONLY with a JSON object in this format:
+   {{
+     "tool_name": "name_of_the_tool",
+     "tool_input": {{
+       "param1": "value1",
+       "param2": "value2"
+     }}
+   }}
+
+   - Use the exact tool name as listed above.
+   - Include only the necessary parameters for the chosen tool.
+   - Do not include any explanations or additional text outside the JSON object.
+
+6. If no tool is needed and you can answer directly, respond with:
+   {{
+     "tool_name": "general_ai",
+     "tool_input": {{
+       "question": "user's original question"
+     }}
+   }}
+
+User Request: {user_message}
+
+Your Response (JSON only):"""
+
+    def _parse_function_call(self, response: str) -> dict:
+        try:
+            # Ensure to locate the start and end of the JSON structure
+            start_idx = response.find("{")
+            end_idx = response.rfind("}") + 1
+
+            if start_idx == -1 or end_idx == -1:
+                raise ValueError("No valid JSON structure found in the response.")
+
+            # Extract the JSON string
+            response_json_str = response[start_idx:end_idx]
+
+            # Load the JSON string
+            parsed_response = json.loads(response_json_str)
+
+            # Check for the expected format
+            if "tool_name" in parsed_response and "tool_input" in parsed_response:
+                return parsed_response
+
+            # If not in the expected format, try to convert
+            for key, value in parsed_response.items():
+                if isinstance(value, dict):
+                    return {
+                        "tool_name": key,
+                        "tool_input": value
+                    }
+
+            # If the response structure is still incorrect
+            raise ValueError("Invalid response structure: missing required fields.")
+
+        except (ValueError, json.JSONDecodeError) as e:
+            # logging.error(f"Error parsing function call: {e}")
+            return {"error": str(e)}
+
+
+    def execute_function(self, function_call_data: dict) -> str:
+        function_name = function_call_data.get("tool_name")
+        arguments = function_call_data.get("tool_input", {})
+
+        if not isinstance(arguments, dict):
+            # logging.error("Invalid arguments format.")
+            return "Invalid arguments format."
+
+        # logging.info(f"Executing function: {function_name} with arguments: {arguments}")
+
+
+# Example usage
+if __name__ == "__main__":
+    # Configure logging
+    # logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "web_search",
+                "description": "Search the web for current information on a given query",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "query": {
+                            "type": "string",
+                            "description": "The search query to be executed"
+                        }
+                    },
+                    "required": ["query"]
+                }
+            }
+        },
+        {
+            "type": "function",
+            "function": {
+                "name": "get_user_detail",
+                "description": "Get the user's name and age.",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string",
+                            "description": "The user's name."
+                        },
+                        "age": {
+                            "type": "integer",
+                            "description": "The user's age."
+                        }
+                    },
+                    "required": ["name", "age"]
+                }
+            }
+        },
+        {
+            "type": "function",
+            "function": {
+                "name": "general_ai",
+                "description": "Use AI to answer general questions or perform tasks not requiring external tools",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "question": {
+                            "type": "string",
+                            "description": "The question or task for the AI to process"
+                        }
+                    },
+                    "required": ["question"]
+                }
+            }
+        }
+    ]
+
+    agent = FunctionCallingAgent(tools=tools)
+    
+    # Test cases
+    test_messages = [
+        "What's the weather like in New York today?",
+        "Who won the last FIFA World Cup?",
+        "Can you explain quantum computing?",
+        "What are the latest developments in AI?",
+        "Tell me a joke about programming.",
+        "What's the meaning of life?",
+        "Get user details name as John and age as 30"
+    ]
+
+    for message in test_messages:
+        print(f"\nProcessing: {message}")
+        function_call_data = agent.function_call_handler(message)
+        print(f"Function Call Data: {function_call_data}")
+
+        if "error" not in function_call_data:
+            result = agent.execute_function(function_call_data)
+            print(f"Function Execution Result: {result}")
+        else:
+            print(f"Error: {function_call_data['error']}")

webscout-5.4/webscout/Local/_version.py

@@ -0,0 +1,3 @@
+from llama_cpp import __version__ as __llama_cpp_version__
+from webscout.version import __prog__, __version__
+__version__ = __version__