youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-27 14:08:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: add tools for output in agent mode

Browse Source 
feat: hide output tools and improve JSON formatting for structured output
feat: hide output tools and improve JSON formatting for structured output
fix: handle prompt template correctly to extract selectors for step run
fix: emit StreamChunkEvent correctly for sandbox agent
chore: better debug message
fix: incorrect output tool runtime selection
fix: type issues
fix: align parameter list
fix: align parameter list
fix: hide internal builtin providers from tool list
vibe: implement file structured output
vibe: implement file structured output
fix: refix parameter for tool
fix: crash
fix: crash
refactor: remove union types
fix: type check
Merge branch 'feat/structured-output-with-sandbox' into feat/support-agent-sandbox
fix: provide json as text
fix: provide json as text
fix: get AgentResult correctly
fix: provides correct prompts, tools and terminal predicates
fix: provides correct prompts, tools and terminal predicates
fix: circular import
feat: support structured output in sandbox and tool mode
This commit is contained in:
Stream
2026-02-04 21:13:07 +08:00
parent 25065a4f2f
commit e0082dbf18
41 changed files with 1014 additions and 1358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,3 @@
from __future__ import annotations
import json
import logging
import mimetypes
@ -33,8 +31,9 @@ from services.enterprise.plugin_manager_service import PluginCredentialType
from services.tools.mcp_tools_manage_service import MCPToolManageService
if TYPE_CHECKING:
from core.agent.entities import AgentToolEntity
from core.workflow.nodes.tool.entities import ToolEntity
from core.agent.entities import AgentToolEntity
from core.app.entities.app_invoke_entities import InvokeFrom
from core.helper.module_import_helper import load_single_subclass_from_source
from core.helper.position_helper import is_filtered
@ -67,8 +66,6 @@ if TYPE_CHECKING:
logger = logging.getLogger(__name__)
INTERNAL_BUILTIN_TOOL_PROVIDERS = {"agent_output"}
class ApiProviderControllerItem(TypedDict):
provider: ApiToolProvider
@ -364,7 +361,7 @@ class ToolManager:
app_id: str,
agent_tool: AgentToolEntity,
invoke_from: InvokeFrom = InvokeFrom.DEBUGGER,
variable_pool: Optional[VariablePool] = None,
variable_pool: Optional["VariablePool"] = None,
) -> Tool:
"""
get the agent tool runtime
@ -404,9 +401,9 @@ class ToolManager:
tenant_id: str,
app_id: str,
node_id: str,
workflow_tool: ToolEntity,
workflow_tool: "ToolEntity",
invoke_from: InvokeFrom = InvokeFrom.DEBUGGER,
variable_pool: Optional[VariablePool] = None,
variable_pool: Optional["VariablePool"] = None,
) -> Tool:
"""
get the workflow tool runtime
@ -594,10 +591,6 @@ class ToolManager:
cls._hardcoded_providers = {}
cls._builtin_providers_loaded = False
@classmethod
def is_internal_builtin_provider(cls, provider_name: str) -> bool:
return provider_name in INTERNAL_BUILTIN_TOOL_PROVIDERS
@classmethod
def get_tool_label(cls, tool_name: str) -> Union[I18nObject, None]:
"""
@ -635,9 +628,9 @@ class ToolManager:
# MySQL: Use window function to achieve same result
sql = """
SELECT id FROM (
SELECT id,
SELECT id,
ROW_NUMBER() OVER (
PARTITION BY tenant_id, provider
PARTITION BY tenant_id, provider
ORDER BY is_default DESC, created_at DESC
) as rn
FROM tool_builtin_providers
@ -674,8 +667,6 @@ class ToolManager:
# append builtin providers
for provider in builtin_providers:
if cls.is_internal_builtin_provider(provider.entity.identity.name):
continue
# handle include, exclude
if is_filtered(
include_set=dify_config.POSITION_TOOL_INCLUDES_SET,
@ -1019,7 +1010,7 @@ class ToolManager:
def _convert_tool_parameters_type(
cls,
parameters: list[ToolParameter],
variable_pool: Optional[VariablePool],
variable_pool: Optional["VariablePool"],
tool_configurations: dict[str, Any],
typ: Literal["agent", "workflow", "tool"] = "workflow",
) -> dict[str, Any]: