refactor(http_request): streamline HTTP request handling

- Renamed `HttpExecutor` to `Executor` for consistency.
- Unified `Response` handling by moving common logic to a single `Response` class to avoid redundancy.
- Simplified imports and file structure for clearer organization.
- Updated tests and references to reflect changes in class and module names.

api/core/workflow/nodes/http_request/__init__.py

@@ -1,4 +1,4 @@
 from .entities import BodyData, HttpRequestNodeAuthorization, HttpRequestNodeBody, HttpRequestNodeData
-from .http_request_node import HttpRequestNode
+from .node import HttpRequestNode
 
 __all__ = ["HttpRequestNodeData", "HttpRequestNodeAuthorization", "HttpRequestNodeBody", "BodyData", "HttpRequestNode"]

api/core/workflow/nodes/http_request/entities.py

@@ -1,11 +1,20 @@
 from collections.abc import Sequence
 from typing import Literal, Optional
 
+import httpx
 from pydantic import BaseModel, Field, ValidationInfo, field_validator
 
 from configs import dify_config
 from core.workflow.entities.base_node_data_entities import BaseNodeData
 
+NON_FILE_CONTENT_TYPES = (
+    "application/json",
+    "application/xml",
+    "text/html",
+    "text/plain",
+    "application/x-www-form-urlencoded",
+)
+
 
 class HttpRequestNodeAuthorizationConfig(BaseModel):
     type: Literal["basic", "bearer", "custom"]
@@ -62,3 +71,51 @@ class HttpRequestNodeData(BaseNodeData):
     params: str
     body: Optional[HttpRequestNodeBody] = None
     timeout: Optional[HttpRequestNodeTimeout] = None
+
+
+class Response:
+    headers: dict[str, str]
+    response: httpx.Response
+
+    def __init__(self, response: httpx.Response):
+        self.response = response
+        self.headers = dict(response.headers)
+
+    @property
+    def is_file(self):
+        content_type = self.content_type
+        content_disposition = self.response.headers.get("Content-Disposition", "")
+
+        return "attachment" in content_disposition or (
+            not any(non_file in content_type for non_file in NON_FILE_CONTENT_TYPES)
+            and any(file_type in content_type for file_type in ("application/", "image/", "audio/", "video/"))
+        )
+
+    @property
+    def content_type(self) -> str:
+        return self.headers.get("Content-Type", "")
+
+    @property
+    def text(self) -> str:
+        return self.response.text
+
+    @property
+    def content(self) -> bytes:
+        return self.response.content
+
+    @property
+    def status_code(self) -> int:
+        return self.response.status_code
+
+    @property
+    def size(self) -> int:
+        return len(self.content)
+
+    @property
+    def readable_size(self) -> str:
+        if self.size < 1024:
+            return f"{self.size} bytes"
+        elif self.size < 1024 * 1024:
+            return f"{(self.size / 1024):.2f} KB"
+        else:
+            return f"{(self.size / 1024 / 1024):.2f} MB"

api/core/workflow/nodes/http_request/http_executor.py → api/core/workflow/nodes/http_request/executor.py

@@ -11,10 +11,12 @@
 from core.file import file_manager
 from core.helper import ssrf_proxy
 from core.workflow.entities.variable_pool import VariablePool
-from core.workflow.nodes.http_request.entities import (
+
+from .entities import (
     HttpRequestNodeAuthorization,
     HttpRequestNodeData,
     HttpRequestNodeTimeout,
+    Response,
 )
 
 BODY_TYPE_TO_CONTENT_TYPE = {
@@ -23,64 +25,9 @@
     "form-data": "multipart/form-data",
     "raw-text": "text/plain",
 }
-NON_FILE_CONTENT_TYPES = (
-    "application/json",
-    "application/xml",
-    "text/html",
-    "text/plain",
-    "application/x-www-form-urlencoded",
-)
-
-
-class HttpExecutorResponse:
-    headers: dict[str, str]
-    response: httpx.Response
-
-    def __init__(self, response: httpx.Response):
-        self.response = response
-        self.headers = dict(response.headers)
-
-    @property
-    def is_file(self):
-        content_type = self.content_type
-        content_disposition = self.response.headers.get("Content-Disposition", "")
-
-        return "attachment" in content_disposition or (
-            not any(non_file in content_type for non_file in NON_FILE_CONTENT_TYPES)
-            and any(file_type in content_type for file_type in ("application/", "image/", "audio/", "video/"))
-        )
-
-    @property
-    def content_type(self) -> str:
-        return self.headers.get("Content-Type", "")
-
-    @property
-    def text(self) -> str:
-        return self.response.text
-
-    @property
-    def content(self) -> bytes:
-        return self.response.content
-
-    @property
-    def status_code(self) -> int:
-        return self.response.status_code
-
-    @property
-    def size(self) -> int:
-        return len(self.content)
-
-    @property
-    def readable_size(self) -> str:
-        if self.size < 1024:
-            return f"{self.size} bytes"
-        elif self.size < 1024 * 1024:
-            return f"{(self.size / 1024):.2f} KB"
-        else:
-            return f"{(self.size / 1024 / 1024):.2f} MB"
 
 
-class HttpExecutor:
+class Executor:
     method: Literal["get", "head", "post", "put", "delete", "patch"]
     url: str
     params: Mapping[str, str] | None
@@ -221,8 +168,8 @@ def _assembling_headers(self) -> dict[str, Any]:
 
         return headers
 
-    def _validate_and_parse_response(self, response: httpx.Response) -> HttpExecutorResponse:
-        executor_response = HttpExecutorResponse(response)
+    def _validate_and_parse_response(self, response: httpx.Response) -> Response:
+        executor_response = Response(response)
 
         threshold_size = (
             dify_config.HTTP_REQUEST_NODE_MAX_BINARY_SIZE
@@ -260,7 +207,7 @@ def _do_http_request(self, headers: dict[str, Any]) -> httpx.Response:
         response = getattr(ssrf_proxy, self.method)(**request_args)
         return response
 
-    def invoke(self) -> HttpExecutorResponse:
+    def invoke(self) -> Response:
         # assemble headers
         headers = self._assembling_headers()
         # do http request

api/core/workflow/nodes/http_request/http_request_node.py → api/core/workflow/nodes/http_request/node.py

@@ -14,7 +14,7 @@
     HttpRequestNodeData,
     HttpRequestNodeTimeout,
 )
-from core.workflow.nodes.http_request.http_executor import HttpExecutor, HttpExecutorResponse
+from core.workflow.nodes.http_request.executor import Executor
 from core.workflow.utils import variable_template_parser
 from enums import NodeType
 from models.workflow import WorkflowNodeExecutionStatus
@@ -24,6 +24,7 @@
     read=dify_config.HTTP_REQUEST_MAX_READ_TIMEOUT,
     write=dify_config.HTTP_REQUEST_MAX_WRITE_TIMEOUT,
 )
+from .entities import Response
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +55,7 @@ def get_default_config(cls, filters: dict | None = None) -> dict:
     def _run(self) -> NodeRunResult:
         process_data = {}
         try:
-            http_executor = HttpExecutor(
+            http_executor = Executor(
                 node_data=self.node_data,
                 timeout=self._get_request_timeout(self.node_data),
                 variable_pool=self.graph_runtime_state.variable_pool,
@@ -135,7 +136,7 @@ def _extract_variable_selector_to_variable_mapping(
 
         return mapping
 
-    def extract_files(self, url: str, response: HttpExecutorResponse) -> list[File]:
+    def extract_files(self, url: str, response: Response) -> list[File]:
         """
         Extract files from response
         """

api/core/workflow/nodes/node_mapping.py

@@ -2,7 +2,7 @@
 from core.workflow.nodes.code.code_node import CodeNode
 from core.workflow.nodes.document_extractor import DocumentExtractorNode
 from core.workflow.nodes.end.end_node import EndNode
-from core.workflow.nodes.http_request.http_request_node import HttpRequestNode
+from core.workflow.nodes.http_request.node import HttpRequestNode
 from core.workflow.nodes.if_else.if_else_node import IfElseNode
 from core.workflow.nodes.iteration.iteration_node import IterationNode
 from core.workflow.nodes.iteration.iteration_start_node import IterationStartNode

api/tests/integration_tests/workflow/nodes/test_http.py

@@ -10,7 +10,7 @@
 from core.workflow.graph_engine.entities.graph import Graph
 from core.workflow.graph_engine.entities.graph_init_params import GraphInitParams
 from core.workflow.graph_engine.entities.graph_runtime_state import GraphRuntimeState
-from core.workflow.nodes.http_request.http_request_node import HttpRequestNode
+from core.workflow.nodes.http_request.node import HttpRequestNode
 from enums import UserFrom
 from models.workflow import WorkflowType
 from tests.integration_tests.workflow.nodes.__mock.http import setup_http_mock

api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py

@@ -108,14 +108,10 @@ def test_run_extract_text(
 
     if mime_type == "application/pdf":
         mock_pdf_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr(
-            "core.workflow.nodes.document_extractor.document_extractor_node._extract_text_from_pdf", mock_pdf_extract
-        )
+        monkeypatch.setattr("core.workflow.nodes.document_extractor.node._extract_text_from_pdf", mock_pdf_extract)
     elif mime_type.startswith("application/vnd.openxmlformats"):
         mock_docx_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr(
-            "core.workflow.nodes.document_extractor.document_extractor_node._extract_text_from_doc", mock_docx_extract
-        )
+        monkeypatch.setattr("core.workflow.nodes.document_extractor.node._extract_text_from_doc", mock_docx_extract)
 
     result = document_extractor_node._run()
 

api/tests/unit_tests/core/workflow/nodes/test_http_request_node.py

@@ -14,7 +14,7 @@
     HttpRequestNodeBody,
     HttpRequestNodeData,
 )
-from core.workflow.nodes.http_request.http_executor import _plain_text_to_dict
+from core.workflow.nodes.http_request.executor import _plain_text_to_dict
 from enums import UserFrom
 from models.workflow import WorkflowNodeExecutionStatus, WorkflowType
 
@@ -96,7 +96,7 @@ def test_http_request_node_binary_file(monkeypatch):
         ),
     )
     monkeypatch.setattr(
-        "core.workflow.nodes.http_request.http_executor.file_manager.download",
+        "core.workflow.nodes.http_request.executor.file_manager.download",
         lambda *args, **kwargs: b"test",
     )
     monkeypatch.setattr(
@@ -183,7 +183,7 @@ def test_http_request_node_form_with_file(monkeypatch):
         ),
     )
     monkeypatch.setattr(
-        "core.workflow.nodes.http_request.http_executor.file_manager.download",
+        "core.workflow.nodes.http_request.executor.file_manager.download",
         lambda *args, **kwargs: b"test",
     )