Update app.py

app.py

@@ -89,10 +89,13 @@ TOOLS = [
     }
 ]
 
-def call_mcp_tool(tool_name, parameters):
-    """Call MCP tool via JSON-RPC protocol"""
+def call_mcp_tool(tool_name, parameters, timeout=60):
+    """
+    Call MCP tool via Streamable HTTP (SSE).
+    Extracts JSON responses from 'data:' events.
+    Returns parsed JSON dict.
+    """
     try:
-        # MCP uses JSON-RPC 2.0 protocol
         payload = {
             "jsonrpc": "2.0",
             "id": 1,
@@ -103,19 +106,54 @@ def call_mcp_tool(tool_name, parameters):
             }
         }
         
-        response = requests.post(MCP_URL, json=payload, timeout=60)
-        response.raise_for_status()
-        result = response.json()
+        response = requests.post(
+            MCP_URL,
+            json=payload,
+            headers={
+                "Content-Type": "application/json",
+                "Accept": "application/json, text/event-stream"
+            },
+            timeout=timeout,
+            stream=False
+        )
         
-        # Extract result from JSON-RPC response
-        if "result" in result:
-            return result["result"]
-        elif "error" in result:
-            return {"error": result["error"]}
-        else:
+        if response.status_code != 200:
+            return {"error": f"HTTP {response.status_code}: {response.text}"}
+        
+        # Parse SSE chunks
+        data_events = []
+        for line in response.text.splitlines():
+            line = line.strip()
+            if line.startswith("data:"):
+                json_str = line.replace("data:", "").strip()
+                try:
+                    data_events.append(json.loads(json_str))
+                except json.JSONDecodeError:
+                    pass  # skip invalid chunks
+        
+        if not data_events:
+            return {"error": "No valid JSON data events found in SSE response"}
+        
+        # Return the final event (most tools return a single event)
+        final_result = data_events[-1]
+        
+        # Extract content from result
+        if "result" in final_result:
+            result = final_result["result"]
+            # Extract text content if available
+            if isinstance(result, dict) and "content" in result:
+                content = result["content"]
+                if isinstance(content, list) and len(content) > 0:
+                    if content[0].get("type") == "text":
+                        return {"output": content[0].get("text", "")}
             return result
+        
+        return final_result
+        
+    except requests.exceptions.Timeout:
+        return {"error": "Request timeout"}
     except Exception as e:
-        return {"error": str(e)}
+        return {"error": f"MCP call failed: {str(e)}"}
 
 def process_tool_calls(tool_calls):
     """Process tool calls and return results"""
@@ -132,11 +170,21 @@ def process_tool_calls(tool_calls):
                     pass
             
             result = call_mcp_tool(func_name, func_args)
+            
+            # Format result for display
+            result_text = ""
+            if "error" in result:
+                result_text = f"❌ Error: {result['error']}"
+            elif "output" in result:
+                result_text = result["output"]
+            else:
+                result_text = json.dumps(result, ensure_ascii=False, indent=2)
+            
             results.append({
                 "tool_call_id": tool_call.get("id", "call_0"),
                 "role": "tool",
                 "name": func_name,
-                "content": json.dumps(result, ensure_ascii=False)
+                "content": result_text
             })
     return results