xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-07 06:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/mcp (#1746)

Browse Source 
* fix: mcp session cannot be enabled

* fix: error message

* perf: ui

* perf: ui

---------

Co-authored-by: Junyan Qin <rockchinq@gmail.com>
This commit is contained in:
Guanchao Wang
2025-11-04 22:02:40 +08:00
committed by GitHub
parent 9853eccd89
commit 1adaa93034
8 changed files with 117 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/api/http/service/mcp.py
View File

@@ -72,6 +72,7 @@ class MCPService:
)
old_server = result.first()
old_server_name = old_server.name if old_server else None
old_enable = old_server.enable if old_server else False
await self.ap.persistence_mgr.execute_async(
sqlalchemy.update(persistence_mcp.MCPServer)
@@ -80,18 +81,38 @@ class MCPService:
)
if self.ap.tool_mgr.mcp_tool_loader:
if old_server_name and old_server_name in self.ap.tool_mgr.mcp_tool_loader.sessions:
await self.ap.tool_mgr.mcp_tool_loader.remove_mcp_server(old_server_name)
new_enable = server_data.get('enable', False)
result = await self.ap.persistence_mgr.execute_async(
sqlalchemy.select(persistence_mcp.MCPServer).where(persistence_mcp.MCPServer.uuid == server_uuid)
)
updated_server = result.first()
if updated_server:
# convert entity to config dict
server_config = self.ap.persistence_mgr.serialize_model(persistence_mcp.MCPServer, updated_server)
task = asyncio.create_task(self.ap.tool_mgr.mcp_tool_loader.host_mcp_server(server_config))
self.ap.tool_mgr.mcp_tool_loader._hosted_mcp_tasks.append(task)
need_remove = old_server_name and old_server_name in self.ap.tool_mgr.mcp_tool_loader.sessions
need_start = new_enable
if old_enable and not new_enable:
if need_remove:
await self.ap.tool_mgr.mcp_tool_loader.remove_mcp_server(old_server_name)
elif not old_enable and new_enable:
result = await self.ap.persistence_mgr.execute_async(
sqlalchemy.select(persistence_mcp.MCPServer).where(persistence_mcp.MCPServer.uuid == server_uuid)
)
updated_server = result.first()
if updated_server:
server_config = self.ap.persistence_mgr.serialize_model(persistence_mcp.MCPServer, updated_server)
task = asyncio.create_task(self.ap.tool_mgr.mcp_tool_loader.host_mcp_server(server_config))
self.ap.tool_mgr.mcp_tool_loader._hosted_mcp_tasks.append(task)
elif old_enable and new_enable:
if need_remove:
await self.ap.tool_mgr.mcp_tool_loader.remove_mcp_server(old_server_name)
result = await self.ap.persistence_mgr.execute_async(
sqlalchemy.select(persistence_mcp.MCPServer).where(persistence_mcp.MCPServer.uuid == server_uuid)
)
updated_server = result.first()
if updated_server:
server_config = self.ap.persistence_mgr.serialize_model(persistence_mcp.MCPServer, updated_server)
task = asyncio.create_task(self.ap.tool_mgr.mcp_tool_loader.host_mcp_server(server_config))
self.ap.tool_mgr.mcp_tool_loader._hosted_mcp_tasks.append(task)
async def delete_mcp_server(self, server_uuid: str) -> None:
result = await self.ap.persistence_mgr.execute_async(

79
pkg/provider/tools/loaders/mcp.py
View File

@@ -43,7 +43,12 @@ class RuntimeMCPSession:
# connected: bool
status: MCPSessionStatus
last_test_error_message: str
_lifecycle_task: asyncio.Task | None
_shutdown_event: asyncio.Event
_ready_event: asyncio.Event
def __init__(self, server_name: str, server_config: dict, enable: bool, ap: app.Application):
self.server_name = server_name
@@ -56,7 +61,10 @@ class RuntimeMCPSession:
self.functions = []
self.status = MCPSessionStatus.CONNECTING
self.last_test_error_message = ''
self._lifecycle_task = None
self._shutdown_event = asyncio.Event()
self._ready_event = asyncio.Event()
async def _init_stdio_python_server(self):
server_params = StdioServerParameters(
@@ -89,10 +97,8 @@ class RuntimeMCPSession:
await self.session.initialize()
async def start(self):
if not self.enable:
return
async def _lifecycle_loop(self):
"""在后台任务中管理整个MCP会话的生命周期"""
try:
if self.server_config['mode'] == 'stdio':
await self._init_stdio_python_server()
@@ -104,11 +110,45 @@ class RuntimeMCPSession:
await self.refresh()
self.status = MCPSessionStatus.CONNECTED
self.last_test_error_message = ''
# 通知start()方法连接已建立
self._ready_event.set()
# 等待shutdown信号
await self._shutdown_event.wait()
except Exception as e:
self.status = MCPSessionStatus.ERROR
self.last_test_error_message = str(e)
raise e
self.ap.logger.error(f'Error in MCP session lifecycle {self.server_name}: {e}\n{traceback.format_exc()}')
# 即使出错也要设置ready事件，让start()方法知道初始化已完成
self._ready_event.set()
finally:
# 在同一个任务中清理所有资源
try:
if self.exit_stack:
await self.exit_stack.aclose()
self.functions.clear()
self.session = None
except Exception as e:
self.ap.logger.error(f'Error cleaning up MCP session {self.server_name}: {e}\n{traceback.format_exc()}')
async def start(self):
if not self.enable:
return
# 创建后台任务来管理生命周期
self._lifecycle_task = asyncio.create_task(self._lifecycle_loop())
# 等待连接建立或失败（带超时）
try:
await asyncio.wait_for(self._ready_event.wait(), timeout=30.0)
except asyncio.TimeoutError:
self.status = MCPSessionStatus.ERROR
raise Exception('Connection timeout after 30 seconds')
# 检查是否有错误
if self.status == MCPSessionStatus.ERROR:
raise Exception('Connection failed, please check URL')
async def refresh(self):
self.functions.clear()
@@ -143,7 +183,6 @@ class RuntimeMCPSession:
def get_runtime_info_dict(self) -> dict:
return {
'status': self.status.value,
'error_message': self.last_test_error_message,
'tool_count': len(self.get_tools()),
'tools': [
{
@@ -157,10 +196,22 @@ class RuntimeMCPSession:
async def shutdown(self):
"""关闭会话并清理资源"""
try:
if self.exit_stack:
await self.exit_stack.aclose()
self.functions.clear()
self.session = None
# 设置shutdown事件，通知lifecycle任务退出
self._shutdown_event.set()
# 等待lifecycle任务完成（带超时）
if self._lifecycle_task and not self._lifecycle_task.done():
try:
await asyncio.wait_for(self._lifecycle_task, timeout=5.0)
except asyncio.TimeoutError:
self.ap.logger.warning(f'MCP session {self.server_name} shutdown timeout, cancelling task')
self._lifecycle_task.cancel()
try:
await self._lifecycle_task
except asyncio.CancelledError:
pass
self.ap.logger.info(f'MCP session {self.server_name} shutdown complete')
except Exception as e:
self.ap.logger.error(f'Error shutting down MCP session {self.server_name}: {e}\n{traceback.format_exc()}')

2
web/src/app/home/plugins/mcp-server/mcp-card/MCPCardComponent.tsx
View File

@@ -134,7 +134,7 @@ export default function MCPCardComponent({
<div className="flex flex-row items-center gap-[0.4rem]">
<AlertCircle className="w-4 h-4 text-red-500 dark:text-red-400" />
<div className="text-sm text-red-500 dark:text-red-400 font-medium">
{t('mcp.connectionFailed')}
{t('mcp.connectionFailedStatus')}
</div>
</div>
)}

15
web/src/app/home/plugins/mcp-server/mcp-form/MCPFormDialog.tsx
View File

@@ -132,11 +132,11 @@ function StatusDisplay({
</svg>
<span className="font-medium">{t('mcp.connectionFailed')}</span>
</div>
{runtimeInfo.error_message && (
{/* {runtimeInfo.error_message && (
<div className="text-sm text-red-500 pl-7">
{runtimeInfo.error_message}
</div>
)}
)} */}
</div>
);
}
@@ -465,7 +465,7 @@ export default function MCPFormDialog({
</DialogHeader>
{isEditMode && runtimeInfo && (
<div className="mb-4 space-y-3">
<div className="mb-0 space-y-3">
{/* 测试中或连接失败时显示状态 */}
{(mcpTesting ||
runtimeInfo.status !== MCPSessionStatus.CONNECTED) && (
@@ -482,7 +482,14 @@ export default function MCPFormDialog({
{!mcpTesting &&
runtimeInfo.status === MCPSessionStatus.CONNECTED &&
runtimeInfo.tools?.length > 0 && (
<ToolsList tools={runtimeInfo.tools} />
<>
<div className="text-sm font-medium">
{t('mcp.toolCount', {
count: runtimeInfo.tools?.length || 0,
})}
</div>
<ToolsList tools={runtimeInfo.tools} />
</>
)}
</div>
)}

3
web/src/i18n/locales/en-US.ts
View File

@@ -342,7 +342,8 @@ const enUS = {
refreshSuccess: 'Refresh successful',
refreshFailed: 'Refresh failed: ',
connectionSuccess: 'Connection successful',
connectionFailed: 'Connection failed',
connectionFailed: 'Connection failed, please check URL',
connectionFailedStatus: 'Connection Failed',
toolsFound: 'tools',
unknownError: 'Unknown error',
noToolsFound: 'No tools found',

3
web/src/i18n/locales/ja-JP.ts
View File

@@ -343,7 +343,8 @@ const jaJP = {
refreshSuccess: '刷新に成功しました',
refreshFailed: '刷新に失敗しました：',
connectionSuccess: '接続に成功しました',
connectionFailed: '接続に失敗しました',
connectionFailed: '接続に失敗しました，URLを確認してください',
connectionFailedStatus: '接続失敗',
toolsFound: '個のツール',
unknownError: '不明なエラー',
noToolsFound: 'ツールが見つかりません',

3
web/src/i18n/locales/zh-Hans.ts
View File

@@ -328,7 +328,8 @@ const zhHans = {
refreshSuccess: '刷新成功',
refreshFailed: '刷新失败：',
connectionSuccess: '连接成功',
connectionFailed: '连接失败',
connectionFailed: '连接失败，请检查URL',
connectionFailedStatus: '连接失败',
toolsFound: '个工具',
unknownError: '未知错误',
noToolsFound: '未找到任何工具',

3
web/src/i18n/locales/zh-Hant.ts
View File

@@ -326,7 +326,8 @@ const zhHant = {
refreshSuccess: '刷新成功',
refreshFailed: '刷新失敗：',
connectionSuccess: '連接成功',
connectionFailed: '連接失敗',
connectionFailed: '連接失敗，請檢查URL',
connectionFailedStatus: '連接失敗',
toolsFound: '個工具',
unknownError: '未知錯誤',
noToolsFound: '未找到任何工具',