Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine

2026-05-02 00:18:03 +08:00 · 2025-09-02 11:52:25 +08:00
parent 8433cf4437 ca96350707
commit 0b0dc63f29
272 changed files with 3736 additions and 1072 deletions
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@ -1,7 +1,6 @@
 import time
 import uuid
 from os import getenv
-from typing import cast

 import pytest

@ -11,7 +10,6 @@ from core.workflow.enums import WorkflowNodeExecutionStatus
 from core.workflow.graph import Graph
 from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.code.code_node import CodeNode
-from core.workflow.nodes.code.entities import CodeNodeData
 from core.workflow.nodes.node_factory import DifyNodeFactory
 from core.workflow.system_variable import SystemVariable
 from models.enums import UserFrom
@ -242,8 +240,6 @@ def test_execute_code_output_validator_depth():
        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
    }

-    node._node_data = cast(CodeNodeData, node._node_data)
-
    # validate
    node._transform_result(result, node._node_data.outputs)

@ -338,8 +334,6 @@ def test_execute_code_output_object_list():
        ]
    }

-    node._node_data = cast(CodeNodeData, node._node_data)
-
    # validate
    node._transform_result(result, node._node_data.outputs)

--- a/api/tests/integration_tests/workflow/nodes/test_code.py.orig
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py.orig
@ -0,0 +1,390 @@
+import time
+import uuid
+from os import getenv
+
+import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow.entities import GraphInitParams, GraphRuntimeState, VariablePool
+from core.workflow.enums import WorkflowNodeExecutionStatus
+from core.workflow.graph import Graph
+from core.workflow.node_events import NodeRunResult
+from core.workflow.nodes.code.code_node import CodeNode
+from core.workflow.nodes.node_factory import DifyNodeFactory
+from core.workflow.system_variable import SystemVariable
+from models.enums import UserFrom
+from tests.integration_tests.workflow.nodes.__mock.code_executor import setup_code_executor_mock
+
+CODE_MAX_STRING_LENGTH = int(getenv("CODE_MAX_STRING_LENGTH", "10000"))
+
+
+def init_code_node(code_config: dict):
+    graph_config = {
+        "edges": [
+            {
+                "id": "start-source-code-target",
+                "source": "start",
+                "target": "code",
+            },
+        ],
+        "nodes": [{"data": {"type": "start", "title": "Start"}, "id": "start"}, code_config],
+    }
+
+    init_params = GraphInitParams(
+        tenant_id="1",
+        app_id="1",
+        workflow_id="1",
+        graph_config=graph_config,
+        user_id="1",
+        user_from=UserFrom.ACCOUNT,
+        invoke_from=InvokeFrom.DEBUGGER,
+        call_depth=0,
+    )
+
+    # construct variable pool
+    variable_pool = VariablePool(
+        system_variables=SystemVariable(user_id="aaa", files=[]),
+        user_inputs={},
+        environment_variables=[],
+        conversation_variables=[],
+    )
+    variable_pool.add(["code", "args1"], 1)
+    variable_pool.add(["code", "args2"], 2)
+
+    graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
+
+    # Create node factory
+    node_factory = DifyNodeFactory(
+        graph_init_params=init_params,
+        graph_runtime_state=graph_runtime_state,
+    )
+
+    graph = Graph.init(graph_config=graph_config, node_factory=node_factory)
+
+    node = CodeNode(
+        id=str(uuid.uuid4()),
+        config=code_config,
+        graph_init_params=init_params,
+        graph_runtime_state=graph_runtime_state,
+    )
+
+    # Initialize node data
+    if "data" in code_config:
+        node.init_node_data(code_config["data"])
+
+    return node
+
+
+@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
+def test_execute_code(setup_code_executor_mock):
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": args1 + args2,
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "number",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    node.graph_runtime_state.variable_pool.add(["1", "args1"], 1)
+    node.graph_runtime_state.variable_pool.add(["1", "args2"], 2)
+
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+    assert result.outputs is not None
+    assert result.outputs["result"] == 3
+    assert result.error == ""
+
+
+@pytest.mark.parametrize("setup_code_executor_mock", [["none"]], indirect=True)
+def test_execute_code_output_validator(setup_code_executor_mock):
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": args1 + args2,
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "string",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    node.graph_runtime_state.variable_pool.add(["1", "args1"], 1)
+    node.graph_runtime_state.variable_pool.add(["1", "args2"], 2)
+
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.FAILED
+    assert result.error == "Output variable `result` must be a string"
+
+
+def test_execute_code_output_validator_depth():
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": {
+                "result": args1 + args2,
+            }
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "string_validator": {
+                    "type": "string",
+                },
+                "number_validator": {
+                    "type": "number",
+                },
+                "number_array_validator": {
+                    "type": "array[number]",
+                },
+                "string_array_validator": {
+                    "type": "array[string]",
+                },
+                "object_validator": {
+                    "type": "object",
+                    "children": {
+                        "result": {
+                            "type": "number",
+                        },
+                        "depth": {
+                            "type": "object",
+                            "children": {
+                                "depth": {
+                                    "type": "object",
+                                    "children": {
+                                        "depth": {
+                                            "type": "number",
+                                        }
+                                    },
+                                }
+                            },
+                        },
+                    },
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": "1",
+        "number_array_validator": [1, 2, 3, 3.333],
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": "1",
+        "string_validator": 1,
+        "number_array_validator": ["1", "2", "3", "3.333"],
+        "string_array_validator": [1, 2, 3],
+        "object_validator": {"result": "1", "depth": {"depth": {"depth": "1"}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": (CODE_MAX_STRING_LENGTH + 1) * "1",
+        "number_array_validator": [1, 2, 3, 3.333],
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "number_validator": 1,
+        "string_validator": "1",
+        "number_array_validator": [1, 2, 3, 3.333] * 2000,
+        "string_array_validator": ["1", "2", "3"],
+        "object_validator": {"result": 1, "depth": {"depth": {"depth": 1}}},
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+
+def test_execute_code_output_object_list():
+    code = """
+    def main(args1: int, args2: int) -> dict:
+        return {
+            "result": {
+                "result": args1 + args2,
+            }
+        }
+    """
+    # trim first 4 spaces at the beginning of each line
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "object_list": {
+                    "type": "array[object]",
+                },
+            },
+            "title": "123",
+            "variables": [
+                {
+                    "variable": "args1",
+                    "value_selector": ["1", "args1"],
+                },
+                {"variable": "args2", "value_selector": ["1", "args2"]},
+            ],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+
+    # construct result
+    result = {
+        "object_list": [
+            {
+                "result": 1,
+            },
+            {
+                "result": 2,
+            },
+            {
+                "result": [1, 2, 3],
+            },
+        ]
+    }
+
+    # validate
+    node._transform_result(result, node._node_data.outputs)
+
+    # construct result
+    result = {
+        "object_list": [
+            {
+                "result": 1,
+            },
+            {
+                "result": 2,
+            },
+            {
+                "result": [1, 2, 3],
+            },
+            1,
+        ]
+    }
+
+    # validate
+    with pytest.raises(ValueError):
+        node._transform_result(result, node._node_data.outputs)
+
+
+def test_execute_code_scientific_notation():
+    code = """
+    def main() -> dict:
+        return {
+            "result": -8.0E-5
+        }
+    """
+    code = "\n".join([line[4:] for line in code.split("\n")])
+
+    code_config = {
+        "id": "code",
+        "data": {
+            "outputs": {
+                "result": {
+                    "type": "number",
+                },
+            },
+            "title": "123",
+            "variables": [],
+            "answer": "123",
+            "code_language": "python3",
+            "code": code,
+        },
+    }
+
+    node = init_code_node(code_config)
+    # execute node
+    result = node._run()
+    assert isinstance(result, NodeRunResult)
+    assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED