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

Merge commit 'fb41b215' into sandboxed-agent-rebase

Browse Source 
Made-with: Cursor

# Conflicts:
#	.devcontainer/post_create_command.sh
#	api/commands.py
#	api/core/agent/cot_agent_runner.py
#	api/core/agent/fc_agent_runner.py
#	api/core/app/apps/workflow_app_runner.py
#	api/core/app/entities/queue_entities.py
#	api/core/app/entities/task_entities.py
#	api/core/workflow/workflow_entry.py
#	api/dify_graph/enums.py
#	api/dify_graph/graph/graph.py
#	api/dify_graph/graph_events/node.py
#	api/dify_graph/model_runtime/entities/message_entities.py
#	api/dify_graph/node_events/node.py
#	api/dify_graph/nodes/agent/agent_node.py
#	api/dify_graph/nodes/base/__init__.py
#	api/dify_graph/nodes/base/entities.py
#	api/dify_graph/nodes/base/node.py
#	api/dify_graph/nodes/llm/entities.py
#	api/dify_graph/nodes/llm/node.py
#	api/dify_graph/nodes/tool/tool_node.py
#	api/pyproject.toml
#	api/uv.lock
#	web/app/components/base/avatar/__tests__/index.spec.tsx
#	web/app/components/base/avatar/index.tsx
#	web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
#	web/app/components/base/file-uploader/file-from-link-or-local/index.tsx
#	web/app/components/base/prompt-editor/index.tsx
#	web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
#	web/app/components/header/account-dropdown/index.spec.tsx
#	web/app/components/share/text-generation/index.tsx
#	web/app/components/workflow/block-selector/tool/action-item.tsx
#	web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
#	web/app/components/workflow/hooks/use-edges-interactions.ts
#	web/app/components/workflow/hooks/use-nodes-interactions.ts
#	web/app/components/workflow/index.tsx
#	web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
#	web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
#	web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx
#	web/app/components/workflow/nodes/loop/use-interactions.ts
#	web/contract/router.ts
#	web/env.ts
#	web/eslint-suppressions.json
#	web/package.json
#	web/pnpm-lock.yaml
This commit is contained in:
Novice
2026-03-23 10:52:06 +08:00
parent b15a9bea21 fb41b215c8
commit 5041d96bb1
1395 changed files with 167201 additions and 73658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
api/tests/unit_tests/services/test_workflow_service.py
View File

@ -14,7 +14,7 @@ from unittest.mock import MagicMock, Mock, patch
import pytest
from dify_graph.enums import NodeType
from dify_graph.enums import BuiltinNodeTypes
from dify_graph.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
from libs.datetime_utils import naive_utc_now
from models.model import App, AppMode
@ -134,7 +134,7 @@ class TestWorkflowAssociatedDataFactory:
return (
(node["id"], node["data"])
for node in nodes
if node.get("data", {}).get("type") == specific_node_type.value
if node.get("data", {}).get("type") == str(specific_node_type)
)
# Return all nodes if no filter specified
return ((node["id"], node["data"]) for node in nodes)
@ -179,7 +179,7 @@ class TestWorkflowAssociatedDataFactory:
{
"id": "start",
"data": {
"type": NodeType.START.value,
"type": BuiltinNodeTypes.START,
"title": "START",
"variables": [],
},
@ -204,7 +204,7 @@ class TestWorkflowAssociatedDataFactory:
{
"id": "llm-1",
"data": {
"type": NodeType.LLM.value,
"type": BuiltinNodeTypes.LLM,
"title": "LLM",
"model": {
"provider": "openai",
@ -1074,12 +1074,12 @@ class TestWorkflowService:
Used by the UI to populate the node palette and provide sensible defaults
when users add new nodes to their workflow.
"""
with patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping:
with patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping:
# Mock node class with default config
mock_node_class = MagicMock()
mock_node_class.get_default_config.return_value = {"type": "llm", "config": {}}
mock_mapping.items.return_value = [(NodeType.LLM, {"latest": mock_node_class})]
mock_mapping.return_value = {BuiltinNodeTypes.LLM: {"latest": mock_node_class}}
with patch("services.workflow_service.LATEST_VERSION", "latest"):
result = workflow_service.get_default_block_configs()
@ -1098,7 +1098,7 @@ class TestWorkflowService:
)
with (
patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping,
patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping,
patch("services.workflow_service.LATEST_VERSION", "latest"),
patch(
"services.workflow_service.build_http_request_config",
@ -1109,10 +1109,10 @@ class TestWorkflowService:
mock_http_node_class.get_default_config.return_value = {"type": "http-request", "config": {}}
mock_llm_node_class = MagicMock()
mock_llm_node_class.get_default_config.return_value = {"type": "llm", "config": {}}
mock_mapping.items.return_value = [
(NodeType.HTTP_REQUEST, {"latest": mock_http_node_class}),
(NodeType.LLM, {"latest": mock_llm_node_class}),
]
mock_mapping.return_value = {
BuiltinNodeTypes.HTTP_REQUEST: {"latest": mock_http_node_class},
BuiltinNodeTypes.LLM: {"latest": mock_llm_node_class},
}
result = workflow_service.get_default_block_configs()
@ -1133,7 +1133,7 @@ class TestWorkflowService:
This includes default values for all required and optional parameters.
"""
with (
patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping,
patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping,
patch("services.workflow_service.LATEST_VERSION", "latest"),
):
# Mock node class with default config
@ -1141,23 +1141,21 @@ class TestWorkflowService:
mock_config = {"type": "llm", "config": {"provider": "openai"}}
mock_node_class.get_default_config.return_value = mock_config
# Create a mock mapping that includes NodeType.LLM
mock_mapping.__contains__.return_value = True
mock_mapping.__getitem__.return_value = {"latest": mock_node_class}
# Create a mock mapping that includes BuiltinNodeTypes.LLM
mock_mapping.return_value = {BuiltinNodeTypes.LLM: {"latest": mock_node_class}}
result = workflow_service.get_default_block_config(NodeType.LLM.value)
result = workflow_service.get_default_block_config(BuiltinNodeTypes.LLM)
assert result == mock_config
mock_node_class.get_default_config.assert_called_once()
def test_get_default_block_config_invalid_node_type(self, workflow_service):
"""Test get_default_block_config returns empty dict for invalid node type."""
with patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping:
# Mock mapping to not contain the node type
mock_mapping.__contains__.return_value = False
with patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping:
mock_mapping.return_value = {}
# Use a valid NodeType but one that's not in the mapping
result = workflow_service.get_default_block_config(NodeType.LLM.value)
result = workflow_service.get_default_block_config(BuiltinNodeTypes.LLM)
assert result == {}
@ -1173,7 +1171,7 @@ class TestWorkflowService:
)
with (
patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping,
patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping,
patch("services.workflow_service.LATEST_VERSION", "latest"),
patch(
"services.workflow_service.build_http_request_config",
@ -1183,10 +1181,9 @@ class TestWorkflowService:
mock_node_class = MagicMock()
expected = {"type": "http-request", "config": {}}
mock_node_class.get_default_config.return_value = expected
mock_mapping.__contains__.return_value = True
mock_mapping.__getitem__.return_value = {"latest": mock_node_class}
mock_mapping.return_value = {BuiltinNodeTypes.HTTP_REQUEST: {"latest": mock_node_class}}
result = workflow_service.get_default_block_config(NodeType.HTTP_REQUEST.value)
result = workflow_service.get_default_block_config(BuiltinNodeTypes.HTTP_REQUEST)
assert result == expected
mock_build_config.assert_called_once()
@ -1205,18 +1202,17 @@ class TestWorkflowService:
)
with (
patch("services.workflow_service.NODE_TYPE_CLASSES_MAPPING") as mock_mapping,
patch("services.workflow_service.get_node_type_classes_mapping") as mock_mapping,
patch("services.workflow_service.LATEST_VERSION", "latest"),
patch("services.workflow_service.build_http_request_config") as mock_build_config,
):
mock_node_class = MagicMock()
expected = {"type": "http-request", "config": {}}
mock_node_class.get_default_config.return_value = expected
mock_mapping.__contains__.return_value = True
mock_mapping.__getitem__.return_value = {"latest": mock_node_class}
mock_mapping.return_value = {BuiltinNodeTypes.HTTP_REQUEST: {"latest": mock_node_class}}
result = workflow_service.get_default_block_config(
NodeType.HTTP_REQUEST.value,
BuiltinNodeTypes.HTTP_REQUEST,
filters={HTTP_REQUEST_CONFIG_FILTER_KEY: provided_config},
)
@ -1228,14 +1224,14 @@ class TestWorkflowService:
def test_get_default_block_config_http_request_malformed_config_raises_value_error(self, workflow_service):
with (
patch(
"services.workflow_service.NODE_TYPE_CLASSES_MAPPING",
{NodeType.HTTP_REQUEST: {"latest": HttpRequestNode}},
"services.workflow_service.get_node_type_classes_mapping",
return_value={BuiltinNodeTypes.HTTP_REQUEST: {"latest": HttpRequestNode}},
),
patch("services.workflow_service.LATEST_VERSION", "latest"),
):
with pytest.raises(ValueError, match="http_request_config must be an HttpRequestNodeConfig instance"):
workflow_service.get_default_block_config(
NodeType.HTTP_REQUEST.value,
BuiltinNodeTypes.HTTP_REQUEST,
filters={HTTP_REQUEST_CONFIG_FILTER_KEY: "invalid"},
)