opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-29 12:37:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix preview and recommend plugins

Browse Source
This commit is contained in:
jyong 2025-09-03 19:42:20 +08:00
parent 49d268d4a3
commit 5ab3cd7213
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/core/app/app_config/workflow_ui_based_app/variables/manager.py
View File

@ -48,17 +48,17 @@ class WorkflowVariablesConfigManager:
if datasource_node_data: if datasource_node_data:
datasource_parameters = datasource_node_data.get("datasource_parameters", {}) datasource_parameters = datasource_node_data.get("datasource_parameters", {})
for key, value in datasource_parameters.items(): for _, value in datasource_parameters.items():
if value.get("value") and isinstance(value.get("value"), str): if value.get("value") and isinstance(value.get("value"), str):
pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}" pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}"
match = re.match(pattern, value["value"]) match = re.match(pattern, value["value"])
if match: if match:
full_path = match.group(1) full_path = match.group(1)
last_part = full_path.split(".")[-1] last_part = full_path.split(".")[-1]
variables_map.pop(last_part) variables_map.pop(last_part, None)
if value.get("value") and isinstance(value.get("value"), list): if value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1] last_part = value.get("value")[-1]
variables_map.pop(last_part) variables_map.pop(last_part, None)
all_second_step_variables = list(variables_map.values()) all_second_step_variables = list(variables_map.values())

18
api/services/rag_pipeline/rag_pipeline.py
View File

@ -929,19 +929,23 @@ class RagPipelineService:
else: else:
return [] return []
datasource_parameters = datasource_node_data.get("datasource_parameters", {}) datasource_parameters = datasource_node_data.get("datasource_parameters", {})
user_input_variables_keys = []
user_input_variables = [] user_input_variables = []
for key, value in datasource_parameters.items():
for _, value in datasource_parameters.items():
if value.get("value") and isinstance(value.get("value"), str): if value.get("value") and isinstance(value.get("value"), str):
pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}" pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}"
match = re.match(pattern, value["value"]) match = re.match(pattern, value["value"])
if match: if match:
full_path = match.group(1) full_path = match.group(1)
last_part = full_path.split(".")[-1] last_part = full_path.split(".")[-1]
user_input_variables.append(variables_map.get(last_part, {})) user_input_variables_keys.append(last_part)
elif value.get("value") and isinstance(value.get("value"), list): elif value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1] last_part = value.get("value")[-1]
user_input_variables.append(variables_map.get(last_part, {})) user_input_variables_keys.append(last_part)
for key, value in variables_map.items():
if key in user_input_variables_keys:
user_input_variables.append(value)
return user_input_variables return user_input_variables
@ -972,17 +976,17 @@ class RagPipelineService:
if datasource_node_data: if datasource_node_data:
datasource_parameters = datasource_node_data.get("datasource_parameters", {}) datasource_parameters = datasource_node_data.get("datasource_parameters", {})
for key, value in datasource_parameters.items(): for _, value in datasource_parameters.items():
if value.get("value") and isinstance(value.get("value"), str): if value.get("value") and isinstance(value.get("value"), str):
pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}" pattern = r"\{\{#([a-zA-Z0-9_]{1,50}(?:\.[a-zA-Z0-9_][a-zA-Z0-9_]{0,29}){1,10})#\}\}"
match = re.match(pattern, value["value"]) match = re.match(pattern, value["value"])
if match: if match:
full_path = match.group(1) full_path = match.group(1)
last_part = full_path.split(".")[-1] last_part = full_path.split(".")[-1]
variables_map.pop(last_part) variables_map.pop(last_part, None)
elif value.get("value") and isinstance(value.get("value"), list): elif value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1] last_part = value.get("value")[-1]
variables_map.pop(last_part) variables_map.pop(last_part, None)
all_second_step_variables = list(variables_map.values()) all_second_step_variables = list(variables_map.values())
datasource_provider_variables = [ datasource_provider_variables = [
item item