webscout 4.9__py3-none-any.whl → 5.0__py3-none-any.whl

webscout/Agents/functioncall.py

@@ -1,72 +1,44 @@
 import json
 import logging
-from webscout import DeepInfra, WEBS
+from webscout import LLAMA3, WEBS
 
 class FunctionCallingAgent:
-    def __init__(self, model: str = "Qwen/Qwen2-72B-Instruct", 
+    def __init__(self, model: str = "llama3-8b", 
                  system_prompt: str = 'You are a helpful assistant that will always answer what the user wants', 
                  tools: list = None):
-        """
-        Initialize the FunctionCallingAgent with the model, system prompt, and tools.
-
-        Args:
-            model (str): The model to use for deepinfra chat.
-            system_prompt (str): The system prompt to initialize the model.
-            tools (list): A list of tools the agent can use.
-        """
-        self.deepinfra = DeepInfra(model=model, system_prompt=system_prompt, timeout=300)
+        self.LLAMA3 = LLAMA3(model=model, system=system_prompt, timeout=300)
         self.tools = tools if tools is not None else []
-
+        self.webs = WEBS()
 
     def function_call_handler(self, message_text: str) -> dict:
-        """
-        Handles function calls based on the provided message text.
-
-        Args:
-            message_text (str): The input message text from the user.
-
-        Returns:
-            dict: The extracted function call and arguments.
-        """
         system_message = self._generate_system_message(message_text)
-        response = self.deepinfra.chat(system_message)
+        response = self.LLAMA3.chat(system_message)
         # logging.info(f"Raw response: {response}")
-
         return self._parse_function_call(response)
 
     def _generate_system_message(self, user_message: str) -> str:
-        """
-        Generates a system message incorporating the user message and available tools.
-
-        Args:
-            user_message (str): The input message from the user.
-
-        Returns:
-            str: The formatted system message.
-        """
-        tools_description = '\n'.join([f"{tool['function']['name']}: {tool['function'].get('description', '')}" for tool in self.tools])
+        tools_description = '\n'.join([f"- {tool['function']['name']}: {tool['function'].get('description', '')}" for tool in self.tools])
         return (
-            f"[SYSTEM] You are a helpful and capable AI assistant. "
-            "Your goal is to understand the user's request and provide accurate and relevant information. "
-            "You have access to the following tools:\n\n"
-            f"{tools_description}\n\n"
-            "To use a tool, please follow this format:\n\n"
-            "```json\n"
-            "{{ 'tool_name': 'tool_name', 'tool_input': {{ 'arg_1': 'value_1', 'arg_2': 'value_2', ... }} }}\n"
-            "```\n\n"
-            f"[USER] {user_message}"
+            "You are an AI assistant capable of understanding user requests and using tools to fulfill them. "
+            "Always respond using the JSON format specified below, even if you're not sure about the answer. "
+            f"Available tools:\n{tools_description}\n\n"
+            "Instructions:\n"
+            "1. Analyze the user's request.\n"
+            "2. Choose the most appropriate tool based on the request.\n"
+            "3. Respond ONLY with a JSON object in this exact format:\n"
+            "{\n"
+            '  "tool_name": "name_of_the_tool",\n'
+            '  "tool_input": {\n'
+            '    "param1": "value1",\n'
+            '    "param2": "value2"\n'
+            "  }\n"
+            "}\n\n"
+            "If you can't determine a suitable tool, use the 'general_ai' tool with the user's message as the 'question' parameter.\n\n"
+            f"User request: {user_message}\n\n"
+            "Your response (in JSON format):"
         )
 
     def _parse_function_call(self, response: str) -> dict:
-        """
-        Parses the response from the model to extract the function call.
-
-        Args:
-            response (str): The raw response from the model.
-
-        Returns:
-            dict: A dictionary containing the function name and arguments.
-        """
         try:
             # Find the JSON-like part of the response
             start_idx = response.find("{")
@@ -76,14 +48,7 @@ class FunctionCallingAgent:
                 raise ValueError("No valid JSON structure found in the response.")
 
             response_json_str = response[start_idx:end_idx]
-
-            # Replace single quotes with double quotes and remove extra braces
-            response_json_str = response_json_str.replace("'", '"')
-            response_json_str = response_json_str.replace("{{", "{").replace("}}", "}")
             
-            # Remove any leading or trailing whitespace
-            response_json_str = response_json_str.strip()
-
             # Attempt to load the JSON string
             return json.loads(response_json_str)
 
@@ -92,17 +57,8 @@ class FunctionCallingAgent:
             return {"error": str(e)}
 
     def execute_function(self, function_call_data: dict) -> str:
-        """
-        Executes the specified function with the provided arguments.
-
-        Args:
-            function_call_data (dict): A dictionary containing the function name and arguments.
-
-        Returns:
-            str: The result of the function execution.
-        """
-        function_name = function_call_data.get("tool_name")  # Use 'tool_name' instead of 'name'
-        arguments = function_call_data.get("tool_input", {})  # Use 'tool_input' instead of 'arguments'
+        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.")
@@ -110,28 +66,32 @@ class FunctionCallingAgent:
 
         logging.info(f"Executing function: {function_name} with arguments: {arguments}")
 
-        if function_name == "web_search":
-            return self._handle_web_search(arguments)
-        else:
-            return f"Function '{function_name}' is not implemented."
+    #     if function_name == "web_search":
+    #         return self._handle_web_search(arguments)
+    #     elif function_name == "general_ai":
+    #         return self._handle_general_ai(arguments)
+    #     else:
+    #         return f"Function '{function_name}' is not implemented."
 
     # def _handle_web_search(self, arguments: dict) -> str:
-    #     """
-    #     Handles web search queries using the WEBS tool.
-
-    #     Args:
-    #         arguments (dict): A dictionary containing the query argument.
-
-    #     Returns:
-    #         str: The result of the web search.
-    #     """
     #     query = arguments.get("query")
     #     if not query:
     #         return "Please provide a search query."
 
-    #     search_results = self.webs.text(query)
-    #     # Additional processing of search results can be done here if needed.
-    #     return f"Here's what I found:\n\n{search_results}"
+    #     search_results = self.webs.text(query, max_results=3)
+    #     formatted_results = "\n\n".join(
+    #         f"{i+1}. {result['title']}\n{result['body']}\nURL: {result['href']}"
+    #         for i, result in enumerate(search_results)
+    #     )
+    #     return f"Here's what I found:\n\n{formatted_results}"
+
+    # def _handle_general_ai(self, arguments: dict) -> str:
+    #     question = arguments.get("question")
+    #     if not question:
+    #         return "Please provide a question for the AI to answer."
+
+    #     response = self.LLAMA3.chat(question)
+    #     return response
 
 # Example usage
 if __name__ == "__main__":
@@ -139,48 +99,44 @@ if __name__ == "__main__":
         {
             "type": "function",
             "function": {
-                "name": "UserDetail",
+                "name": "web_search",
+                "description": "Search query on Google",
                 "parameters": {
                     "type": "object",
-                    "title": "UserDetail",
                     "properties": {
-                        "name": {
-                            "title": "Name",
-                            "type": "string"
-                        },
-                        "age": {
-                            "title": "Age",
-                            "type": "integer"
+                        "query": {
+                            "type": "string",
+                            "description": "web search query"
                         }
                     },
-                    "required": ["name", "age"]
+                    "required": ["query"]
                 }
             }
         },
         {
             "type": "function",
             "function": {
-                "name": "web_search",
-                "description": "Search query on google",
+                "name": "general_ai",
+                "description": "Use AI to answer a general question",
                 "parameters": {
                     "type": "object",
                     "properties": {
-                        "query": {
+                        "question": {
                             "type": "string",
-                            "description": "web search query"
+                            "description": "The question to be answered by the AI"
                         }
                     },
-                    "required": ["query"]
+                    "required": ["question"]
                 }
             }
         }
     ]
 
     agent = FunctionCallingAgent(tools=tools)
-    message = "websearch about helpingai-9b"
+    message = "open yt"
     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}")
+        print(f"Function Execution Result: {result}")

webscout/Provider/DiscordRocks.py

@@ -122,7 +122,7 @@ class DiscordRocks(Provider):
 
     def __init__(
         self,
-        model: str = "gpt-4o", 
+        model: str = "llama-3.1-405b-turbo", 
         max_tokens: int = 4096,
         temperature: float = 1,
         top_p: float = 1,
@@ -176,6 +176,7 @@ class DiscordRocks(Provider):
             "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
             "content-type": "application/json",
             "dnt": "1",
+            "authorization": "Bearer missing api key",
             "origin": "https://llmplayground.net",
             "priority": "u=1, i",
             "referer": "https://llmplayground.net/",

{webscout-4.9.dist-info → webscout-5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.9
+Version: 5.0
 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.9.dist-info → webscout-5.0.dist-info}/RECORD

@@ -24,7 +24,7 @@ webscout/webscout_search_async.py,sha256=dooKGwLm0cwTml55Vy6NHPPY-nymEqX2h8laX94
 webscout/websx_search.py,sha256=5hfkkmGFhyQzojUpvMzIOJ3DBZIBNS90UReaacsfu6s,521
 webscout/Agents/Onlinesearcher.py,sha256=GzF2JcMfj07d74mxQEoaxwtxahgLHl3b_ugTbXjOwq4,7113
 webscout/Agents/__init__.py,sha256=VbGyW5pulh3LRqbVTv54n5TwWsrTqOANRioG18xtdJ0,58
-webscout/Agents/functioncall.py,sha256=i5wG1dwvBgdMMPlQkrq3rUrP-yfsPtaDy0qpF-JGEz4,7046
+webscout/Agents/functioncall.py,sha256=qH1Tofi4h5CK5RhXaLQhXu8swEUmcyK9R5xpS6jMLrs,5784
 webscout/Extra/__init__.py,sha256=GG1qUwS-HspT4TeeAIT4qFpM8PaO1ZdQhpelctaM7Rs,99
 webscout/Extra/autollama.py,sha256=8lyodIWAgJABzlMMHytlolPCgvUKh8ynkZD6MMEltXs,5970
 webscout/Extra/gguf.py,sha256=RvSp7xuaD6epAA9iAzthUnAQ3HA5N-svMyKUadAVnw8,7009
@@ -47,7 +47,7 @@ webscout/Provider/Cohere.py,sha256=OZ7-0iaJ8L5e4Sy-L2UGm8SnBmS7CbaFIj6a08bABVw,8
 webscout/Provider/DARKAI.py,sha256=JpfFcPfd2kp15KSJ7GJ5Zy4zrwYQ_zHpqdFD2904Ii0,9065
 webscout/Provider/Deepinfra.py,sha256=tdST5aQjaCs9_B5mrnrXmihDei73MjB-F8cpES-noc4,18756
 webscout/Provider/Deepseek.py,sha256=jp8cZhbmscDjlXLCGI8MhDGORkbbxyeUlCqu5Z5GGSI,9210
-webscout/Provider/DiscordRocks.py,sha256=m6_VwfGIrZudPAmqf8uiz_LvXo_fpml02SHDtaaA1aY,14958
+webscout/Provider/DiscordRocks.py,sha256=AgpAofgHY8MMKYhuqhtwLM8qGiYatStc2Aa1XX-3PPU,15028
 webscout/Provider/Farfalle.py,sha256=zl2AD5NomuHCkW21tDfI1Z-KIlhiuQ32eiNM-1B4KWQ,9010
 webscout/Provider/Gemini.py,sha256=V79nIi5vhPfvjlGYg5XuH6RfY7AyNnBqnJM-OBK99hE,8453
 webscout/Provider/Groq.py,sha256=h_dPKwqXRwmgvmEmkDYKdXwrlI4Zm2vZuCnSMItoa2w,28662
@@ -75,9 +75,9 @@ webscout/Provider/meta.py,sha256=3iBylmAk9d673Axvw6hFi0-0x_Fq7ZgtH_1j2_rcDwY,307
 webscout/Provider/turboseek.py,sha256=BNx_urbs6Ixr7SEOgL4Uo1iZdjYC7CxoefJcsN4LK6I,9138
 webscout/Provider/xdash.py,sha256=KUDTEX8I0z72bIDi-w5Se7xmB_lbmaX7KlCmIl2ad4c,7925
 webscout/Provider/yep.py,sha256=RbEBzHeEFxgfdnHXHuBny6NKHcYYYNA6bvTggvAzoLk,10399
-webscout-4.9.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
-webscout-4.9.dist-info/METADATA,sha256=i0HoycuMHzKJoQ_oBlw5xuA4iQ-dHfDLhEXiaEZuSAU,50819
-webscout-4.9.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-webscout-4.9.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
-webscout-4.9.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
-webscout-4.9.dist-info/RECORD,,
+webscout-5.0.dist-info/LICENSE.md,sha256=9P0imsudI7MEvZe2pOcg8rKBn6E5FGHQ-riYozZI-Bk,2942
+webscout-5.0.dist-info/METADATA,sha256=anlsD-HmXJT4_UV8LyrT5mxdnEKznprEDn2oPcf-Ucg,50819
+webscout-5.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+webscout-5.0.dist-info/entry_points.txt,sha256=Hh4YIIjvkqB9SVxZ2ri4DZUkgEu_WF_5_r_nZDIvfG8,73
+webscout-5.0.dist-info/top_level.txt,sha256=nYIw7OKBQDr_Z33IzZUKidRD3zQEo8jOJYkMVMeN334,9
+webscout-5.0.dist-info/RECORD,,