Upload app.py

app.py

@@ -230,13 +230,15 @@ def query_financial_data(company_name, query_type):
         # 先搜索公司（使用 advanced_search_company）
         try:
             search_resp = session.post(
-                f"{MCP_URL}/message",
+                f"{MCP_URL}/gradio_api/mcp/",
                 json={
+                    "jsonrpc": "2.0",
                     "method": "tools/call",
                     "params": {
                         "name": "advanced_search_company",
                         "arguments": {"company_input": company_name}
-                    }
+                    },
+                    "id": 1
                 },
                 headers=HEADERS,
                 timeout=60  # 增加到60秒
@@ -275,13 +277,15 @@ def query_financial_data(company_name, query_type):
         # 根据查询类型获取数据
         if internal_query_type == "最新财务数据":
             data_resp = session.post(
-                f"{MCP_URL}/message",
+                f"{MCP_URL}/gradio_api/mcp/",
                 json={
+                    "jsonrpc": "2.0",
                     "method": "tools/call",
                     "params": {
                         "name": "get_latest_financial_data",
                         "arguments": {"cik": cik}
-                    }
+                    },
+                    "id": 1
                 },
                 headers=HEADERS,
                 timeout=60  # 增加到60秒
@@ -321,13 +325,15 @@ def query_financial_data(company_name, query_type):
         
         elif internal_query_type == "3年趋势":
             metrics_resp = session.post(
-                f"{MCP_URL}/message",
+                f"{MCP_URL}/gradio_api/mcp/",
                 json={
+                    "jsonrpc": "2.0",
                     "method": "tools/call",
                     "params": {
                         "name": "extract_financial_metrics",
                         "arguments": {"cik": cik, "years": 3}
-                    }
+                    },
+                    "id": 1
                 },
                 headers=HEADERS,
                 timeout=120  # 3年趋势需要更长时间，增加到120秒
@@ -403,13 +409,15 @@ def query_financial_data(company_name, query_type):
         
         elif internal_query_type == "5年趋势":
             metrics_resp = session.post(
-                f"{MCP_URL}/message",
+                f"{MCP_URL}/gradio_api/mcp/",
                 json={
+                    "jsonrpc": "2.0",
                     "method": "tools/call",
                     "params": {
                         "name": "extract_financial_metrics",
                         "arguments": {"cik": cik, "years": 5}
-                    }
+                    },
+                    "id": 1
                 },
                 headers=HEADERS,
                 timeout=180  # 5年趋势需要更长时间，增加到180秒
@@ -485,13 +493,15 @@ def query_financial_data(company_name, query_type):
         elif internal_query_type == "公司报表列表":
             # 查询公司所有报表
             filings_resp = session.post(
-                f"{MCP_URL}/message",
+                f"{MCP_URL}/gradio_api/mcp/",
                 json={
+                    "jsonrpc": "2.0",
                     "method": "tools/call",
                     "params": {
                         "name": "get_company_filings",
                         "arguments": {"cik": cik, "limit": 50}
-                    }
+                    },
+                    "id": 1
                 },
                 headers=HEADERS,
                 timeout=90  # 增加到90秒
@@ -545,14 +555,17 @@ def query_financial_data(company_name, query_type):
 def call_mcp_tool(tool_name, arguments):
     """调用 MCP 工具并返回结果"""
     try:
+        # Gradio MCP Server 使用 /gradio_api/mcp/ 端点
         response = session.post(
-            f"{MCP_URL}/message",
+            f"{MCP_URL}/gradio_api/mcp/",
             json={
+                "jsonrpc": "2.0",
                 "method": "tools/call",
                 "params": {
                     "name": tool_name,
                     "arguments": arguments
-                }
+                },
+                "id": 1
             },
             headers=HEADERS,
             timeout=60
@@ -593,9 +606,18 @@ Always be helpful, accurate, and cite the data sources when providing financial
         messages.append({"role": "system", "content": system_prompt})
         
         # 添加历史对话（最近 5 轮）
-        for user_msg, assistant_msg in history[-5:]:
-            messages.append({"role": "user", "content": user_msg})
-            messages.append({"role": "assistant", "content": assistant_msg})
+        # Gradio 6.x 的 history 格式可能是 [{"role": "user", "content": ...}, {"role": "assistant", "content": ...}]
+        # 或者是 [(user_msg, assistant_msg), ...] 的元组列表
+        if history:
+            for item in history[-5:]:
+                if isinstance(item, dict):
+                    # 新格式：字��列表
+                    messages.append(item)
+                elif isinstance(item, (list, tuple)) and len(item) == 2:
+                    # 旧格式：元组列表
+                    user_msg, assistant_msg = item
+                    messages.append({"role": "user", "content": user_msg})
+                    messages.append({"role": "assistant", "content": assistant_msg})
         
         # 添加当前消息
         messages.append({"role": "user", "content": message})