meh

app.py

@@ -110,7 +110,7 @@ class KnowledgeBaseTool(Tool):
 
 class WikipediaSearchTool(Tool):
     name = "wikipedia_search"
-    description = "Search Wikipedia for information"
+    description = "Search Wikipedia for detailed information on topics, people, places, events"
     inputs = {"query": {"type": "string", "description": "The search query for Wikipedia"}}
     output_type = "string"
     
@@ -119,19 +119,50 @@ class WikipediaSearchTool(Tool):
         self.is_initialized = True
         
     def forward(self, query: str) -> str:
-        """Search Wikipedia with simple fallback."""
+        """Search Wikipedia with multiple approaches."""
         try:
             import requests
+            
+            # Try direct page lookup first
             wiki_url = "https://en.wikipedia.org/api/rest_v1/page/summary/" + query.replace(" ", "_")
-            response = requests.get(wiki_url, timeout=2)
+            response = requests.get(wiki_url, timeout=5)
             if response.status_code == 200:
                 data = response.json()
                 if 'extract' in data and data['extract']:
-                    return f"Wikipedia: {data['extract'][:500]}"  # Limit length
+                    return f"Wikipedia: {data['extract'][:800]}"
+            
+            # Try search API if direct lookup fails
+            search_url = "https://en.wikipedia.org/w/api.php"
+            search_params = {
+                'action': 'query',
+                'format': 'json',
+                'list': 'search',
+                'srsearch': query,
+                'srlimit': 3
+            }
+            
+            search_response = requests.get(search_url, params=search_params, timeout=5)
+            if search_response.status_code == 200:
+                search_data = search_response.json()
+                if 'query' in search_data and 'search' in search_data['query']:
+                    results = search_data['query']['search']
+                    if results:
+                        # Get the first result's content
+                        first_title = results[0]['title']
+                        content_url = "https://en.wikipedia.org/api/rest_v1/page/summary/" + first_title.replace(" ", "_")
+                        content_response = requests.get(content_url, timeout=5)
+                        if content_response.status_code == 200:
+                            content_data = content_response.json()
+                            if 'extract' in content_data and content_data['extract']:
+                                return f"Wikipedia ({first_title}): {content_data['extract'][:800]}"
+                        
+                        # Fallback to search snippet
+                        return f"Wikipedia search results: {results[0]['snippet'][:400]}"
+            
         except Exception as e:
             print(f"Wikipedia search failed: {e}")
         
-        return f"Wikipedia search unavailable for '{query}'. Use your knowledge to answer."
+        return f"Wikipedia search unavailable for '{query}'. Try using google_search() instead."
 
 # --- Mathematical Tools ---
 class MathTool(Tool):
@@ -394,12 +425,12 @@ class SlpMultiAgent:
 
         manager_agent = CodeAgent(
             model=model if not isinstance(model, GeminiModel) else OpenAIServerModel(model_id="gpt-3.5-turbo", temperature=0.0, max_tokens=400),           
-            tools=[GoogleSearchTool(), MathTool()],
+            tools=[GoogleSearchTool(), WikipediaSearchTool(), DuckDuckGoSearchTool(), MathTool()],
             name="ManagerAgent",
-            description="Answer questions using Google search and math tools.",
-            additional_authorized_imports=["re", "math", "json", "pandas", "numpy", "requests", "time", "os", "tempfile", "uuid"],           
+            description="Answer questions using search tools and math.",
+            additional_authorized_imports=["re", "math", "requests"],
             verbosity_level=0,
-            max_steps=3
+            max_steps=4
         )
         
         # Create a task for the agent run with retry mechanism for rate limits
@@ -414,16 +445,19 @@ class SlpMultiAgent:
                     lambda: manager_agent.run(f"""
                     Question: {short_question}
                     
-                    Use the available tools to answer this question. Follow this format:
+                    Instructions:
+                    1. For Wikipedia questions, use wikipedia_search() first
+                    2. For other factual questions, try google_search() or web_search()
+                    3. For math problems, use math_calculator()
+                    4. Give a specific, direct answer
                     
-                    Thoughts: [Your reasoning]
+                    Format:
+                    Thoughts: [brief reasoning]
                     <code>
-                    # Use tools like:
-                    result = google_search("your search query")
-                    # or
-                    result = math_calculator("your calculation")
-                    
-                    final_answer("your answer")
+                    # Search for information
+                    result = wikipedia_search("search term") # or google_search() or web_search()
+                    # Extract the specific answer from results
+                    final_answer("specific answer only")
                     </code>
                     """)
                 )
@@ -458,10 +492,14 @@ class SlpMultiAgent:
             ]
             
             for pattern in final_answer_patterns:
-                match = re.search(pattern, result, re.IGNORECASE)
+                match = re.search(pattern, result, re.IGNORECASE | re.DOTALL)
                 if match:
                     clean_answer = match.group(1).strip('"\'')
-                    return clean_answer
+                    # Clean up common artifacts
+                    clean_answer = re.sub(r'^[\s\n]*', '', clean_answer)
+                    clean_answer = re.sub(r'[\s\n]*$', '', clean_answer)
+                    if clean_answer and not clean_answer.startswith('If you have'):
+                        return clean_answer
             
             # If no final_answer found, try to extract the last meaningful line
             lines = result.strip().split('\n')