refactor: mcp server datastructure

pkg/api/http/controller/groups/resources/mcp.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import quart
+import traceback
 
 
 from ... import group
@@ -13,36 +14,18 @@ class MCPRouterGroup(group.RouterGroup):
         async def _() -> str:
             """获取MCP服务器列表"""
             if quart.request.method == 'GET':
-                servers = await self.ap.mcp_service.get_mcp_servers()
+                servers = await self.ap.mcp_service.get_mcp_servers(contain_runtime_info=True)
 
-                servers_with_status = []
-                # 获取MCP工具加载器
-                mcp_loader = self.ap.tool_mgr.mcp_tool_loader
-
-                for server in servers:
-                    # 从运行中的会话获取工具数量
-                    tools_count = 0
-                    if mcp_loader:
-                        session = mcp_loader.sessions.get(server['name'])
-                        if session:
-                            tools_count = len(session.functions)
-
-                    server_info = {
-                        **server,
-                        'tools': tools_count,
-                    }
-                    servers_with_status.append(server_info)
-
-                return self.success(data={'servers': servers_with_status})
+                return self.success(data={'servers': servers})
 
             elif quart.request.method == 'POST':
                 data = await quart.request.json
-                data = data['source']
 
                 try:
                     uuid = await self.ap.mcp_service.create_mcp_server(data)
                     return self.success(data={'uuid': uuid})
                 except Exception as e:
+                    traceback.print_exc()
                     return self.http_status(500, -1, f'Failed to create MCP server: {str(e)}')
 
         @self.route('/servers/<server_name>', methods=['GET', 'PUT', 'DELETE'], auth_type=group.AuthType.USER_TOKEN)

pkg/api/http/service/mcp.py

@@ -40,7 +40,6 @@ class RuntimeMCPServer:
         self.session = RuntimeMCPSession(
             self.mcp_server_entity.name, mixed_config, self.mcp_server_entity.enable, self.ap
         )
-        await self.session.initialize()
         await self.session.start()
 
     async def _test_mcp_server_task(self, task_context: taskmgr.TaskContext):
@@ -102,14 +101,29 @@ class MCPService:
     def __init__(self, ap: app.Application) -> None:
         self.ap = ap
 
-    async def get_mcp_servers(self) -> list[dict]:
+    async def get_mcp_servers(self, contain_runtime_info: bool = False) -> list[dict]:
         result = await self.ap.persistence_mgr.execute_async(sqlalchemy.select(persistence_mcp.MCPServer))
 
         servers = result.all()
-        return [self.ap.persistence_mgr.serialize_model(persistence_mcp.MCPServer, server) for server in servers]
+        serialized_servers = [
+            self.ap.persistence_mgr.serialize_model(persistence_mcp.MCPServer, server) for server in servers
+        ]
+        if contain_runtime_info:
+            for server in serialized_servers:
+                session = self.ap.tool_mgr.mcp_tool_loader.get_session(server['name'])
+
+                runtime_info = None
+
+                if session:
+                    runtime_info = session.get_runtime_info_dict()
+
+                server['runtime_info'] = runtime_info if runtime_info else None
+
+        return serialized_servers
 
     async def create_mcp_server(self, server_data: dict) -> str:
         server_data['uuid'] = str(uuid.uuid4())
+        print('server_data:', server_data)
         await self.ap.persistence_mgr.execute_async(sqlalchemy.insert(persistence_mcp.MCPServer).values(server_data))
 
         result = await self.ap.persistence_mgr.execute_async(