yujunjun/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2025-07-31 13:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant condition check (#22983)

Browse Source 
Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
This commit is contained in:
Yongtao Huang 2025-07-25 23:38:16 +08:00 committed by GitHub
parent ee50a2bcd5
commit faaf828dff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
View File

@ -453,35 +453,34 @@ class KnowledgeRetrievalNode(BaseNode):
elif node_data.metadata_filtering_mode == "manual": elif node_data.metadata_filtering_mode == "manual":
if node_data.metadata_filtering_conditions: if node_data.metadata_filtering_conditions:
conditions = [] conditions = []
if node_data.metadata_filtering_conditions: for sequence, condition in enumerate(node_data.metadata_filtering_conditions.conditions): # type: ignore
for sequence, condition in enumerate(node_data.metadata_filtering_conditions.conditions): # type: ignore metadata_name = condition.name
metadata_name = condition.name expected_value = condition.value
expected_value = condition.value if expected_value is not None and condition.comparison_operator not in ("empty", "not empty"):
if expected_value is not None and condition.comparison_operator not in ("empty", "not empty"): if isinstance(expected_value, str):
if isinstance(expected_value, str): expected_value = self.graph_runtime_state.variable_pool.convert_template(
expected_value = self.graph_runtime_state.variable_pool.convert_template( expected_value
expected_value ).value[0]
).value[0] if expected_value.value_type in {"number", "integer", "float"}: # type: ignore
if expected_value.value_type in {"number", "integer", "float"}: # type: ignore expected_value = expected_value.value # type: ignore
expected_value = expected_value.value # type: ignore elif expected_value.value_type == "string": # type: ignore
elif expected_value.value_type == "string": # type: ignore expected_value = re.sub(r"[\r\n\t]+", " ", expected_value.text).strip() # type: ignore
expected_value = re.sub(r"[\r\n\t]+", " ", expected_value.text).strip() # type: ignore else:
else: raise ValueError("Invalid expected metadata value type")
raise ValueError("Invalid expected metadata value type") conditions.append(
conditions.append( Condition(
Condition( name=metadata_name,
name=metadata_name, comparison_operator=condition.comparison_operator,
comparison_operator=condition.comparison_operator, value=expected_value,
value=expected_value,
)
)
filters = self._process_metadata_filter_func(
sequence,
condition.comparison_operator,
metadata_name,
expected_value,
filters,
) )
)
filters = self._process_metadata_filter_func(
sequence,
condition.comparison_operator,
metadata_name,
expected_value,
filters,
)
metadata_condition = MetadataCondition( metadata_condition = MetadataCondition(
logical_operator=node_data.metadata_filtering_conditions.logical_operator, logical_operator=node_data.metadata_filtering_conditions.logical_operator,
conditions=conditions, conditions=conditions,