refactoring with help from Claude to remove duplicated code

tools/web_search.py

@@ -1,7 +1,31 @@
-from typing import Any, Optional
+from typing import Any, Optional, Callable, List
 from smolagents.tools import Tool
 import duckduckgo_search
 import googlesearch
+from functools import wraps
+
+def setup_search_dependency(package_name: str, import_func: Callable):
+    """Utility function to handle search dependency setup"""
+    try:
+        return import_func()
+    except ImportError as e:
+        raise ImportError(
+            f"You must install package `{package_name}` to run this tool: "
+            f"for instance run `pip install {package_name}`."
+        ) from e
+
+def handle_search_errors(func):
+    """Decorator to handle common search error cases"""
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        try:
+            results = func(*args, **kwargs)
+            if not results:
+                raise Exception("No results found! Try a less restrictive/shorter query.")
+            return results
+        except Exception as e:
+            return f"Error performing search: {str(e)}"
+    return wrapper
 
 class DuckDuckGoSearchTool(Tool):
     name = "web_search"
@@ -12,20 +36,19 @@ class DuckDuckGoSearchTool(Tool):
     def __init__(self, max_results=10, **kwargs):
         super().__init__()
         self.max_results = max_results
-        try:
-            from duckduckgo_search import DDGS
-        except ImportError as e:
-            raise ImportError(
-                "You must install package `duckduckgo_search` to run this tool: for instance run `pip install duckduckgo-search`."
-            ) from e
-        self.ddgs = DDGS(**kwargs)
+        self.ddgs = setup_search_dependency(
+            'duckduckgo-search',
+            lambda: duckduckgo_search.DDGS(**kwargs)
+        )
 
+    @handle_search_errors
     def forward(self, query: str) -> str:
         results = self.ddgs.text(query, max_results=self.max_results)
-        if len(results) == 0:
-            raise Exception("No results found! Try a less restrictive/shorter query.")
-        postprocessed_results = [f"[{result['title']}]({result['href']})\n{result['body']}" for result in results]
-        return "## Search Results\n\n" + "\n\n".join(postprocessed_results)
+        formatted_results = [
+            f"[{result['title']}]({result['href']})\n{result['body']}" 
+            for result in results
+        ]
+        return "## Search Results\n\n" + "\n\n".join(formatted_results)
 
 class GoogleSearchTool(Tool):
     name = "google_search"
@@ -36,24 +59,16 @@ class GoogleSearchTool(Tool):
     def __init__(self, max_results=10, **kwargs):
         super().__init__()
         self.max_results = max_results
-        try:
-            from googlesearch import search
-        except ImportError as e:
-            raise ImportError(
-                "You must install package `googlesearch-python` to run this tool: for instance run `pip install googlesearch-python`."
-            ) from e
-        self.search = search
+        self.search = setup_search_dependency(
+            'googlesearch-python',
+            lambda: googlesearch.search
+        )
 
+    @handle_search_errors
     def forward(self, query: str) -> str:
-        results = []
-        try:
-            # Get search results (URLs only)
-            search_results = list(self.search(query, num_results=self.max_results))
-            
-            # If no results found
-            if len(search_results) == 0:
-                raise Exception("No results found! Try a less restrictive/shorter query.")
-            
-            return "## Search Results\n\n" + "\n\n".join([f"[Result {i+1}]({url})\n{url}" for i, url in enumerate(search_results)])
-        except Exception as e:
-            return f"Error performing search: {str(e)}"
+        search_results = list(self.search(query, num_results=self.max_results))
+        formatted_results = [
+            f"[Result {i+1}]({url})\n{url}" 
+            for i, url in enumerate(search_results)
+        ]
+        return "## Search Results\n\n" + "\n\n".join(formatted_results)