Update tools.py

tools.py

@@ -31,57 +31,31 @@ def search_wikipedia(query: str) -> str:
         return "\n".join([r['title'] for r in results])
     return "No search results found."
 
-# ✅ Actual tools expecting dict inputs
 class WikipediaTool(Tool):
     name = "WikipediaTool"
-    description = "Fetches plain text from a Wikipedia article. Input should be the article title."
+    description = "Fetches plain text from a Wikipedia article. Input should be the article title as a string."
     inputs = {"query": "string"}
     output_type = "string"
 
-    def __call__(self, inputs: dict) -> str:
-        return fetch_wikipedia_article(inputs["query"])
-
-class WikipediaSearchTool(Tool):
-    name = "WikipediaSearchTool"
-    description = "Searches Wikipedia for article titles related to a query. Input should be a question or topic."
-    inputs = {"query": "string"}
-    output_type = "string"
-
-    def __call__(self, inputs: dict) -> str:
-        return search_wikipedia(inputs["query"])
-
-# ✅ Wrapper Tools (these are called by CodeAgent)
-class WikipediaToolWrapper(Tool):
-    name = "WikipediaToolWrapper"
-    description = WikipediaTool.description
-    inputs = {"query": "string"}
-    output_type = "string"
-
-    def __init__(self):
-        self.tool = WikipediaTool()
-
-    def __call__(self, inputs: dict) -> str:
+    def __call__(self, inputs) -> str:
         if isinstance(inputs, str):
             inputs = {"query": inputs}
         elif isinstance(inputs, dict) and "query" not in inputs:
             inputs = {"query": next(iter(inputs.values()))}
-        return self.tool(inputs)
+        return fetch_wikipedia_article(inputs["query"])
 
-class WikipediaSearchToolWrapper(Tool):
-    name = "WikipediaSearchToolWrapper"
-    description = WikipediaSearchTool.description
+class WikipediaSearchTool(Tool):
+    name = "WikipediaSearchTool"
+    description = "Searches Wikipedia for article titles. Input should be a question or topic as a string."
     inputs = {"query": "string"}
     output_type = "string"
 
-    def __init__(self):
-        self.tool = WikipediaSearchTool()
-
-    def __call__(self, inputs: dict) -> str:
+    def __call__(self, inputs) -> str:
         if isinstance(inputs, str):
             inputs = {"query": inputs}
         elif isinstance(inputs, dict) and "query" not in inputs:
             inputs = {"query": next(iter(inputs.values()))}
-        return self.tool(inputs)
+        return search_wikipedia(inputs["query"])