fix: rebase

api/core/tools/tool_manager.py

@@ -594,8 +594,6 @@ class ToolManager:
             # append builtin providers
             for provider in builtin_providers:
                 # handle include, exclude
-                if provider.identity is None:
-                    continue
                 if is_filtered(
                     include_set=cast(set[str], dify_config.POSITION_TOOL_INCLUDES_SET),
                     exclude_set=cast(set[str], dify_config.POSITION_TOOL_EXCLUDES_SET),

api/core/tools/utils/parser.py

@@ -1,4 +1,5 @@
 import re
+from typing import Optional
 import uuid
 from json import dumps as json_dumps
 from json import loads as json_loads

api/core/tools/workflow_as_tool/provider.py

@@ -6,6 +6,7 @@ from pydantic import Field
 from core.app.app_config.entities import VariableEntity, VariableEntityType
 from core.app.apps.workflow.app_config_manager import WorkflowAppConfigManager
 from core.plugin.entities.parameters import PluginParameterOption
+from core.tools.__base.tool import Tool
 from core.tools.__base.tool_provider import ToolProviderController
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.common_entities import I18nObject
@@ -18,7 +19,6 @@ from core.tools.entities.tool_entities import (
     ToolProviderIdentity,
     ToolProviderType,
 )
-from core.tools.tool.tool import Tool
 from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurationUtils
 from core.tools.workflow_as_tool.tool import WorkflowTool
 from extensions.ext_database import db