estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix multiple metadata filter's confusing setting (#16771)

Browse Source
This commit is contained in:
Jyong
2025-03-26 14:16:21 +08:00
committed by GitHub
parent 2da780e4dc
commit 6a857e01f6
2 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
api/core/rag/retrieval/dataset_retrieval.py
View File

@@ -850,8 +850,9 @@ class DatasetRetrieval:
) )
if automatic_metadata_filters: if automatic_metadata_filters:
conditions = [] conditions = []
for filter in automatic_metadata_filters: for sequence, filter in enumerate(automatic_metadata_filters):
self._process_metadata_filter_func( self._process_metadata_filter_func(
sequence,
filter.get("condition"), # type: ignore filter.get("condition"), # type: ignore
filter.get("metadata_name"), # type: ignore filter.get("metadata_name"), # type: ignore
filter.get("value"), filter.get("value"),
@@ -871,14 +872,18 @@ class DatasetRetrieval:
elif metadata_filtering_mode == "manual": elif metadata_filtering_mode == "manual":
if metadata_filtering_conditions: if metadata_filtering_conditions:
metadata_condition = MetadataCondition(**metadata_filtering_conditions.model_dump()) metadata_condition = MetadataCondition(**metadata_filtering_conditions.model_dump())
for condition in metadata_filtering_conditions.conditions: # type: ignore for sequence, condition in enumerate(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 or condition.comparison_operator in ("empty", "not empty"): if expected_value is not None or condition.comparison_operator in ("empty", "not empty"):
if isinstance(expected_value, str): if isinstance(expected_value, str):
expected_value = self._replace_metadata_filter_value(expected_value, inputs) expected_value = self._replace_metadata_filter_value(expected_value, inputs)
filters = self._process_metadata_filter_func( filters = self._process_metadata_filter_func(
condition.comparison_operator, metadata_name, expected_value, filters sequence,
condition.comparison_operator,
metadata_name,
expected_value,
filters,
) )
else: else:
raise ValueError("Invalid metadata filtering mode") raise ValueError("Invalid metadata filtering mode")
@@ -960,26 +965,36 @@ class DatasetRetrieval:
return None return None
return automatic_metadata_filters return automatic_metadata_filters
def _process_metadata_filter_func(self, condition: str, metadata_name: str, value: Optional[Any], filters: list): def _process_metadata_filter_func(
self, sequence: int, condition: str, metadata_name: str, value: Optional[Any], filters: list
):
key = f"{metadata_name}_{sequence}"
key_value = f"{metadata_name}_{sequence}_value"
match condition: match condition:
case "contains": case "contains":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"%{value}%") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"%{value}%"}
)
) )
case "not contains": case "not contains":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key NOT LIKE :value")).params( (text(f"documents.doc_metadata ->> :{key} NOT LIKE :{key_value}")).params(
key=metadata_name, value=f"%{value}%" **{key: metadata_name, key_value: f"%{value}%"}
) )
) )
case "start with": case "start with":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"{value}%") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"{value}%"}
)
) )
case "end with": case "end with":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"%{value}") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"%{value}"}
)
) )
case "is" | "=": case "is" | "=":
if isinstance(value, str): if isinstance(value, str):

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

@@ -332,8 +332,9 @@ class KnowledgeRetrievalNode(LLMNode):
automatic_metadata_filters = self._automatic_metadata_filter_func(dataset_ids, query, node_data) automatic_metadata_filters = self._automatic_metadata_filter_func(dataset_ids, query, node_data)
if automatic_metadata_filters: if automatic_metadata_filters:
conditions = [] conditions = []
for filter in automatic_metadata_filters: for sequence, filter in enumerate(automatic_metadata_filters):
self._process_metadata_filter_func( self._process_metadata_filter_func(
sequence,
filter.get("condition", ""), filter.get("condition", ""),
filter.get("metadata_name", ""), filter.get("metadata_name", ""),
filter.get("value"), filter.get("value"),
@@ -354,7 +355,7 @@ class KnowledgeRetrievalNode(LLMNode):
if node_data.metadata_filtering_conditions: if node_data.metadata_filtering_conditions:
metadata_condition = MetadataCondition(**node_data.metadata_filtering_conditions.model_dump()) metadata_condition = MetadataCondition(**node_data.metadata_filtering_conditions.model_dump())
if node_data.metadata_filtering_conditions: if node_data.metadata_filtering_conditions:
for condition in 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 or condition.comparison_operator in ("empty", "not empty"): if expected_value is not None or condition.comparison_operator in ("empty", "not empty"):
@@ -362,14 +363,18 @@ class KnowledgeRetrievalNode(LLMNode):
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 == "number": if expected_value.value_type == "number": # type: ignore
expected_value = expected_value.value expected_value = expected_value.value # type: ignore
elif expected_value.value_type == "string": elif expected_value.value_type == "string": # type: ignore
expected_value = re.sub(r"[\r\n\t]+", " ", expected_value.text).strip() 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")
filters = self._process_metadata_filter_func( filters = self._process_metadata_filter_func(
condition.comparison_operator, metadata_name, expected_value, filters sequence,
condition.comparison_operator,
metadata_name,
expected_value,
filters,
) )
else: else:
raise ValueError("Invalid metadata filtering mode") raise ValueError("Invalid metadata filtering mode")
@@ -448,25 +453,35 @@ class KnowledgeRetrievalNode(LLMNode):
return [] return []
return automatic_metadata_filters return automatic_metadata_filters
def _process_metadata_filter_func(self, condition: str, metadata_name: str, value: Optional[str], filters: list): def _process_metadata_filter_func(
self, sequence: int, condition: str, metadata_name: str, value: Optional[Any], filters: list
):
key = f"{metadata_name}_{sequence}"
key_value = f"{metadata_name}_{sequence}_value"
match condition: match condition:
case "contains": case "contains":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"%{value}%") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"%{value}%"}
)
) )
case "not contains": case "not contains":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key NOT LIKE :value")).params( (text(f"documents.doc_metadata ->> :{key} NOT LIKE :{key_value}")).params(
key=metadata_name, value=f"%{value}%" **{key: metadata_name, key_value: f"%{value}%"}
) )
) )
case "start with": case "start with":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"{value}%") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"{value}%"}
)
) )
case "end with": case "end with":
filters.append( filters.append(
(text("documents.doc_metadata ->> :key LIKE :value")).params(key=metadata_name, value=f"%{value}") (text(f"documents.doc_metadata ->> :{key} LIKE :{key_value}")).params(
**{key: metadata_name, key_value: f"%{value}"}
)
) )
case "=" | "is": case "=" | "is":
if isinstance(value, str): if isinstance(value, str):