mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-23 15:06:50 +08:00
Fix: list MCP tools may block (#12067)
### What problem does this PR solve? List MCP tools may block. #12043 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
@ -13,6 +13,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
import asyncio
|
||||||
|
|
||||||
from quart import Response, request
|
from quart import Response, request
|
||||||
from api.apps import current_user, login_required
|
from api.apps import current_user, login_required
|
||||||
|
|
||||||
@ -106,7 +108,7 @@ async def create() -> Response:
|
|||||||
return get_data_error_result(message="Tenant not found.")
|
return get_data_error_result(message="Tenant not found.")
|
||||||
|
|
||||||
mcp_server = MCPServer(id=server_name, name=server_name, url=url, server_type=server_type, variables=variables, headers=headers)
|
mcp_server = MCPServer(id=server_name, name=server_name, url=url, server_type=server_type, variables=variables, headers=headers)
|
||||||
server_tools, err_message = get_mcp_tools([mcp_server], timeout)
|
server_tools, err_message = await asyncio.to_thread(get_mcp_tools, [mcp_server], timeout)
|
||||||
if err_message:
|
if err_message:
|
||||||
return get_data_error_result(err_message)
|
return get_data_error_result(err_message)
|
||||||
|
|
||||||
@ -158,7 +160,7 @@ async def update() -> Response:
|
|||||||
req["id"] = mcp_id
|
req["id"] = mcp_id
|
||||||
|
|
||||||
mcp_server = MCPServer(id=server_name, name=server_name, url=url, server_type=server_type, variables=variables, headers=headers)
|
mcp_server = MCPServer(id=server_name, name=server_name, url=url, server_type=server_type, variables=variables, headers=headers)
|
||||||
server_tools, err_message = get_mcp_tools([mcp_server], timeout)
|
server_tools, err_message = await asyncio.to_thread(get_mcp_tools, [mcp_server], timeout)
|
||||||
if err_message:
|
if err_message:
|
||||||
return get_data_error_result(err_message)
|
return get_data_error_result(err_message)
|
||||||
|
|
||||||
@ -242,7 +244,7 @@ async def import_multiple() -> Response:
|
|||||||
headers = {"authorization_token": config["authorization_token"]} if "authorization_token" in config else {}
|
headers = {"authorization_token": config["authorization_token"]} if "authorization_token" in config else {}
|
||||||
variables = {k: v for k, v in config.items() if k not in {"type", "url", "headers"}}
|
variables = {k: v for k, v in config.items() if k not in {"type", "url", "headers"}}
|
||||||
mcp_server = MCPServer(id=new_name, name=new_name, url=config["url"], server_type=config["type"], variables=variables, headers=headers)
|
mcp_server = MCPServer(id=new_name, name=new_name, url=config["url"], server_type=config["type"], variables=variables, headers=headers)
|
||||||
server_tools, err_message = get_mcp_tools([mcp_server], timeout)
|
server_tools, err_message = await asyncio.to_thread(get_mcp_tools, [mcp_server], timeout)
|
||||||
if err_message:
|
if err_message:
|
||||||
results.append({"server": base_name, "success": False, "message": err_message})
|
results.append({"server": base_name, "success": False, "message": err_message})
|
||||||
continue
|
continue
|
||||||
@ -322,7 +324,7 @@ async def list_tools() -> Response:
|
|||||||
tool_call_sessions.append(tool_call_session)
|
tool_call_sessions.append(tool_call_session)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
tools = tool_call_session.get_tools(timeout)
|
tools = await asyncio.to_thread(tool_call_session.get_tools, timeout)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
tools = []
|
tools = []
|
||||||
return get_data_error_result(message=f"MCP list tools error: {e}")
|
return get_data_error_result(message=f"MCP list tools error: {e}")
|
||||||
@ -340,7 +342,7 @@ async def list_tools() -> Response:
|
|||||||
return server_error_response(e)
|
return server_error_response(e)
|
||||||
finally:
|
finally:
|
||||||
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
||||||
close_multiple_mcp_toolcall_sessions(tool_call_sessions)
|
await asyncio.to_thread(close_multiple_mcp_toolcall_sessions, tool_call_sessions)
|
||||||
|
|
||||||
|
|
||||||
@manager.route("/test_tool", methods=["POST"]) # noqa: F821
|
@manager.route("/test_tool", methods=["POST"]) # noqa: F821
|
||||||
@ -367,10 +369,10 @@ async def test_tool() -> Response:
|
|||||||
|
|
||||||
tool_call_session = MCPToolCallSession(mcp_server, mcp_server.variables)
|
tool_call_session = MCPToolCallSession(mcp_server, mcp_server.variables)
|
||||||
tool_call_sessions.append(tool_call_session)
|
tool_call_sessions.append(tool_call_session)
|
||||||
result = tool_call_session.tool_call(tool_name, arguments, timeout)
|
result = await asyncio.to_thread(tool_call_session.tool_call, tool_name, arguments, timeout)
|
||||||
|
|
||||||
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
||||||
close_multiple_mcp_toolcall_sessions(tool_call_sessions)
|
await asyncio.to_thread(close_multiple_mcp_toolcall_sessions, tool_call_sessions)
|
||||||
return get_json_result(data=result)
|
return get_json_result(data=result)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return server_error_response(e)
|
return server_error_response(e)
|
||||||
@ -424,13 +426,13 @@ async def test_mcp() -> Response:
|
|||||||
tool_call_session = MCPToolCallSession(mcp_server, mcp_server.variables)
|
tool_call_session = MCPToolCallSession(mcp_server, mcp_server.variables)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
tools = tool_call_session.get_tools(timeout)
|
tools = await asyncio.to_thread(tool_call_session.get_tools, timeout)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
tools = []
|
tools = []
|
||||||
return get_data_error_result(message=f"Test MCP error: {e}")
|
return get_data_error_result(message=f"Test MCP error: {e}")
|
||||||
finally:
|
finally:
|
||||||
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
# PERF: blocking call to close sessions — consider moving to background thread or task queue
|
||||||
close_multiple_mcp_toolcall_sessions([tool_call_session])
|
await asyncio.to_thread(close_multiple_mcp_toolcall_sessions, [tool_call_session])
|
||||||
|
|
||||||
for tool in tools:
|
for tool in tools:
|
||||||
tool_dict = tool.model_dump()
|
tool_dict = tool.model_dump()
|
||||||
|
|||||||
Reference in New Issue
Block a user