From 5793855115b166acb341440838707df10e72ea0b Mon Sep 17 00:00:00 2001
From: takatost <takatost@gmail.com>
Date: Mon, 1 Apr 2024 19:40:38 +0800
Subject: [PATCH] fix http single run

---
 .../nodes/http_request/http_executor.py       | 33 ++++++++++---------
 .../nodes/http_request/http_request_node.py   |  5 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/api/core/workflow/nodes/http_request/http_executor.py b/api/core/workflow/nodes/http_request/http_executor.py
index d270277cd5..f370efa2c0 100644
--- a/api/core/workflow/nodes/http_request/http_executor.py
+++ b/api/core/workflow/nodes/http_request/http_executor.py
@@ -1,7 +1,7 @@
 import json
 from copy import deepcopy
 from random import randint
-from typing import Any, Union
+from typing import Any, Optional, Union
 from urllib.parse import urlencode
 
 import httpx
@@ -138,7 +138,7 @@ class HttpExecutor:
     boundary: str
     variable_selectors: list[VariableSelector]
 
-    def __init__(self, node_data: HttpRequestNodeData, variable_pool: VariablePool):
+    def __init__(self, node_data: HttpRequestNodeData, variable_pool: Optional[VariablePool] = None):
         """
         init
         """
@@ -167,7 +167,7 @@ class HttpExecutor:
         
         return False
 
-    def _init_template(self, node_data: HttpRequestNodeData, variable_pool: VariablePool):
+    def _init_template(self, node_data: HttpRequestNodeData, variable_pool: Optional[VariablePool] = None):
         """
         init template
         """
@@ -381,19 +381,22 @@ class HttpExecutor:
         variable_template_parser = VariableTemplateParser(template=template)
         variable_selectors = variable_template_parser.extract_variable_selectors()
 
-        variable_value_mapping = {}
-        for variable_selector in variable_selectors:
-            value = variable_pool.get_variable_value(
-                variable_selector=variable_selector.value_selector,
-                target_value_type=ValueType.STRING
-            )
+        if variable_pool:
+            variable_value_mapping = {}
+            for variable_selector in variable_selectors:
+                value = variable_pool.get_variable_value(
+                    variable_selector=variable_selector.value_selector,
+                    target_value_type=ValueType.STRING
+                )
 
-            if value is None:
-                raise ValueError(f'Variable {variable_selector.variable} not found')
+                if value is None:
+                    raise ValueError(f'Variable {variable_selector.variable} not found')
 
-            if escape_quotes:
-                value = value.replace('"', '\\"')
+                if escape_quotes:
+                    value = value.replace('"', '\\"')
 
-            variable_value_mapping[variable_selector.variable] = value
+                variable_value_mapping[variable_selector.variable] = value
 
-        return variable_template_parser.format(variable_value_mapping), variable_selectors
+            return variable_template_parser.format(variable_value_mapping), variable_selectors
+        else:
+            return template, variable_selectors
diff --git a/api/core/workflow/nodes/http_request/http_request_node.py b/api/core/workflow/nodes/http_request/http_request_node.py
index 47853832f8..772a248bfc 100644
--- a/api/core/workflow/nodes/http_request/http_request_node.py
+++ b/api/core/workflow/nodes/http_request/http_request_node.py
@@ -62,10 +62,7 @@ class HttpRequestNode(BaseNode):
         :return:
         """
         try:
-            http_executor = HttpExecutor(node_data=node_data, variable_pool=VariablePool(
-                system_variables={},
-                user_inputs={}
-            ))
+            http_executor = HttpExecutor(node_data=node_data)
 
             variable_selectors = http_executor.variable_selectors