Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): let MCP chatflow generation commit its session (#44636)

vaelufad500af4482
diff --git a/api/controllers/mcp/mcp.py b/api/controllers/mcp/mcp.py
index 54e518ac525..23d0e3a8a2a 100644
--- a/api/controllers/mcp/mcp.py
+++ b/api/controllers/mcp/mcp.py
@@ -136,16 +136,21 @@ class MCPAppApi(Resource):
# Reading/parsing may have taken time. Revalidate in the original
# execution transaction and use fresh, attached ORM records. A code
# reassigned to a different server/App/tenant is not this request's identity.
- with sessions.begin() as session:
+ # A plain session rather than sessions.begin(): app generation may commit this
+ # session itself (e.g. when it creates a conversation) and keep using it, which a
+ # begin() context manager rejects as operating on a closed transaction.
+ with sessions() as session:
mcp_server, app = self._get_mcp_server_and_app(server_code, session)
self._validate_server_status(mcp_server)
if (mcp_server.id, app.id, app.tenant_id) != identity:
raise MCPServerNotFoundError()
user_input_form = self._get_user_input_form(app, session=session)
- return self._process_mcp_message(
+ response = self._process_mcp_message(
mcp_request, request_id, app, mcp_server, user_input_form, session, protocol_version
)
+ session.commit()
+ return response
except MCPServerNotFoundError:
return mcp_server_not_found_response()
diff --git a/api/tests/unit_tests/controllers/common/test_access_response.py b/api/tests/unit_tests/controllers/common/test_access_response.py
index 46eef9bb07d..690739ba385 100644
--- a/api/tests/unit_tests/controllers/common/test_access_response.py
+++ b/api/tests/unit_tests/controllers/common/test_access_response.py
@@ -3,8 +3,7 @@
import io
import json
import logging
-from collections.abc import Buffer, Generator
-from contextlib import contextmanager
+from collections.abc import Buffer
from dataclasses import dataclass
from typing import Literal, Never, cast, override
from unittest.mock import MagicMock
@@ -193,12 +192,7 @@ def mcp_client(http_app: Flask, monkeypatch: pytest.MonkeyPatch, mocker: MockerF
monkeypatch.setattr(mcp, "mcp_ns", namespace)
calls = _session_calls(mocker)
maker = sessionmaker()
-
- @contextmanager
- def begin() -> Generator[Session]:
- yield calls.session
-
- mocker.patch.object(maker, "begin", side_effect=begin)
+ mocker.patch.object(maker, "class_", return_value=calls.session)
monkeypatch.setattr(mcp.session_factory, "get_session_maker", lambda: maker)
execute = mocker.patch.object(mcp, "handle_mcp_request")
end_user = mocker.patch.object(mcp.MCPAppApi, "_retrieve_end_user")
@@ -400,18 +394,23 @@ def test_mcp_reads_body_outside_sessions_and_rechecks_identity_before_execution(
)
remaining = iter((initial, execution))
- @contextmanager
- def begin() -> Generator[Session]:
+ def create_session(**_kwargs: object) -> Session:
session = next(remaining)
opened.append(session)
active_sessions.append(session)
- try:
- yield session
- finally:
- active_sessions.pop()
+ close = session.close
+
+ def close_session() -> None:
+ try:
+ close()
+ finally:
+ active_sessions.pop()
+
+ mocker.patch.object(session, "close", side_effect=close_session)
+ return session
maker = sessionmaker()
- mocker.patch.object(maker, "begin", side_effect=begin)
+ mocker.patch.object(maker, "class_", side_effect=create_session)
monkeypatch.setattr(mcp.session_factory, "get_session_maker", lambda: maker)
form = mocker.patch.object(mcp.MCPAppApi, "_get_user_input_form", return_value=[])
process = mocker.patch.object(mcp.MCPAppApi, "_process_mcp_message", return_value=Response("ok", status=200))
@@ -440,6 +439,7 @@ def test_mcp_reads_body_outside_sessions_and_rechecks_identity_before_execution(
)
assert read_sessions
assert not any(read_sessions)
+ assert not active_sessions
assert opened == ([initial] if change == "initial-missing" else [initial, execution])
if change == "unchanged":
assert response.status_code == 200
diff --git a/api/tests/unit_tests/controllers/mcp/test_mcp.py b/api/tests/unit_tests/controllers/mcp/test_mcp.py
index cf64cb19dbb..451f61b7751 100644
--- a/api/tests/unit_tests/controllers/mcp/test_mcp.py
+++ b/api/tests/unit_tests/controllers/mcp/test_mcp.py
@@ -609,6 +609,45 @@ class TestMcpCases:
assert response.status_code == 200
assert len(snapshots) == 2
+ @staticmethod
+ def test_execution_session_survives_a_commit_inside_message_processing(
+ app: Flask, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ # AdvancedChatAppGenerator commits the caller's session on a first conversation and
+ # keeps using it; a sessions.begin() context manager turns that into InvalidRequestError.
+ app_model = _app(module.AppMode.ADVANCED_CHAT, workflow_variables=[])
+ server = _server(module.AppMCPServerStatus.ACTIVE)
+ db.session.add_all([app_model, server])
+ db.session.commit()
+ api = module.MCPAppApi()
+
+ def process(
+ _mcp_request: module.mcp_types.ClientRequest | module.mcp_types.ClientNotification,
+ _request_id: int | str | None,
+ fresh_app: module.App,
+ _server: module.AppMCPServer,
+ _form: list[module.VariableEntity],
+ session: Session,
+ _protocol: str,
+ ) -> Response:
+ fresh_app.description = "committed by generation"
+ session.commit()
+ session.refresh(fresh_app)
+ fresh_app.name = "changed after the inner commit"
+ return Response("ok")
+
+ monkeypatch.setattr(api, "_process_mcp_message", process)
+ fake_payload({"jsonrpc": "2.0", "method": "ping", "id": 1})
+ with app.test_request_context("/"):
+ response = api.post("server-1")
+
+ assert response.status_code == 200
+ with sessionmaker(db.engine)() as session:
+ persisted = session.get(App, app_model.id)
+ assert persisted is not None
+ assert persisted.description == "committed by generation"
+ assert persisted.name == "changed after the inner commit"
+
@staticmethod
@pytest.mark.usefixtures("app")
def test_identity_query_does_not_accept_a_server_bound_to_another_tenants_app() -> None: