Update agent.py

agent.py

@@ -490,7 +490,7 @@ def get_llm(provider: str, config: dict):
 def planner(question: str, tools: list) -> list:
     question = question.lower().strip()
 
-    # Define general keywords for various intents (without hardcoding the tool names)
+    # Define intent-based keywords (broad categories)
     intent_keywords = {
         "math": ["calculate", "evaluate", "add", "subtract", "multiply", "divide", "modulus", "plus", "minus", "times"],
         "wiki_search": ["who is", "what is", "define", "explain", "tell me about", "overview of"],
@@ -505,22 +505,31 @@ def planner(question: str, tools: list) -> list:
 
     matched_tools = []
 
-    # Loop over tools and match based on descriptions
-    for tool in tools:
-        # Get tool description
-        tool_description = getattr(tool, "description", "").lower()
+    # Try to find tools whose description matches intent
+    for intent, keywords in intent_keywords.items():
+        if any(keyword in question for keyword in keywords):
+            for tool in tools:
+                description = getattr(tool, "description", "").lower()
+                name = getattr(tool, "name", "").lower()
 
-        # Check if any keywords match tool's description or if they fit general intent categories
-        for intent, keywords in intent_keywords.items():
-            if any(keyword in question for keyword in keywords) and intent in tool_description:
-                matched_tools.append(tool)
-                break  # No need to check other keywords for this tool once matched
+                # Match based on intent keywords appearing in tool description or name
+                if intent in description or intent in name:
+                    matched_tools.append(tool)
 
-    # If no matched tool found, fallback to general-purpose tools or default
+            # Break after first matching intent — you can remove this if you want to allow multi-intent matching
+            if matched_tools:
+                break
+
+    # Fallback 1: try using general-purpose tools if available
     if not matched_tools:
-        matched_tools = [tool for tool in tools if "default" in getattr(tool, "name", "").lower() or "qa" in getattr(tool, "description", "").lower()]
+        matched_tools = [
+            tool for tool in tools 
+            if "default" in getattr(tool, "name", "").lower() 
+            or "qa" in getattr(tool, "description", "").lower()
+        ]
 
-    return matched_tools if matched_tools else [tools[0]]  # Return the first tool as a last resort
+    # Fallback 2: return first tool to prevent failure
+    return matched_tools if matched_tools else [tools[0]]
 
 
 
@@ -572,9 +581,11 @@ def task_classifier(question: str) -> str:
 
 
 # Function to extract math operation from the question
+
 def extract_math_from_question(question: str):
     question = question.lower()
-    # Map word-based operations to symbols
+
+    # Map natural language to symbols
     ops = {
         "add": "+", "plus": "+",
         "subtract": "-", "minus": "-",
@@ -584,18 +595,29 @@ def extract_math_from_question(question: str):
     }
 
     for word, symbol in ops.items():
-        question = question.replace(word, symbol)
+        question = re.sub(rf"\b{word}\b", symbol, question)
 
-    # Match expressions like "4 + 5"
+    # Extract math expression like "12 + 5"
     match = re.search(r'(\d+)\s*([\+\-\*/%])\s*(\d+)', question)
     if match:
         num1 = int(match.group(1))
         operator = match.group(2)
         num2 = int(match.group(3))
-        return num1, operator, num2
+        return {
+            "a": num1,
+            "b": num2,
+            "operation": {
+                "+": "add",
+                "-": "subtract",
+                "*": "multiply",
+                "/": "divide",
+                "%": "modulus"
+            }[operator]
+        }
     return None
 
 
+
 # Example tool set (adjust these to match your actual tool names)
 tools = {
     "math": calc_tool,          # Example tool for math tasks