Update app.py

app.py

@@ -37,33 +37,40 @@ question_examples = [
 ]
 
 # === Helper: extract tool name from content
-def extract_tool_name_and_clean_content(raw_content):
+def extract_tool_name_and_clean_content(message_obj):
     import logging
     logging.basicConfig(level=logging.INFO)
 
-    if isinstance(raw_content, (dict, list)):
-        logging.info("[extract_tool_name] Content is dict/list — using default title.")
-        return "Tool Result", json.dumps(raw_content, indent=2)
-
-    if not isinstance(raw_content, str):
-        logging.info("[extract_tool_name] Content is not string — using default title.")
-        return "Tool Result", str(raw_content)
-
-    try:
-        if '"name": "' in raw_content:
-            start = raw_content.index('"name": "') + 9
-            end = raw_content.index('"', start)
-            tool_name = raw_content[start:end]
-            title = f"Tool: {tool_name}"
-            logging.info(f"[extract_tool_name] Parsed tool name: {tool_name}")
-        else:
-            title = "Tool Result"
-            logging.info("[extract_tool_name] No tool name found in content.")
-    except Exception as e:
-        title = "Tool Result"
-        logging.warning(f"[extract_tool_name] Failed to extract tool name: {e}")
-
-    return title, raw_content.strip()
+    tool_name = "Tool Result"
+    content = ""
+
+    if isinstance(message_obj, dict):
+        role = message_obj.get("role", "assistant")
+        content = message_obj.get("content", "")
+        tool_calls = message_obj.get("tool_calls", None)
+    else:
+        role = getattr(message_obj, "role", "assistant")
+        content = getattr(message_obj, "content", "")
+        tool_calls = getattr(message_obj, "tool_calls", None)
+
+    # Try to extract tool name from `tool_calls`
+    if tool_calls:
+        try:
+            if isinstance(tool_calls, str):
+                import json
+                tool_calls = json.loads(tool_calls)
+            tool_name = tool_calls[0].get("name", "Tool Result")
+            logging.info(f"[extract_tool_name] Extracted from tool_calls: {tool_name}")
+        except Exception as e:
+            logging.warning(f"[extract_tool_name] Failed tool_calls parsing: {e}")
+
+    # Format clean output
+    if isinstance(content, (dict, list)):
+        formatted = json.dumps(content, indent=2)
+    else:
+        formatted = str(content)
+
+    return f"Tool: {tool_name}", formatted
 
 
 # === Helper: formatted collapsible output