refactor(api): move HTTP request protocols into shared nodes protocols module

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

@@ -4,19 +4,21 @@ import secrets
 import string
 from collections.abc import Mapping
 from copy import deepcopy
-from typing import Any, Literal, Protocol
+from typing import Any, Literal
 from urllib.parse import urlencode, urlparse
 
 import httpx
 from json_repair import repair_json
 
 from configs import dify_config
-from core.file import File, file_manager
+from core.file import file_manager
 from core.file.enums import FileTransferMethod
 from core.helper import ssrf_proxy
 from core.variables.segments import ArrayFileSegment, FileSegment
 from core.workflow.runtime import VariablePool
 
+from ..protocols import FileManagerProtocol, HttpClientProtocol
+
 from .entities import (
     HttpRequestNodeAuthorization,
     HttpRequestNodeData,
@@ -41,30 +43,6 @@ BODY_TYPE_TO_CONTENT_TYPE = {
 }
 
 
-class HttpClientProtocol(Protocol):
-    @property
-    def max_retries_exceeded_error(self) -> type[Exception]: ...
-
-    @property
-    def request_error(self) -> type[Exception]: ...
-
-    def get(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-    def head(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-    def post(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-    def put(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-    def delete(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-    def patch(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
-
-
-class FileManagerProtocol(Protocol):
-    def download(self, f: File, /) -> bytes: ...
-
-
 class Executor:
     method: Literal[
         "get",

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

@@ -13,11 +13,8 @@ from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.base import variable_template_parser
 from core.workflow.nodes.base.entities import VariableSelector
 from core.workflow.nodes.base.node import Node
-from core.workflow.nodes.http_request.executor import (
-    Executor,
-    FileManagerProtocol,
-    HttpClientProtocol,
-)
+from core.workflow.nodes.http_request.executor import Executor
+from core.workflow.nodes.protocols import FileManagerProtocol, HttpClientProtocol
 from factories import file_factory
 
 from .entities import (

api/core/workflow/nodes/node_factory.py

@@ -14,7 +14,7 @@ from core.workflow.graph import NodeFactory
 from core.workflow.nodes.base.node import Node
 from core.workflow.nodes.code.code_node import CodeNode
 from core.workflow.nodes.code.limits import CodeNodeLimits
-from core.workflow.nodes.http_request.executor import FileManagerProtocol, HttpClientProtocol
+from core.workflow.nodes.protocols import FileManagerProtocol, HttpClientProtocol
 from core.workflow.nodes.http_request.node import HttpRequestNode
 from core.workflow.nodes.template_transform.template_renderer import (
     CodeExecutorJinja2TemplateRenderer,

api/core/workflow/nodes/protocols.py

@@ -0,0 +1,29 @@
+from typing import Protocol
+
+import httpx
+
+from core.file import File
+
+
+class HttpClientProtocol(Protocol):
+    @property
+    def max_retries_exceeded_error(self) -> type[Exception]: ...
+
+    @property
+    def request_error(self) -> type[Exception]: ...
+
+    def get(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+    def head(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+    def post(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+    def put(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+    def delete(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+    def patch(self, url: str, max_retries: int = ..., **kwargs: object) -> httpx.Response: ...
+
+
+class FileManagerProtocol(Protocol):
+    def download(self, f: File, /) -> bytes: ...