From d2b2489bbf6ffbe81658c2c5a4c6b2f25ce307c2 Mon Sep 17 00:00:00 2001 From: "JF.Hsiong" Date: Fri, 18 Apr 2025 16:06:38 +0800 Subject: [PATCH] style: fix style issues --- .../workflow/nodes/knowledge_retrieval/entities.py | 1 + .../knowledge_retrieval/knowledge_retrieval_node.py | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/core/workflow/nodes/knowledge_retrieval/entities.py b/api/core/workflow/nodes/knowledge_retrieval/entities.py index 7fde733eb5..07dca08129 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/entities.py +++ b/api/core/workflow/nodes/knowledge_retrieval/entities.py @@ -116,6 +116,7 @@ class MetadataFilteringCondition(BaseModel): logical_operator: Optional[Literal["and", "or"]] = "and" conditions: Optional[list[Condition]] = Field(default=None, deprecated=True) + class MetadataFilteringComplexCondition(BaseModel): logical_operator: Optional[Literal["and", "or"]] = "and" conditions: Optional[list[Condition]] = Field(default=None, deprecated=True) diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py index 2af78c72e0..bda728812c 100644 --- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py +++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py @@ -356,19 +356,19 @@ class KnowledgeRetrievalNode(LLMNode): expected_value, temp_filters, ) - + sub_filters_result: ColumnElement temp_filters_result: ColumnElement if temp_filters and sub_filters: - temp_all_filters = sub_filters +temp_filters + temp_all_filters = sub_filters + temp_filters if logical_operator == "and": # type: ignore sub_filters_result = and_(*temp_all_filters) else: sub_filters_result = or_(*temp_all_filters) filters.append(sub_filters_result) return filters - - if temp_filters: # text + + if temp_filters: # text if logical_operator == "and": # type: ignore temp_filters_result = and_(*temp_filters) else: @@ -376,7 +376,7 @@ class KnowledgeRetrievalNode(LLMNode): filters.append(temp_filters_result) return filters - if sub_filters: # Boolean + if sub_filters: # Boolean if logical_operator == "and": # type: ignore sub_filters_result = and_(*sub_filters) else: @@ -385,7 +385,6 @@ class KnowledgeRetrievalNode(LLMNode): return filters - def _get_metadata_filter_condition( self, dataset_ids: list, query: str, node_data: KnowledgeRetrievalNodeData ) -> tuple[Optional[dict[str, list[str]]], Optional[MetadataCondition]]: