Update app.py

app.py

@@ -13,6 +13,7 @@ from smolagents import (
     CodeAgent,
     HfApiModel,
     Tool,
+    GoogleSearchTool
 )
 from smolagents.agent_types import (
     AgentAudio,
@@ -35,103 +36,10 @@ from scripts.text_web_browser import (
 from scripts.visual_qa import visualizer
 
 
-class GoogleSearchTool(Tool):
-    name = "web_search"
-    description = """Performs a google web search for your query then returns a string of the top search results."""
-    inputs = {
-        "query": {"type": "string", "description": "The search query to perform."},
-        "filter_year": {
-            "type": "integer",
-            "description": "Optionally restrict results to a certain year",
-            "nullable": True,
-        },
-    }
-    output_type = "string"
-
-    def __init__(self):
-        super().__init__(self)
-        import os
-
-        self.serpapi_key = os.getenv("SERPER_API_KEY")
-
-    def forward(self, query: str, filter_year: Optional[int] = None) -> str:
-        import requests
-
-        if self.serpapi_key is None:
-            raise ValueError(
-                "Missing SerpAPI key. Make sure you have 'SERPER_API_KEY' in your env variables."
-            )
-
-        params = {
-            "engine": "google",
-            "q": query,
-            "api_key": self.serpapi_key,
-            "google_domain": "google.com",
-        }
-
-        headers = {"X-API-KEY": self.serpapi_key, "Content-Type": "application/json"}
-
-        if filter_year is not None:
-            params["tbs"] = (
-                f"cdr:1,cd_min:01/01/{filter_year},cd_max:12/31/{filter_year}"
-            )
-
-        response = requests.request(
-            "POST",
-            "https://google.serper.dev/search",
-            headers=headers,
-            data=json.dumps(params),
-        )
+web_search = GoogleSearchTool(provider="serper")
+
+print(web_search(query="Donald Trump news"))
 
-        if response.status_code == 200:
-            results = response.json()
-        else:
-            raise ValueError(response.json())
-
-        if "organic" not in results.keys():
-            print("REZZZ", results.keys())
-            if filter_year is not None:
-                raise Exception(
-                    f"No results found for query: '{query}' with filtering on year={filter_year}. Use a less restrictive query or do not filter on year."
-                )
-            else:
-                raise Exception(
-                    f"No results found for query: '{query}'. Use a less restrictive query."
-                )
-        if len(results["organic"]) == 0:
-            year_filter_message = (
-                f" with filter year={filter_year}" if filter_year is not None else ""
-            )
-            return f"No results found for '{query}'{year_filter_message}. Try with a more general query, or remove the year filter."
-
-        web_snippets = []
-        if "organic" in results:
-            for idx, page in enumerate(results["organic"]):
-                date_published = ""
-                if "date" in page:
-                    date_published = "\nDate published: " + page["date"]
-
-                source = ""
-                if "source" in page:
-                    source = "\nSource: " + page["source"]
-
-                snippet = ""
-                if "snippet" in page:
-                    snippet = "\n" + page["snippet"]
-
-                redacted_version = f"{idx}. [{page['title']}]({page['link']}){date_published}{source}\n{snippet}"
-
-                redacted_version = redacted_version.replace(
-                    "Your browser can't play this video.", ""
-                )
-                web_snippets.append(redacted_version)
-
-        return "## Search Results\n" + "\n\n".join(web_snippets)
-
-
-# web_search = GoogleSearchTool()
-
-# print(web_search(query="Donald Trump news"))
 # quit()
 AUTHORIZED_IMPORTS = [
     "requests",
@@ -188,7 +96,7 @@ ti_tool = TextInspectorTool(model, text_limit)
 browser = SimpleTextBrowser(**BROWSER_CONFIG)
 
 WEB_TOOLS = [
-    GoogleSearchTool(),
+    web_search,
     VisitTool(browser),
     PageUpTool(browser),
     PageDownTool(browser),