From 560b026523a5490ae5d5b09ebbc54aa8e1de0e02 Mon Sep 17 00:00:00 2001 From: Novice Date: Fri, 10 Oct 2025 15:19:16 +0800 Subject: [PATCH] fix: resolve code merge issues --- api/core/tools/mcp_tool/provider.py | 2 +- api/core/tools/tool_manager.py | 2 +- api/services/tools/tools_transform_service.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/core/tools/mcp_tool/provider.py b/api/core/tools/mcp_tool/provider.py index aac2c404ea..d9f8d45539 100644 --- a/api/core/tools/mcp_tool/provider.py +++ b/api/core/tools/mcp_tool/provider.py @@ -82,7 +82,7 @@ class MCPToolProviderController(ToolProviderController): ), llm=remote_mcp_tool.description or "", ), - output_schema=remote_mcp_tool.outputSchema, + output_schema=remote_mcp_tool.outputSchema or {}, has_runtime_parameters=len(remote_mcp_tool.inputSchema) > 0, ) for remote_mcp_tool in remote_mcp_tools diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py index 3168594d30..1de595aef4 100644 --- a/api/core/tools/tool_manager.py +++ b/api/core/tools/tool_manager.py @@ -15,7 +15,6 @@ from yarl import URL import contexts from core.helper.provider_cache import ToolProviderCredentialsCache -from core.plugin.entities.plugin import ToolProviderID from core.plugin.impl.tool import PluginToolManager from core.tools.__base.tool_provider import ToolProviderController from core.tools.__base.tool_runtime import ToolRuntime @@ -27,6 +26,7 @@ from core.tools.utils.uuid_utils import is_valid_uuid from core.tools.workflow_as_tool.provider import WorkflowToolProviderController from core.workflow.entities.variable_pool import VariablePool from extensions.ext_database import db +from models.provider_ids import ToolProviderID from services.enterprise.plugin_manager_service import PluginCredentialType from services.tools.mcp_tools_manage_service import MCPToolManageService diff --git a/api/services/tools/tools_transform_service.py b/api/services/tools/tools_transform_service.py index d38cf97895..62c474e3e9 100644 --- a/api/services/tools/tools_transform_service.py +++ b/api/services/tools/tools_transform_service.py @@ -258,7 +258,7 @@ class ToolTransformService: description=I18nObject(en_US=tool.description or "", zh_Hans=tool.description or ""), parameters=ToolTransformService.convert_mcp_schema_to_parameter(tool.inputSchema), labels=[], - output_schema=tool.outputSchema, + output_schema=tool.outputSchema or {}, ) for tool in tools ]