Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test: use real tool file adapters (#43192)

Asuka Minatoc0fa5c3bcdd8
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
index f898a8a8f4b..7c3d6ba7a08 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
@@ -8,7 +8,10 @@ from typing import TYPE_CHECKING, Any
from unittest.mock import MagicMock
import pytest
+from pytest_mock import MockerFixture
+from core.tools.tool_file_manager import ToolFileManager
+from core.workflow.node_runtime import DifyToolFileManager
from core.workflow.system_variables import build_system_variables
from graphon.file import File, FileTransferMethod, FileType
from graphon.model_runtime.entities.llm_entities import LLMUsage
@@ -71,7 +74,6 @@ def tool_node(monkeypatch) -> ToolNode:
ops_stub.TraceTask = object # pragma: no cover - stub attribute
monkeypatch.setitem(sys.modules, module_name, ops_stub)
- from graphon.nodes.protocols import ToolFileManagerProtocol
from graphon.nodes.tool.tool_node import ToolNode
graph_config: dict[str, Any] = {
@@ -111,8 +113,7 @@ def tool_node(monkeypatch) -> ToolNode:
config = graph_config["nodes"][0]
- # Provide a stub ToolFileManager to satisfy the ToolNode constructor.
- tool_file_manager = MagicMock(spec=ToolFileManagerProtocol)
+ tool_file_manager = DifyToolFileManager(init_params.run_context)
runtime = _StubToolRuntime()
node = ToolNode(
@@ -204,7 +205,7 @@ def test_plain_link_messages_remain_links(tool_node: ToolNode):
assert files_segment.value == []
-def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
+def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode, mocker: MockerFixture):
file_obj = File(
file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.TOOL_FILE,
@@ -215,9 +216,10 @@ def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
size=123,
storage_key="file-key",
)
- tool_node._tool_file_manager.get_file_generator_by_tool_file_id.return_value = (
- None,
- SimpleNamespace(mime_type="application/pdf"),
+ download = mocker.patch.object(
+ ToolFileManager,
+ "get_file_generator_by_tool_file_id",
+ return_value=(None, SimpleNamespace(mime_type="application/pdf")),
)
tool_node._runtime.build_file_reference = MagicMock(return_value=file_obj)
message = ToolRuntimeMessage(
@@ -228,7 +230,7 @@ def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
events, _ = _run_transform(tool_node, message)
- tool_node._tool_file_manager.get_file_generator_by_tool_file_id.assert_called_once_with("file-id")
+ download.assert_called_once_with("file-id")
completed_events = [event for event in events if isinstance(event, StreamCompletedEvent)]
assert len(completed_events) == 1
files_segment = completed_events[0].node_run_result.outputs["files"]
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_invocation_behavior.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_invocation_behavior.py
index 243dfccf83c..911bfd7fa00 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_invocation_behavior.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_invocation_behavior.py
@@ -2,17 +2,16 @@
import time
import uuid
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.tools.utils.configuration import ToolParameterConfigurationManager
from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.node_runtime import DifyToolNodeRuntime
+from core.workflow.node_runtime import DifyToolFileManager, DifyToolNodeRuntime
from core.workflow.system_variables import build_system_variables
from graphon.enums import WorkflowNodeExecutionStatus
from graphon.graph import Graph
from graphon.node_events import StreamCompletedEvent
-from graphon.nodes.protocols import ToolFileManagerProtocol
from graphon.nodes.tool.entities import ToolNodeData
from graphon.nodes.tool.tool_node import ToolNode
from graphon.runtime import GraphRuntimeState, VariablePool
@@ -60,7 +59,7 @@ def init_tool_node(config: dict[str, object]) -> ToolNode:
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
- tool_file_manager = MagicMock(spec=ToolFileManagerProtocol)
+ tool_file_manager = DifyToolFileManager(init_params.run_context)
node = ToolNode(
node_id=str(uuid.uuid4()),
diff --git a/api/tests/unit_tests/services/test_plugin_file_upload_gateway.py b/api/tests/unit_tests/services/test_plugin_file_upload_gateway.py
index 193cbc8e116..ab4ab93768a 100644
--- a/api/tests/unit_tests/services/test_plugin_file_upload_gateway.py
+++ b/api/tests/unit_tests/services/test_plugin_file_upload_gateway.py
@@ -1,4 +1,7 @@
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
+
+from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session
from core.tools.tool_file_manager import ToolFileManager
from core.workflow.file_reference import build_file_reference
@@ -7,24 +10,10 @@ from services.plugin_file_upload_gateway import ToolFilePluginUploadGateway
from services.plugin_file_upload_service import PluginFileUploadResult
-def _tool_file() -> ToolFile:
- file = ToolFile(
- user_id="user-id",
- tenant_id="tenant-id",
- conversation_id="conversation-id",
- file_key="tools/tenant-id/generated.pdf",
- mimetype="application/pdf",
- original_url=None,
- name="report.pdf",
- size=7,
- )
- file.id = "file-id"
- return file
-
-
-def test_store_adapts_tool_file_to_transport_neutral_result() -> None:
- tool_files = MagicMock(spec=ToolFileManager)
- tool_files.create_file_by_raw.return_value = _tool_file()
+def test_store_adapts_tool_file_to_transport_neutral_result(sqlite_session: Session, mocker: MockerFixture) -> None:
+ tool_files = ToolFileManager()
+ create_file = mocker.spy(tool_files, "create_file_by_raw")
+ save = mocker.patch("core.tools.tool_file_manager.storage.save")
gateway = ToolFilePluginUploadGateway(tool_files=tool_files)
with patch("services.plugin_file_upload_gateway.sign_tool_file", return_value="signed-url") as sign_file:
@@ -37,9 +26,11 @@ def test_store_adapts_tool_file_to_transport_neutral_result() -> None:
filename="report.pdf",
)
+ persisted = sqlite_session.get(ToolFile, result.id)
+ assert persisted is not None
assert result == PluginFileUploadResult(
- id="file-id",
- reference=build_file_reference(record_id="file-id"),
+ id=persisted.id,
+ reference=build_file_reference(record_id=persisted.id),
name="report.pdf",
size=7,
extension=".pdf",
@@ -50,9 +41,12 @@ def test_store_adapts_tool_file_to_transport_neutral_result() -> None:
user_id="user-id",
tenant_id="tenant-id",
conversation_id="conversation-id",
- file_key="tools/tenant-id/generated.pdf",
+ file_key=persisted.file_key,
)
- tool_files.create_file_by_raw.assert_called_once_with(
+ assert persisted.file_key.startswith("tools/tenant-id/")
+ assert persisted.file_key.endswith(".pdf")
+ save.assert_called_once_with(persisted.file_key, b"content")
+ create_file.assert_called_once_with(
user_id="user-id",
tenant_id="tenant-id",
conversation_id="conversation-id",
@@ -60,20 +54,12 @@ def test_store_adapts_tool_file_to_transport_neutral_result() -> None:
mimetype="application/pdf",
filename="report.pdf",
)
- sign_file.assert_called_once_with(
- tool_file_id="file-id",
- extension=".pdf",
- for_external=True,
- )
+ sign_file.assert_called_once_with(tool_file_id=persisted.id, extension=".pdf", for_external=True)
-def test_filename_extension_wins_over_generic_mimetype() -> None:
- tool_files = MagicMock(spec=ToolFileManager)
- file = _tool_file()
- file.name = "report.docx"
- file.mimetype = "application/octet-stream"
- tool_files.create_file_by_raw.return_value = file
- gateway = ToolFilePluginUploadGateway(tool_files=tool_files)
+def test_filename_extension_wins_over_generic_mimetype(sqlite_session: Session, mocker: MockerFixture) -> None:
+ save = mocker.patch("core.tools.tool_file_manager.storage.save")
+ gateway = ToolFilePluginUploadGateway(tool_files=ToolFileManager())
with patch("services.plugin_file_upload_gateway.sign_tool_file", return_value="signed-url"):
result = gateway.store(
@@ -87,3 +73,8 @@ def test_filename_extension_wins_over_generic_mimetype() -> None:
assert result.extension == ".docx"
assert result.mime_type == "application/octet-stream"
+ persisted = sqlite_session.get(ToolFile, result.id)
+ assert persisted is not None
+ assert persisted.name == "report.docx"
+ assert persisted.file_key.endswith(".docx")
+ save.assert_called_once_with(persisted.file_key, b"content")