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

fix preview and recommend plugins

This commit is contained in:
jyong 2025-09-03 11:35:41 +08:00
parent b10d7d5b22
commit e1b6da21f4
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,10 @@ class WorkflowVariablesConfigManager:
full_path = match.group(1)
last_part = full_path.split(".")[-1]
variables_map.pop(last_part)
if value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1]
variables_map.pop(last_part)
all_second_step_variables = list(variables_map.values())
for item in all_second_step_variables:

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

@ -512,20 +512,28 @@ class RagPipelineService:
datasource_parameters = datasource_node_data.get("datasource_parameters", {})
for key, value in datasource_parameters.items():
if value.get("value") and isinstance(value.get("value"), str):
param_value = value.get("value")
if not param_value:
variables_map[key] = param_value
elif isinstance(param_value, str):
# handle string type parameter value, check if it contains variable reference pattern
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, param_value)
if match:
# extract variable path and try to get value from user inputs
full_path = match.group(1)
last_part = full_path.split(".")[-1]
if last_part in user_inputs:
variables_map[key] = user_inputs[last_part]
else:
variables_map[key] = value["value"]
variables_map[key] = user_inputs.get(last_part, param_value)
else:
variables_map[key] = value["value"]
variables_map[key] = param_value
elif isinstance(param_value, list) and param_value:
# handle list type parameter value, check if the last element is in user inputs
last_part = param_value[-1]
variables_map[key] = user_inputs.get(last_part, param_value)
else:
variables_map[key] = value["value"]
# other type directly use original value
variables_map[key] = param_value
from core.datasource.datasource_manager import DatasourceManager
@ -931,6 +939,10 @@ class RagPipelineService:
full_path = match.group(1)
last_part = full_path.split(".")[-1]
user_input_variables.append(variables_map.get(last_part, {}))
elif value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1]
user_input_variables.append(variables_map.get(last_part, {}))
return user_input_variables
def get_second_step_parameters(self, pipeline: Pipeline, node_id: str, is_draft: bool = False) -> list[dict]:
@ -968,6 +980,9 @@ class RagPipelineService:
full_path = match.group(1)
last_part = full_path.split(".")[-1]
variables_map.pop(last_part)
elif value.get("value") and isinstance(value.get("value"), list):
last_part = value.get("value")[-1]
variables_map.pop(last_part)
all_second_step_variables = list(variables_map.values())
datasource_provider_variables = [
item
@ -1292,3 +1307,4 @@ class RagPipelineService:
"installed_recommended_plugins": installed_plugin_list,
"uninstalled_recommended_plugins": uninstalled_plugin_list,
}