Update app.py

app.py

@@ -373,27 +373,35 @@ def summarise_tool(query: str) -> str:
         return f"摘要錯誤: {e}"
         
 def _calc_tool(query: str) -> str:
+    import math
     try:
-        # 嘗試先判斷是不是「單純的數學算式」
-        cleaned = query.lower().replace(" ", "")
-        math_symbols = set("0123456789+-*/().%")
-        formula_keywords = ["sin", "cos", "tan", "log", "sqrt", "exp", "^"]
-
-        is_formula = all(c in math_symbols or any(fn in cleaned for fn in formula_keywords) for c in cleaned)
-
-        if is_formula:
-            # ✅ 嘗試用 numexpr 處理
-            expression = query.replace("^", "**")  # 支援 3^2 寫法
-            result = ne.evaluate(expression)
+        # ✅ 優先處理純算式（只有數字與符號）
+        if re.fullmatch(r"[0-9\.\+\-\*/%\^\(\)\s]+", query.strip()):
+            cleaned = query.strip().replace("^", "**")
+            result = ne.evaluate(cleaned)
             return f"The result is: {result}"
-        else:
-            # ✅ 自然語言形式 → GPT 回答
+
+        # ✅ 對有 sin/cos/log/sqrt 的輸入，自動加 radians 並用 eval 處理
+        expr = query.lower()
+        expr = re.sub(r'sin\(([^)]+)\)', r'sin(math.radians(\1))', expr)
+        expr = re.sub(r'cos\(([^)]+)\)', r'cos(math.radians(\1))', expr)
+        expr = re.sub(r'tan\(([^)]+)\)', r'tan(math.radians(\1))', expr)
+        expr = expr.replace("^", "**")
+
+        result = eval(expr, {"__builtins__": None}, {
+            "math": math, "sin": math.sin, "cos": math.cos, "tan": math.tan,
+            "log": math.log10, "sqrt": math.sqrt, "exp": math.exp,
+            "pi": math.pi, "e": math.e
+        })
+        return f"The result is: {result}"
+    
+    except Exception:
+        # ✅ fallback：若 eval 也無法處理，交給 GPT 幫忙自然語言理解與回覆
+        try:
             response = llm_gpt4.invoke(query)
-            if isinstance(response, AIMessage):
-                response = response.content
-            return response
-    except Exception as e:
-        return f"Calculation error: {e}"
+            return response.content if isinstance(response, AIMessage) else response
+        except Exception as e:
+            return f"Natural language math error: {e}"
         
 @tool("python_calc")
 def python_calc_tool(query: str) -> str:
@@ -491,7 +499,7 @@ router_task = Task(
 Based on the user's query, decide which agent or tool is best suited to handle it:
 - If the query is related to the content of an uploaded file (e.g., 'what is this document about?'), send it to the **Document QA Agent**.
 - If the query contains words like 'summarize', 'summary', or 'main points', use the **Summarizer Agent**.
-- If the query involves numbers, calculations, or logic (e.g., '50 * 23 - 5', 'what is 10% of 800'), send it to the **Math Agent**.
+- If the query involves any kind of math, calculation, percentage, angle, log, sqrt, cos, sin, arithmetic expressions, or includes phrases like "how much", "calculate", "what is X + Y", send it to the **Math Agent**.
 - If the user uploaded a CSV file and asks about table content, data trends, or uses words like 'data', 'table', 'csv', 'column', or 'row', send it to the **CSV Agent**.
 - If the user asks about current events, trending topics, or online information (e.g., 'What is LangChain?', 'latest news'), send it to the **Search Agent**.
 - If the query is about current date, time, or day of week (e.g., 'what is today\\'s date?', 'what time is it?', 'what day is it?'), send it to the **Search Agent** instead of the General Agent.