Update calculator/utils.py

calculator/utils.py

@@ -1,20 +1,17 @@
 import re
 
 def extract_operation(question):
-    # Simple regex to identify the operation
-    if "add" in question.lower():
-        return "add"
-    elif "subtract" in question.lower() or "minus" in question.lower():
-        return "subtract"
-    elif "multiply" in question.lower() or "times" in question.lower():
-        return "multiply"
-    elif "divide" in question.lower() or "over" in question.lower():
-        return "divide"
-    else:
-        return None
+    ops = {
+        "add": "add", "plus": "add", "+": "add",
+        "subtract": "subtract", "minus": "subtract", "-": "subtract",
+        "multiply": "multiply", "times": "multiply", "*": "multiply",
+        "divide": "divide", "over": "divide", "/": "divide"
+    }
+    for word in question.lower().split():
+        if word in ops:
+            return ops[word]
+    return None
 
 def extract_numbers(question):
-    # Extract all numbers from the question
-    numbers = re.findall(r"[-+]?\d*\.\d+|\d+", question)
-    numbers = [float(num) for num in numbers]
-    return numbers
+    return [float(n) for n in re.findall(r"[-+]?\d*\.\d+|\d+", question)]
+