opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix http single run

This commit is contained in:
takatost 2024-04-01 19:40:38 +08:00
parent 41cce464ca
commit 5793855115
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
api/core/workflow/nodes/http_request/http_executor.py
View File

@ -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

5
api/core/workflow/nodes/http_request/http_request_node.py
View File

@ -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