opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-29 04:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve code merge issues

Browse Source
This commit is contained in:
Novice 2025-10-10 15:19:16 +08:00
parent 841b7fa7ce
commit 560b026523
No known key found for this signature in database
GPG Key ID: EE3F68E3105DAAAB
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/tools/mcp_tool/provider.py
View File

@ -82,7 +82,7 @@ class MCPToolProviderController(ToolProviderController):
), ),
llm=remote_mcp_tool.description or "", 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, has_runtime_parameters=len(remote_mcp_tool.inputSchema) > 0,
) )
for remote_mcp_tool in remote_mcp_tools for remote_mcp_tool in remote_mcp_tools

2
api/core/tools/tool_manager.py
View File

@ -15,7 +15,6 @@ from yarl import URL
import contexts import contexts
from core.helper.provider_cache import ToolProviderCredentialsCache from core.helper.provider_cache import ToolProviderCredentialsCache
from core.plugin.entities.plugin import ToolProviderID
from core.plugin.impl.tool import PluginToolManager from core.plugin.impl.tool import PluginToolManager
from core.tools.__base.tool_provider import ToolProviderController from core.tools.__base.tool_provider import ToolProviderController
from core.tools.__base.tool_runtime import ToolRuntime 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.tools.workflow_as_tool.provider import WorkflowToolProviderController
from core.workflow.entities.variable_pool import VariablePool from core.workflow.entities.variable_pool import VariablePool
from extensions.ext_database import db from extensions.ext_database import db
from models.provider_ids import ToolProviderID
from services.enterprise.plugin_manager_service import PluginCredentialType from services.enterprise.plugin_manager_service import PluginCredentialType
from services.tools.mcp_tools_manage_service import MCPToolManageService from services.tools.mcp_tools_manage_service import MCPToolManageService

2
api/services/tools/tools_transform_service.py
View File

@ -258,7 +258,7 @@ class ToolTransformService:
description=I18nObject(en_US=tool.description or "", zh_Hans=tool.description or ""), description=I18nObject(en_US=tool.description or "", zh_Hans=tool.description or ""),
parameters=ToolTransformService.convert_mcp_schema_to_parameter(tool.inputSchema), parameters=ToolTransformService.convert_mcp_schema_to_parameter(tool.inputSchema),
labels=[], labels=[],
output_schema=tool.outputSchema, output_schema=tool.outputSchema or {},
) )
for tool in tools for tool in tools
] ]