youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-02 16:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/mcp' into deploy/dev

Browse Source
This commit is contained in:
Novice
2025-07-08 15:27:34 +08:00
parent 1feeea0abb 978598f06e
commit 0f0c30e978
6 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
api/controllers/mcp/mcp.py
View File

@ -1,15 +1,12 @@
from flask_restful import Resource, reqparse
from pydantic import ValidationError
from werkzeug.exceptions import NotFound
from controllers.console.app.mcp_server import AppMCPServerStatus
from controllers.mcp import api
from controllers.web.error import (
AppUnavailableError,
)
from core.app.app_config.entities import VariableEntity
from core.mcp.server.handler import MCPServerRequestHandler
from core.mcp.server.streamable_http import MCPServerStreamableHTTPRequestHandler
from core.mcp.types import ClientNotification, ClientRequest
from core.mcp.utils import create_mcp_error_response
from extensions.ext_database import db
from libs import helper
from models.model import App, AppMCPServer, AppMode
@ -30,33 +27,59 @@ class MCPAppApi(Resource):
parser.add_argument("id", type=int_or_str, required=False, location="json")
args = parser.parse_args()
request_id = args.get("id")
server = db.session.query(AppMCPServer).filter(AppMCPServer.server_code == server_code).first()
if not server:
raise NotFound("Server Not Found")
return helper.compact_generate_response(create_mcp_error_response(request_id, -32001, "Server Not Found"))
if server.status != AppMCPServerStatus.ACTIVE:
raise NotFound("Server is not active")
return helper.compact_generate_response(
create_mcp_error_response(request_id, -32001, "Server is not active")
)
app = db.session.query(App).filter(App.id == server.app_id).first()
if not app:
raise NotFound("App Not Found")
return helper.compact_generate_response(create_mcp_error_response(request_id, -32001, "App Not Found"))
if app.mode in {AppMode.ADVANCED_CHAT.value, AppMode.WORKFLOW.value}:
workflow = app.workflow
if workflow is None:
raise AppUnavailableError()
return helper.compact_generate_response(
create_mcp_error_response(request_id, -32001, "App is unavailable")
)
features_dict = workflow.features_dict
user_input_form = workflow.user_input_form(to_old_structure=True)
else:
app_model_config = app.app_model_config
if app_model_config is None:
raise AppUnavailableError()
return helper.compact_generate_response(
create_mcp_error_response(request_id, -32001, "App is unavailable")
)
features_dict = app_model_config.to_dict()
user_input_form = features_dict.get("user_input_form", [])
converted_user_input_form: list[VariableEntity] = []
try:
user_input_form = [VariableEntity.model_validate(list(item.values())[0]) for item in user_input_form]
for item in user_input_form:
variable_type = item.get("type", "") or list(item.keys())[0]
variable = item[variable_type]
converted_user_input_form.append(
VariableEntity(
type=variable_type,
variable=variable.get("variable"),
description=variable.get("description") or "",
label=variable.get("label"),
required=variable.get("required", False),
max_length=variable.get("max_length"),
options=variable.get("options") or [],
)
)
except ValidationError as e:
raise ValueError(f"Invalid user_input_form: {str(e)}")
return helper.compact_generate_response(
create_mcp_error_response(request_id, -32602, f"Invalid user_input_form: {str(e)}")
)
try:
request: ClientRequest | ClientNotification = ClientRequest.model_validate(args)
except ValidationError as e:
@ -64,9 +87,11 @@ class MCPAppApi(Resource):
notification = ClientNotification.model_validate(args)
request = notification
except ValidationError as e:
raise ValueError(f"Invalid MCP request: {str(e)}")
return helper.compact_generate_response(
create_mcp_error_response(request_id, -32602, f"Invalid MCP request: {str(e)}")
)
mcp_server_handler = MCPServerRequestHandler(app, request, user_input_form)
mcp_server_handler = MCPServerStreamableHTTPRequestHandler(app, request, converted_user_input_form)
response = mcp_server_handler.handle()
return helper.compact_generate_response(response)