Update app.py

app.py

@@ -42,35 +42,19 @@ question_examples = [
 
 # === Extract tool name and format output
 def extract_tool_name_and_clean_content(msg):
-    import re
-
-    tool_name = "Tool Result"
-    content = msg.get("content") if isinstance(msg, dict) else getattr(msg, "content", "")
-    tool_calls = msg.get("tool_calls") if isinstance(msg, dict) else getattr(msg, "tool_calls", None)
-
-    # Try to extract tool name from tool_calls JSON
-    if tool_calls:
-        try:
-            if isinstance(tool_calls, str):
-                tool_calls = json.loads(tool_calls)
-            if isinstance(tool_calls, list) and tool_calls:
-                tool_name = tool_calls[0].get("name", "Tool Result")
-        except Exception as e:
-            logging.warning(f"[extract_tool_name] Failed tool_calls parsing: {e}")
-
-    # Try fallback: extract from [TOOL_CALLS] JSON inside raw content
-    if "TOOL_CALLS" in str(content):
-        try:
-            match = re.search(r"\[TOOL_CALLS\](\[.*?\])", str(content))
-            if match:
-                embedded = json.loads(match.group(1))
-                if isinstance(embedded, list) and embedded:
-                    tool_name = embedded[0].get("name", "Tool Result")
-        except Exception as e:
-            logging.warning(f"[extract_tool_name] Failed TOOL_CALLS content parse: {e}")
+    content_raw = msg.get("content") if isinstance(msg, dict) else getattr(msg, "content", "")
+    
+    try:
+        parsed = json.loads(content_raw)
+        tool_name = parsed.get("tool_name", "Tool Result")
+        content = parsed.get("content", "")
+    except Exception:
+        tool_name = "Tool Result"
+        content = content_raw
 
     if isinstance(content, (dict, list)):
         content = json.dumps(content, indent=2)
+
     return f"Tool: {tool_name}", content
 
 # === Format answer in collapsible box