opensource/dify
3
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-09-24 23:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: enforce tool provider type contracts (#39380)

Browse Source 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
yyh
2026-07-22 01:30:55 +00:00
committed by GitHub
co-authored by autofix-ci[bot]
parent 5216ee1d20
commit 9b432d0d29
60 changed files with 342 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/tests/unit_tests/core/workflow/nodes/agent_v2/test_dify_tools_builder.py
+58 -7
View File
@@ -235,6 +235,7 @@ def test_builds_dify_plugin_tools_layer_from_existing_tool_runtime():
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -258,9 +259,6 @@ def test_builds_dify_plugin_tools_layer_from_existing_tool_runtime():
assert "region" not in prepared.parameters_json_schema["properties"]
assert runtime_provider.last_agent_tool is not None
assert runtime_provider.last_agent_tool.credential_id == "credential-1"
# Default ``provider_type`` is now ``"plugin"`` — the agent tool entity
# must surface that so ToolManager hits the plugin provider table, not the
# built-in legacy table.
assert runtime_provider.last_agent_tool.provider_type.value == "plugin"
@@ -599,6 +597,7 @@ def test_rejects_duplicate_exposed_tool_names():
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -606,6 +605,7 @@ def test_rejects_duplicate_exposed_tool_names():
},
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -629,6 +629,7 @@ def test_rejects_missing_required_runtime_parameter():
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -663,6 +664,7 @@ def test_invoke_from_is_forwarded_to_tool_runtime_provider():
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -690,6 +692,7 @@ def test_disabled_tools_are_skipped():
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -717,6 +720,7 @@ def test_plugin_id_plus_provider_fallback_when_provider_id_missing():
{
"plugin_id": "langgenius/search",
"provider": "search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -752,6 +756,7 @@ def test_unauthorized_tool_without_credentials():
"dify_tools": [
{
"provider_id": "langgenius/time/time",
"provider_type": "plugin",
"tool_name": "current_time",
"credential_type": "unauthorized",
"runtime_parameters": {"region": "us"},
@@ -777,6 +782,7 @@ def _standard_tools_payload() -> AgentSoulToolsConfig:
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -859,6 +865,7 @@ def test_legacy_provider_name_and_tool_parameters_normalized():
"dify_tools": [
{
"provider_name": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_id": "credential-1",
@@ -875,6 +882,21 @@ def test_legacy_provider_name_and_tool_parameters_normalized():
assert tool.credential_ref.id == "credential-1"
def test_rejects_unknown_provider_type_at_config_boundary():
with pytest.raises(ValueError, match="provider_type"):
AgentSoulToolsConfig.model_validate(
{
"dify_tools": [
{
"provider_id": "future-provider",
"provider_type": "future-provider",
"credential_type": "unauthorized",
}
]
}
)
# ── provider-level entries (tool_name omitted = all tools of the provider) ───
@@ -888,7 +910,15 @@ def test_provider_level_entry_expands_to_all_tools():
builder = WorkflowAgentDifyToolsBuilder(tool_runtime_provider=runtime_provider, provider_tools_lister=lister)
tools = AgentSoulToolsConfig.model_validate(
{"dify_tools": [{"provider_id": "langgenius/search/search", "credential_type": "unauthorized"}]}
{
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"credential_type": "unauthorized",
}
]
}
)
result = _build(builder, tools)
@@ -906,9 +936,14 @@ def test_explicit_tool_entry_wins_over_provider_expansion():
tools = AgentSoulToolsConfig.model_validate(
{
"dify_tools": [
{"provider_id": "langgenius/search/search", "credential_type": "unauthorized"},
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "unauthorized",
"runtime_parameters": {"region": "eu"},
@@ -930,7 +965,15 @@ def test_provider_level_entry_with_no_tools_maps_to_declaration_not_found():
provider_tools_lister=lambda *, tenant_id, provider_type, provider_id: [],
)
tools = AgentSoulToolsConfig.model_validate(
{"dify_tools": [{"provider_id": "langgenius/search/search", "credential_type": "unauthorized"}]}
{
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"credential_type": "unauthorized",
}
]
}
)
with pytest.raises(WorkflowAgentDifyToolsBuildError) as exc_info:
@@ -948,7 +991,15 @@ def test_provider_level_entry_unknown_provider_maps_to_declaration_not_found():
tool_runtime_provider=FakeRuntimeProvider(_tool()), provider_tools_lister=lister
)
tools = AgentSoulToolsConfig.model_validate(
{"dify_tools": [{"provider_id": "langgenius/search/search", "credential_type": "unauthorized"}]}
{
"dify_tools": [
{
"provider_id": "langgenius/search/search",
"provider_type": "plugin",
"credential_type": "unauthorized",
}
]
}
)
with pytest.raises(WorkflowAgentDifyToolsBuildError) as exc_info:
api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py
+1
View File
@@ -667,6 +667,7 @@ def test_builds_workflow_run_request_with_dify_plugin_tools_layer(monkeypatch: p
"dify_tools": [
{
"provider_id": "langgenius/time/time",
"provider_type": "plugin",
"tool_name": "current_time",
"credential_type": "unauthorized",
}
api/tests/unit_tests/core/workflow/nodes/agent_v2/test_validators.py
+16 -3
View File
@@ -295,8 +295,16 @@ def test_publish_validation_dedupes_provider_level_tool_entries():
),
tools={
"dify_tools": [
{"provider_id": "langgenius/duckduckgo/duckduckgo", "credential_type": "unauthorized"},
{"provider_id": "langgenius/duckduckgo/duckduckgo", "credential_type": "unauthorized"},
{
"provider_id": "langgenius/duckduckgo/duckduckgo",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
{
"provider_id": "langgenius/duckduckgo/duckduckgo",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
]
},
)
@@ -321,9 +329,14 @@ def test_publish_validation_accepts_provider_level_plus_explicit_tool_entry():
),
tools={
"dify_tools": [
{"provider_id": "langgenius/duckduckgo/duckduckgo", "credential_type": "unauthorized"},
{
"provider_id": "langgenius/duckduckgo/duckduckgo",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
{
"provider_id": "langgenius/duckduckgo/duckduckgo",
"provider_type": "plugin",
"tool_name": "ddg_search",
"credential_type": "unauthorized",
},
api/tests/unit_tests/services/agent/test_agent_dsl_service.py
+8 -1
View File
@@ -78,6 +78,7 @@ def test_make_portable_agent_package_strips_workspace_credentials_and_assets() -
"dify_tools": [
{
"provider_id": "langgenius/google/google",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "api-key",
"credential_ref": {"type": "tool", "id": "tool-secret"},
@@ -196,6 +197,7 @@ def test_import_warnings_cover_runtime_setup_removed_from_package(monkeypatch) -
"dify_tools": [
{
"provider_id": "langgenius/google/google",
"provider_type": "plugin",
"tool_name": "search",
"credential_type": "unauthorized",
}
@@ -513,10 +515,15 @@ def test_extract_package_dependencies_covers_model_tools_and_knowledge(monkeypat
"model": {"plugin_id": "model-plugin", "model_provider": "provider/model", "model": "model"},
"tools": {
"dify_tools": [
{"provider_id": "provider/tool", "credential_type": "unauthorized"},
{
"provider_id": "provider/tool",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
{
"plugin_id": "plugin-id",
"provider": "fallback-provider",
"provider_type": "plugin",
"credential_type": "unauthorized",
},
]
api/tests/unit_tests/services/agent/test_composer_mention_validation.py
+1
View File
@@ -199,6 +199,7 @@ def test_provider_all_tools_mention_resolves_against_provider_level_entry():
{
"plugin_id": "langgenius/duckduckgo",
"provider": "duckduckgo",
"provider_type": "plugin",
"credential_type": "unauthorized",
}
]
api/tests/unit_tests/services/agent/test_prompt_mentions.py
+1
View File
@@ -140,6 +140,7 @@ def soul() -> AgentSoulConfig:
{
"plugin_id": "langgenius/tavily",
"provider": "tavily",
"provider_type": "plugin",
"tool_name": "tavily_search",
"credential_type": "unauthorized",
},