Feat: Scratch MCP tool calling support. (#8263)

### What problem does this PR solve?

This is a cherry-pick from #7781 as requested.

### Type of change

- [x] New Feature (non-breaking change which adds functionality)

Co-authored-by: Kevin Hu <kevinhu.sh@gmail.com>
This commit is contained in:
Song Fuchang
2025-06-23 17:45:35 +08:00
committed by GitHub
parent e9c6891e24
commit fd7ac17605
14 changed files with 445 additions and 7 deletions

107
api/apps/mcp_server_app.py Normal file
View File

@ -0,0 +1,107 @@
from flask import Response, request
from flask_login import current_user, login_required
from api.db.db_models import MCPServer
from api.db.services.mcp_server_service import MCPServerService
from api.db.services.user_service import TenantService
from api.settings import RetCode
from api.utils import get_uuid
from api.utils.api_utils import get_data_error_result, get_json_result, server_error_response, validate_request
@manager.route("/list", methods=["GET"]) # noqa: F821
@login_required
def get_list() -> Response:
try:
return get_json_result(data=MCPServerService.get_servers(current_user.id) or [])
except Exception as e:
return server_error_response(e)
@manager.route("/get_multiple", methods=["POST"]) # noqa: F821
@login_required
@validate_request("id_list")
def get_multiple() -> Response:
req = request.json
try:
return get_json_result(data=MCPServerService.get_servers(current_user.id, id_list=req["id_list"]) or [])
except Exception as e:
return server_error_response(e)
@manager.route("/get/<ms_id>", methods=["GET"]) # noqa: F821
@login_required
def get(ms_id: str) -> Response:
try:
mcp_server = MCPServerService.get_or_none(id=ms_id, tenant_id=current_user.id)
if mcp_server is None:
return get_json_result(code=RetCode.NOT_FOUND, data=None)
return get_json_result(data=mcp_server.to_dict())
except Exception as e:
return server_error_response(e)
@manager.route("/create", methods=["POST"]) # noqa: F821
@login_required
@validate_request("name", "url", "server_type")
def create() -> Response:
req = request.json
try:
req["id"] = get_uuid()
req["tenant_id"] = current_user.id
e, _ = TenantService.get_by_id(current_user.id)
if not e:
return get_data_error_result(message="Tenant not found.")
if not req.get("headers"):
req["headers"] = {}
if not MCPServerService.insert(**req):
return get_data_error_result()
return get_json_result(data={"id": req["id"]})
except Exception as e:
return server_error_response(e)
@manager.route("/update", methods=["POST"]) # noqa: F821
@login_required
@validate_request("id", "name", "url", "server_type")
def update() -> Response:
req = request.json
if not req.get("headers"):
req["headers"] = {}
try:
req["tenant_id"] = current_user.id
if not MCPServerService.filter_update([MCPServer.id == req["id"], MCPServer.tenant_id == req["tenant_id"]], req):
return get_data_error_result()
return get_json_result(data={"id": req["id"]})
except Exception as e:
return server_error_response(e)
@manager.route("/rm", methods=["POST"]) # noqa: F821
@login_required
@validate_request("id")
def rm() -> Response:
req = request.json
ms_id = req["id"]
try:
req["tenant_id"] = current_user.id
if not MCPServerService.filter_delete([MCPServer.id == ms_id, MCPServer.tenant_id == req["tenant_id"]]):
return get_data_error_result()
return get_json_result(data={"id": req["id"]})
except Exception as e:
return server_error_response(e)

View File

@ -104,4 +104,9 @@ class CanvasType(StrEnum):
ChatBot = "chatbot"
DocBot = "docbot"
class MCPServerType(StrEnum):
SSE = "sse"
StreamableHttp = "streamable-http"
KNOWLEDGEBASE_FOLDER_NAME=".knowledgebase"

View File

@ -799,6 +799,20 @@ class UserCanvasVersion(DataBaseModel):
db_table = "user_canvas_version"
class MCPServer(DataBaseModel):
id = CharField(max_length=32, primary_key=True)
name = CharField(max_length=255, null=False, help_text="MCP Server name")
tenant_id = CharField(max_length=32, null=False, index=True)
url = CharField(max_length=2048, null=False, help_text="MCP Server URL")
server_type = CharField(max_length=32, null=False, help_text="MCP Server type")
description = TextField(null=True, help_text="MCP Server description")
variables = JSONField(null=True, default=[], help_text="MCP Server variables")
headers = JSONField(null=True, default={}, help_text="MCP Server additional request headers")
class Meta:
db_table = "mcp_server"
class Search(DataBaseModel):
id = CharField(max_length=32, primary_key=True)
avatar = TextField(null=True, help_text="avatar base64 string")
@ -934,3 +948,7 @@ def migrate_db():
migrate(migrator.add_column("llm", "is_tools", BooleanField(null=False, help_text="support tools", default=False)))
except Exception:
pass
try:
migrate(migrator.add_column("mcp_server", "variables", JSONField(null=True, help_text="MCP Server variables", default=[])))
except Exception:
pass

View File

@ -0,0 +1,61 @@
#
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
from api.db.db_models import DB, MCPServer
from api.db.services.common_service import CommonService
class MCPServerService(CommonService):
"""Service class for managing MCP server related database operations.
This class extends CommonService to provide specialized functionality for MCP server management,
including MCP server creation, updates, and deletions.
Attributes:
model: The MCPServer model class for database operations.
"""
model = MCPServer
@classmethod
@DB.connection_context()
def get_servers(cls, tenant_id: str, id_list: list[str] | None = None):
"""Retrieve all MCP servers associated with a tenant.
This method fetches all MCP servers for a given tenant, ordered by creation time.
It only includes fields for list display.
Args:
tenant_id (str): The unique identifier of the tenant.
id_list (list[str]): Get servers by ID list. Will ignore this condition if None.
Returns:
list[dict]: List of MCP server dictionaries containing MCP server details.
Returns None if no MCP servers are found.
"""
fields = [
cls.model.id, cls.model.name, cls.model.server_type, cls.model.url, cls.model.description,
cls.model.variables, cls.model.update_date
]
servers = cls.model.select(*fields).order_by(cls.model.create_time.desc()).where(cls.model.tenant_id == tenant_id)
if id_list is not None:
servers = servers.where(cls.model.id.in_(id_list))
servers = list(servers.dicts())
if not servers:
return None
return servers