Update app.py

app.py

@@ -110,7 +110,7 @@ class KnowledgeBaseTool(Tool):
 
 class WikipediaSearchTool(Tool):
     name = "wikipedia_search"
-    description = "Search Wikipedia for detailed information on topics, people, places, events"
+    description = "Search Wikipedia for information"
     inputs = {"query": {"type": "string", "description": "The search query for Wikipedia"}}
     output_type = "string"
     
@@ -119,50 +119,19 @@ class WikipediaSearchTool(Tool):
         self.is_initialized = True
         
     def forward(self, query: str) -> str:
-        """Search Wikipedia with multiple approaches."""
+        """Search Wikipedia with simple fallback."""
         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=5)
+            response = requests.get(wiki_url, timeout=2)
             if response.status_code == 200:
                 data = response.json()
                 if 'extract' in data and data['extract']:
-                    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]}"
-            
+                    return f"Wikipedia: {data['extract'][:500]}"  # Limit length
         except Exception as e:
             print(f"Wikipedia search failed: {e}")
         
-        return f"Wikipedia search unavailable for '{query}'. Try using google_search() instead."
+        return f"Wikipedia search unavailable for '{query}'. Use your knowledge to answer."
 
 # --- Mathematical Tools ---
 class MathTool(Tool):
@@ -404,10 +373,10 @@ class SlpMultiAgent:
         
         # Simplified research agent
         research_agent = CodeAgent(
-            tools=[GoogleSearchTool(), KnowledgeBaseTool()],
+            tools=[GoogleSearchTool(), KnowledgeBaseTool(), WikipediaSearchTool(),WebScrapeTool()],
             model=model if not isinstance(model, GeminiModel) else OpenAIServerModel(model_id="gpt-3.5-turbo", temperature=0.0, max_tokens=400),
-            additional_authorized_imports=["re", "json"],
-            max_steps=5,
+            additional_authorized_imports=["re", "math", "json", "pandas", "numpy", "requests", "time", "os", "tempfile", "uuid"],
+            max_steps=2,
             name="ResearchAgent",
             verbosity_level=0,
             description="Simple research with Google Search."
@@ -416,21 +385,28 @@ class SlpMultiAgent:
         solver_agent = CodeAgent(
             tools=[MathTool(), GoogleSearchTool()],
             model=model if not isinstance(model, GeminiModel) else OpenAIServerModel(model_id="gpt-3.5-turbo", temperature=0.0, max_tokens=400),
-            additional_authorized_imports=["math", "re"],
-            max_steps=5,
+            additional_authorized_imports=["re", "math", "json", "pandas", "numpy", "requests", "time", "os", "tempfile", "uuid"],
+            max_steps=2,
             name="SolverAgent",
             verbosity_level=0,
             description="Simple problem solving with math and search."
         )
 
         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(), WikipediaSearchTool(), MathTool()],
+            model=OpenAIServerModel(
+                model_id="gpt-3.5-turbo",
+                temperature=0.0,
+                max_tokens=500
+            ),
+            tools=[GoogleSearchTool(), MathTool(), FileProcessorTool(), KnowledgeBaseTool(), WikipediaSearchTool(),WebScrapeTool()],
+            managed_agents=[research_agent, solver_agent],
             name="ManagerAgent",
-            description="Answer questions using Google search, Wikipedia, and math.",
-            additional_authorized_imports=["re", "math", "requests"],
+            description="Manager with comprehensive tool access and agent coordination.",
+            additional_authorized_imports=["re", "math", "json", "pandas", "numpy", "requests", "time", "os", "tempfile", "uuid"],
+            planning_interval=1,
             verbosity_level=0,
-            max_steps=6
+            max_steps=2,
+            final_answer_checks=[check_reasoning]
         )
         
         # Create a task for the agent run with retry mechanism for rate limits
@@ -445,22 +421,35 @@ class SlpMultiAgent:
                     lambda: manager_agent.run(f"""
                     Question: {short_question}
                     
-                    Answer this question by:
-                    1. Using wikipedia_search() for Wikipedia questions
-                    2. Using google_search() for other factual questions  
-                    3. Using math_calculator() for calculations
-                    4. Extracting the specific answer from search results
-                    5. Calling final_answer() with ONLY the answer
+                    CRITICAL INSTRUCTIONS:
+                    1. Use tools DIRECTLY, not in code execution
+                    2. For factual questions: Use google_search() tool immediately
+                    3. For math: Use math_calculator() tool directly
+                    4. DO NOT write complex code - use tools instead
+                    5. DO NOT call ResearchAgent() or SolverAgent() in code
+                    
+                    Available tools:
+                    - google_search(query): Search the web
+                    - math_calculator(expression): Calculate math
+                    - file_processor(action, data): Handle files
+                    - knowledge_base(topic): Get knowledge
+                    
+                    SIMPLE APPROACH:
+                    - Call the appropriate tool
+                    - Get the result
+                    - Provide final_answer()
                     
-                    Example:
-                    Thoughts: Need to search for information about X
+                    Example for factual question:
+                    1. Call google_search("your query")
+                    2. Extract answer from results
+                    3. Call final_answer("the answer")
+                    
+                    NO complex code execution. Use tools directly.
+                    
+                    ALWAYS end with:
                     <code>
-                    search_result = wikipedia_search("search term")
-                    # Extract specific answer from search_result
-                    final_answer("just the answer")
+                    final_answer("your answer here")
                     </code>
-                    
-                    IMPORTANT: final_answer() should contain ONLY the direct answer, not explanations.
                     """)
                 )
                 break  # Success, exit retry loop
@@ -484,41 +473,12 @@ class SlpMultiAgent:
         
         # Extract clean answer from result
         if result and isinstance(result, str):
-            # Look for final_answer pattern - more flexible regex
+            # Look for final_answer pattern
             import re
-            
-            # First try to find final_answer calls
-            final_answer_patterns = [
-                r'final_answer\(["\']([^"\']*)["\'\)]',
-                r'final_answer\("([^"]*)",?\)',
-                r'final_answer\(\'([^\']*)\',?\)',
-                r'final_answer\(([^)]+)\)'
-            ]
-            
-            for pattern in final_answer_patterns:
-                match = re.search(pattern, result, re.IGNORECASE | re.DOTALL)
-                if match:
-                    clean_answer = match.group(1).strip('"\'')
-                    clean_answer = re.sub(r'^[\s\n]*', '', clean_answer)
-                    clean_answer = re.sub(r'[\s\n]*$', '', clean_answer)
-                    if clean_answer and len(clean_answer) > 0 and not clean_answer.startswith('If you have'):
-                        return clean_answer
-            
-            # If no final_answer found, try to extract from the end of the result
-            if result:
-                # Remove code blocks and common artifacts
-                cleaned = re.sub(r'</code>.*$', '', result, flags=re.DOTALL)
-                cleaned = re.sub(r'<code>.*?</code>', '', cleaned, flags=re.DOTALL)
-                cleaned = re.sub(r'```.*?```', '', cleaned, flags=re.DOTALL)
-                
-                # Get the last meaningful line
-                lines = cleaned.strip().split('\n')
-                for line in reversed(lines):
-                    line = line.strip()
-                    if (line and not line.startswith('#') and not line.startswith('Thoughts:') 
-                        and not line.startswith('•') and len(line) < 200 
-                        and not line.startswith('If you have')):
-                        return line
+            final_answer_match = re.search(r'final_answer\(["\']([^"\']*)["\'\)]', result)  # Fixed regex
+            if final_answer_match:
+                clean_answer = final_answer_match.group(1)
+                return clean_answer
             
             # If no final_answer found, try to extract the last meaningful line
             lines = result.strip().split('\n')