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.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor(models): pass session into MCPToolProvider.load_user (#42432)
Dorianad9a5be560ec
diff --git a/api/models/tools.py b/api/models/tools.pyindex 222d8d9c0eb..900af453b9d 100644--- a/api/models/tools.py+++ b/api/models/tools.py@@ -21,7 +21,6 @@ from core.tools.entities.tool_entities import ()from .base import TypeBase-from .engine import dbfrom .enums import PermissionEnumfrom .model import Account, App, Tenantfrom .types import EnumText, LongText, StringUUID@@ -353,8 +352,8 @@ class MCPToolProvider(TypeBase):sa.String(32), nullable=False, server_default=sa.text("'off'"), default="off")- def load_user(self) -> Account | None:- return db.session.scalar(select(Account).where(Account.id == self.user_id))+ def load_user(self, session: Session) -> Account | None:+ return session.scalar(select(Account).where(Account.id == self.user_id))@propertydef credentials(self) -> dict[str, Any]:diff --git a/api/services/tools/mcp_tools_manage_service.py b/api/services/tools/mcp_tools_manage_service.pyindex 6a2d2fea819..b49ad93904b 100644--- a/api/services/tools/mcp_tools_manage_service.py+++ b/api/services/tools/mcp_tools_manage_service.py@@ -692,11 +692,12 @@ class MCPToolManageService:self, db_provider: MCPToolProvider, provider_entity: MCPProviderEntity, tools: list[MCPTool]) -> ToolProviderApiEntity:"""Build API response for tool provider."""- user = db_provider.load_user()+ user = db_provider.load_user(self._session)+ user_name = user.name if user else Noneresponse = provider_entity.to_api_response(- user_name=user.name if user else None,+ user_name=user_name,)- response["tools"] = ToolTransformService.mcp_tool_to_user_tool(db_provider, tools)+ response["tools"] = ToolTransformService.mcp_tool_to_user_tool(db_provider, tools, user_name=user_name)response["plugin_unique_identifier"] = provider_entity.provider_idreturn ToolProviderApiEntity(**response)diff --git a/api/services/tools/tools_transform_service.py b/api/services/tools/tools_transform_service.pyindex 29be9eb9563..807c4482ada 100644--- a/api/services/tools/tools_transform_service.py+++ b/api/services/tools/tools_transform_service.py@@ -254,7 +254,7 @@ class ToolTransformService:# Use provided user_name to avoid N+1 query, fallback to load_user() if not providedif user_name is None:- user = db_provider.load_user()+ user = db_provider.load_user(db.session())user_name = user.name if user else None# Convert to entity and use its API response method@@ -285,7 +285,7 @@ class ToolTransformService:) -> list[ToolApiEntity]:# Use provided user_name to avoid N+1 query, fallback to load_user() if not providedif user_name is None:- user = mcp_provider.load_user()+ user = mcp_provider.load_user(db.session())user_name = user.name if user else "Anonymous"return [diff --git a/api/tests/unit_tests/models/test_mcp_tool_provider_session_accessors.py b/api/tests/unit_tests/models/test_mcp_tool_provider_session_accessors.pynew file mode 100644index 00000000000..2f1761a80fd--- /dev/null+++ b/api/tests/unit_tests/models/test_mcp_tool_provider_session_accessors.py@@ -0,0 +1,53 @@+"""Regression coverage for the ``db.session``→session-parameter refactor on+``MCPToolProvider.load_user``.++The method reached for the global ``db.session`` internally and has been converted to+take an explicit ``session: Session`` (per the pattern established in #40370/#42316,+tracked in #40372).+"""++from uuid import uuid4++from sqlalchemy.orm import Session++from models.account import Account+from models.tools import MCPToolProvider+++def _persist_account(session: Session, *, name: str = "MCP Owner") -> Account:+ account = Account(name=name, email=f"{uuid4().hex}@example.com")+ session.add(account)+ session.flush()+ return account+++def _persist_provider(session: Session, *, user_id: str) -> MCPToolProvider:+ provider = MCPToolProvider(+ name="Test Provider",+ server_identifier=f"test-provider-{uuid4().hex[:8]}",+ server_url="https://example.com/mcp",+ server_url_hash=uuid4().hex,+ icon="icon",+ tenant_id=str(uuid4()),+ user_id=user_id,+ )+ session.add(provider)+ session.flush()+ return provider+++def test_load_user_returns_account_through_the_given_session(sqlite_session: Session) -> None:+ account = _persist_account(sqlite_session)+ provider = _persist_provider(sqlite_session, user_id=account.id)++ result = provider.load_user(sqlite_session)++ assert result is not None+ assert result.id == account.id+ assert result.name == account.name+++def test_load_user_returns_none_when_account_is_missing(sqlite_session: Session) -> None:+ provider = _persist_provider(sqlite_session, user_id=str(uuid4()))++ assert provider.load_user(sqlite_session) is None