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.

refactor(models): pass session into AppMCPServer.generate_server_code (#42316)

Syrinx.66bf75d1d8c0
diff --git a/api/controllers/console/app/mcp_server.py b/api/controllers/console/app/mcp_server.py
index 8a6ab77b3dd..d6615124cb3 100644
--- a/api/controllers/console/app/mcp_server.py
+++ b/api/controllers/console/app/mcp_server.py
@@ -123,7 +123,7 @@ class AppMCPServerController(Resource):
status=AppMCPServerStatus.ACTIVE,
app_id=app_model.id,
tenant_id=current_tenant_id,
- server_code=AppMCPServer.generate_server_code(16),
+ server_code=AppMCPServer.generate_server_code(16, session=db.session()),
)
db.session.add(server)
db.session.commit()
@@ -201,6 +201,6 @@ class AppMCPServerRefreshController(Resource):
)
if not server:
raise NotFound()
- server.server_code = AppMCPServer.generate_server_code(16)
+ server.server_code = AppMCPServer.generate_server_code(16, session=db.session())
db.session.commit()
return dump_response(AppMCPServerResponse, server)
diff --git a/api/models/model.py b/api/models/model.py
index 79f52eab5a1..2bb8dfc35bc 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -2167,11 +2167,11 @@ class AppMCPServer(TypeBase):
)
@staticmethod
- def generate_server_code(n: int) -> str:
+ def generate_server_code(n: int, *, session: Session) -> str:
while True:
result = generate_string(n)
while (
- db.session.scalar(select(func.count(AppMCPServer.id)).where(AppMCPServer.server_code == result)) or 0
+ session.scalar(select(func.count(AppMCPServer.id)).where(AppMCPServer.server_code == result)) or 0
) > 0:
result = generate_string(n)
diff --git a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
index 5db0cbe2a4c..0f53d0de7d8 100644
--- a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
+++ b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
@@ -5,7 +5,7 @@ from unittest.mock import patch
import pytest
from flask import Flask
from sqlalchemy import select
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
from werkzeug.exceptions import NotFound
from controllers.console import console_ns
@@ -156,7 +156,7 @@ class TestAppMCPServerController:
assert response == {}
- def test_post_returns_201(self, sqlite_session: Session) -> None:
+ def test_post_returns_201(self, sqlite_session: Session, sqlite_session_factory: sessionmaker[Session]) -> None:
api = AppMCPServerController()
method = unwrap(api.post)
payload = {"parameters": {"timeout": 30}}
@@ -166,7 +166,7 @@ class TestAppMCPServerController:
with (
app.test_request_context("/", json=payload),
- patch("controllers.console.app.mcp_server.db.session", sqlite_session),
+ patch("controllers.console.app.mcp_server.db.session", scoped_session(sqlite_session_factory)),
patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="server-code"),
):
response, status_code = method(
@@ -257,7 +257,9 @@ class TestAppMCPServerController:
class TestAppMCPServerRefreshController:
- def test_post_refreshes_server_bound_to_app_and_tenant(self, sqlite_session: Session) -> None:
+ def test_post_refreshes_server_bound_to_app_and_tenant(
+ self, sqlite_session: Session, sqlite_session_factory: sessionmaker[Session]
+ ) -> None:
api = AppMCPServerRefreshController()
method = unwrap(api.post)
server = _server(server_code="old-code")
@@ -270,7 +272,7 @@ class TestAppMCPServerRefreshController:
sqlite_session.commit()
with (
- patch("controllers.console.app.mcp_server.db.session", sqlite_session),
+ patch("controllers.console.app.mcp_server.db.session", scoped_session(sqlite_session_factory)),
patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="new-code"),
):
response = method(api, "tenant-1", app_model=_app())
diff --git a/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py b/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py
new file mode 100644
index 00000000000..376dea85b86
--- /dev/null
+++ b/api/tests/unit_tests/models/test_app_mcp_server_session_accessors.py
@@ -0,0 +1,39 @@
+"""Regression coverage for the ``db.session``→session-parameter refactor on
+``AppMCPServer.generate_server_code``.
+
+The static method reached for the global ``db.session`` internally and has been converted to
+take an explicit ``session: Session`` (per the pattern established in #40370/#40797/#41394,
+tracked in #40372).
+"""
+
+from unittest.mock import patch
+from uuid import uuid4
+
+from sqlalchemy.orm import Session
+
+from models.enums import AppMCPServerStatus
+from models.model import AppMCPServer
+
+
+def _persist_server(session: Session, *, server_code: str) -> AppMCPServer:
+ server = AppMCPServer(
+ tenant_id=str(uuid4()),
+ app_id=str(uuid4()),
+ name="Test MCP Server",
+ description="Test server",
+ server_code=server_code,
+ status=AppMCPServerStatus.ACTIVE,
+ parameters="{}",
+ )
+ session.add(server)
+ session.flush()
+ return server
+
+
+def test_generate_server_code_retries_a_taken_code_through_the_given_session(sqlite_session: Session) -> None:
+ _persist_server(sqlite_session, server_code="taken-code")
+
+ with patch("models.model.generate_string", side_effect=["taken-code", "fresh-code"]):
+ result = AppMCPServer.generate_server_code(16, session=sqlite_session)
+
+ assert result == "fresh-code"