mirror of
https://github.com/langgenius/dify.git
synced 2026-10-04 13:47:55 +08:00
Charles YaoandClaude Opus 5
0a228b7c23
The Builder recommended every installed tool as ready to use without ever checking whether its provider actually has credentials configured. A credentialed tool with no tool_builtin_providers row got bound into a plan and then failed at test time with an authorization error the user can't act on. tool_catalogue.py now carries provider_controller.need_credentials onto each ToolCatalogueEntry as needs_credentials. resources.py resolves which providers are actually authorized for the tenant (mirroring ToolTransformService.builtin_provider_to_user_provider's need_credentials / db_provider rule exactly, so the Builder and the console's tools page can never disagree) and sets ResourceRef.readiness to "missing_config" for a credentialed tool with no authorized provider row, "ready" otherwise. Datasets and models are unaffected. If the authorization query itself fails, readiness fails open to "ready" rather than mass-labeling every credentialed tool unauthorized on a transient error. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
198 lines
7.1 KiB
Python
198 lines
7.1 KiB
Python
import logging
|
|
from unittest.mock import patch
|
|
|
|
|
|
def test_list_tenant_resources_normalizes_all_three_kinds():
|
|
from services.dify_builder.agent import resources
|
|
|
|
class _Model:
|
|
def __init__(self, m): self.model = m
|
|
|
|
class _ProvResp:
|
|
def __init__(self, p, ms): self.provider, self.models = p, [_Model(m) for m in ms]
|
|
|
|
class _DS:
|
|
def __init__(self, i, n): self.id, self.name = i, n
|
|
|
|
tool_record = {
|
|
"provider_name": "google", "tool_name": "search",
|
|
"tool_label": "Google Search", "description": "",
|
|
}
|
|
with patch.object(resources, "_list_models", return_value=[_ProvResp("anthropic", ["claude-opus-4-8"])]), \
|
|
patch.object(resources, "_list_datasets", return_value=[_DS("kb-1", "Company KB")]), \
|
|
patch.object(resources, "_list_tools", return_value=[tool_record]):
|
|
out = resources.list_tenant_resources("t1")
|
|
|
|
assert out.models[0].id == "anthropic/claude-opus-4-8"
|
|
assert out.datasets[0].id == "kb-1"
|
|
assert out.datasets[0].label == "Company KB"
|
|
assert out.tools[0].id == "google/search"
|
|
assert out.tools[0].label == "Google Search"
|
|
|
|
|
|
def test_each_source_degrades_to_empty():
|
|
from services.dify_builder.agent import resources
|
|
with patch.object(resources, "_list_models", side_effect=RuntimeError("boom")), \
|
|
patch.object(resources, "_list_datasets", side_effect=RuntimeError("boom")), \
|
|
patch.object(resources, "_list_tools", side_effect=RuntimeError("boom")):
|
|
out = resources.list_tenant_resources("t1")
|
|
assert out == resources.TenantResources(models=[], datasets=[], tools=[])
|
|
|
|
|
|
def test_mixed_failure_partial_success():
|
|
from services.dify_builder.agent import resources
|
|
|
|
class _DS:
|
|
def __init__(self, i, n): self.id, self.name = i, n
|
|
|
|
tool_record = {
|
|
"provider_name": "google", "tool_name": "search",
|
|
"tool_label": "Google Search", "description": "",
|
|
}
|
|
with patch.object(resources, "_list_models", side_effect=RuntimeError("boom")), \
|
|
patch.object(resources, "_list_datasets", return_value=[_DS("kb-1", "Company KB")]), \
|
|
patch.object(resources, "_list_tools", return_value=[tool_record]):
|
|
out = resources.list_tenant_resources("t1")
|
|
|
|
assert out.models == []
|
|
assert len(out.datasets) == 1
|
|
assert out.datasets[0].id == "kb-1"
|
|
assert len(out.tools) == 1
|
|
assert out.tools[0].id == "google/search"
|
|
|
|
|
|
def test_malformed_tool_record_degrades():
|
|
from services.dify_builder.agent import resources
|
|
|
|
with patch.object(resources, "_list_models", return_value=[]), \
|
|
patch.object(resources, "_list_datasets", return_value=[]), \
|
|
patch.object(resources, "_list_tools", return_value=[{"provider_name": "g"}]): # missing tool_name
|
|
out = resources.list_tenant_resources("t1")
|
|
|
|
assert out.tools == []
|
|
assert out.models == []
|
|
assert out.datasets == []
|
|
|
|
|
|
def test_an_unauthorized_tool_is_reported_as_missing_config(monkeypatch):
|
|
"""Recommending an unusable tool is how a build fails at test time."""
|
|
from services.dify_builder.agent import resources
|
|
|
|
monkeypatch.setattr(
|
|
resources,
|
|
"_list_tools",
|
|
lambda _t: [
|
|
{
|
|
"provider_name": "gmail",
|
|
"tool_name": "send",
|
|
"tool_label": "Send",
|
|
"description": "",
|
|
"needs_credentials": True,
|
|
}
|
|
],
|
|
)
|
|
monkeypatch.setattr(resources, "_authorized_providers", lambda _t: set())
|
|
inv = resources.list_tenant_resources("t1")
|
|
assert inv.tools[0].readiness == "missing_config"
|
|
|
|
|
|
def test_a_tool_needing_no_credentials_is_ready(monkeypatch):
|
|
from services.dify_builder.agent import resources
|
|
|
|
monkeypatch.setattr(
|
|
resources,
|
|
"_list_tools",
|
|
lambda _t: [
|
|
{
|
|
"provider_name": "time",
|
|
"tool_name": "now",
|
|
"tool_label": "Now",
|
|
"description": "",
|
|
"needs_credentials": False,
|
|
}
|
|
],
|
|
)
|
|
monkeypatch.setattr(resources, "_authorized_providers", lambda _t: set())
|
|
assert resources.list_tenant_resources("t1").tools[0].readiness == "ready"
|
|
|
|
|
|
def test_an_authorized_tool_is_ready(monkeypatch):
|
|
from services.dify_builder.agent import resources
|
|
|
|
monkeypatch.setattr(
|
|
resources,
|
|
"_list_tools",
|
|
lambda _t: [
|
|
{
|
|
"provider_name": "gmail",
|
|
"tool_name": "send",
|
|
"tool_label": "Send",
|
|
"description": "",
|
|
"needs_credentials": True,
|
|
}
|
|
],
|
|
)
|
|
monkeypatch.setattr(resources, "_authorized_providers", lambda _t: {"gmail"})
|
|
assert resources.list_tenant_resources("t1").tools[0].readiness == "ready"
|
|
|
|
|
|
def test_authorization_lookup_failure_fails_open_to_ready(caplog):
|
|
"""A transient failure of the credential query must not mass-label every
|
|
credentialed tool "missing_config" -- that would hide tools the tenant
|
|
genuinely has configured. It degrades to "ready" (unchecked), same as
|
|
before this readiness check existed.
|
|
"""
|
|
from services.dify_builder.agent import resources
|
|
|
|
def _boom(_t):
|
|
raise RuntimeError("db down")
|
|
|
|
with patch.object(resources, "_list_models", return_value=[]), \
|
|
patch.object(resources, "_list_datasets", return_value=[]), \
|
|
patch.object(
|
|
resources,
|
|
"_list_tools",
|
|
return_value=[
|
|
{
|
|
"provider_name": "gmail",
|
|
"tool_name": "send",
|
|
"tool_label": "Send",
|
|
"description": "",
|
|
"needs_credentials": True,
|
|
}
|
|
],
|
|
), \
|
|
patch.object(resources, "_authorized_providers", _boom), \
|
|
caplog.at_level(logging.WARNING, logger="services.dify_builder.agent.resources"):
|
|
out = resources.list_tenant_resources("t1")
|
|
|
|
assert out.tools[0].readiness == "ready"
|
|
warnings = [r for r in caplog.records if r.levelno == logging.WARNING]
|
|
assert len(warnings) == 1
|
|
assert "authorization" in warnings[0].getMessage()
|
|
|
|
|
|
def test_list_tenant_resources_logs_when_a_source_fails(caplog):
|
|
from services.dify_builder.agent import resources
|
|
|
|
class _Model:
|
|
def __init__(self, m):
|
|
self.model = m
|
|
|
|
class _ProvResp:
|
|
def __init__(self, p, ms):
|
|
self.provider, self.models = p, [_Model(m) for m in ms]
|
|
|
|
with patch.object(resources, "_list_models", return_value=[_ProvResp("anthropic", ["claude-opus-4-8"])]), \
|
|
patch.object(resources, "_list_datasets", side_effect=RuntimeError("db down")), \
|
|
patch.object(resources, "_list_tools", return_value=[]), \
|
|
caplog.at_level(logging.WARNING, logger="services.dify_builder.agent.resources"):
|
|
out = resources.list_tenant_resources("t1")
|
|
|
|
assert out.datasets == []
|
|
assert out.models[0].id == "anthropic/claude-opus-4-8"
|
|
warnings = [r for r in caplog.records if r.levelno == logging.WARNING]
|
|
assert len(warnings) == 1
|
|
assert "datasets" in warnings[0].getMessage()
|
|
assert warnings[0].exc_info is not None
|