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

fix(workflow): decouple http request node external dependencies (#32762)

Browse Source
This commit is contained in:
99
2026-03-01 15:42:57 +08:00
committed by GitHub
parent a7789f2c91
commit 9e9e617e09
8 changed files with 76 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
View File

@ -123,6 +123,9 @@ class MockNodeFactory(DifyNodeFactory):
graph_runtime_state=self.graph_runtime_state,
mock_config=self.mock_config,
http_request_config=self._http_request_config,
http_client=self._http_request_http_client,
tool_file_manager_factory=self._http_request_tool_file_manager_factory,
file_manager=self._http_request_file_manager,
)
elif node_type in {NodeType.LLM, NodeType.QUESTION_CLASSIFIER, NodeType.PARAMETER_EXTRACTOR}:
mock_instance = mock_class(

32
api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
View File

@ -1,6 +1,8 @@
import pytest
from configs import dify_config
from core.helper.ssrf_proxy import ssrf_proxy
from core.workflow.file.file_manager import file_manager
from core.workflow.nodes.http_request import (
BodyData,
HttpRequestNodeAuthorization,
@ -59,6 +61,8 @@ def test_executor_with_json_body_and_number_variable():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Check the executor's data
@ -113,6 +117,8 @@ def test_executor_with_json_body_and_object_variable():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Check the executor's data
@ -169,6 +175,8 @@ def test_executor_with_json_body_and_nested_object_variable():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Check the executor's data
@ -213,6 +221,8 @@ def test_extract_selectors_from_template_with_newline():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
assert executor.params == [("test", "line1\nline2")]
@ -258,6 +268,8 @@ def test_executor_with_form_data():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Check the executor's data
@ -309,6 +321,8 @@ def test_init_headers():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=VariablePool(system_variables=SystemVariable.default()),
http_client=ssrf_proxy,
file_manager=file_manager,
)
executor = create_executor("aa\n cc:")
@ -344,6 +358,8 @@ def test_init_params():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=VariablePool(system_variables=SystemVariable.default()),
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Test basic key-value pairs
@ -394,6 +410,8 @@ def test_empty_api_key_raises_error_bearer():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
@ -419,6 +437,8 @@ def test_empty_api_key_raises_error_basic():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
@ -444,6 +464,8 @@ def test_empty_api_key_raises_error_custom():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
@ -469,6 +491,8 @@ def test_whitespace_only_api_key_raises_error():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
@ -493,6 +517,8 @@ def test_valid_api_key_works():
timeout=timeout,
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# Should not raise an error
@ -541,6 +567,8 @@ def test_executor_with_json_body_and_unquoted_uuid_variable():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# The UUID should be preserved in full, not truncated
@ -586,6 +614,8 @@ def test_executor_with_json_body_and_unquoted_uuid_with_newlines():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
# The UUID should be preserved in full
@ -625,6 +655,8 @@ def test_executor_with_json_body_preserves_numbers_and_strings():
timeout=HttpRequestNodeTimeout(connect=10, read=30, write=30),
http_request_config=HTTP_REQUEST_CONFIG,
variable_pool=variable_pool,
http_client=ssrf_proxy,
file_manager=file_manager,
)
assert executor.json["count"] == 42

6
api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
View File

@ -5,8 +5,11 @@ import httpx
import pytest
from core.app.entities.app_invoke_entities import InvokeFrom
from core.helper.ssrf_proxy import ssrf_proxy
from core.tools.tool_file_manager import ToolFileManager
from core.workflow.entities import GraphInitParams
from core.workflow.enums import WorkflowNodeExecutionStatus
from core.workflow.file.file_manager import file_manager
from core.workflow.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
from core.workflow.nodes.http_request.entities import HttpRequestNodeTimeout, Response
from core.workflow.runtime import GraphRuntimeState, VariablePool
@ -116,6 +119,9 @@ def _build_http_node(
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
http_request_config=HTTP_REQUEST_CONFIG,
http_client=ssrf_proxy,
tool_file_manager_factory=ToolFileManager,
file_manager=file_manager,
)