ngskcloud
/
gcgj-dify-1.7.0
17
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: fix style issues

Browse Source
pull/18136/head
JF.Hsiong 1 year ago
parent 452fa1b4c6
commit d2b2489bbf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

1
api/core/workflow/nodes/knowledge_retrieval/entities.py
Unescape Escape View File

@ -116,6 +116,7 @@ class MetadataFilteringCondition(BaseModel):
logical_operator: Optional[Literal["and", "or"]] = "and" logical_operator: Optional[Literal["and", "or"]] = "and"
conditions: Optional[list[Condition]] = Field(default=None, deprecated=True) conditions: Optional[list[Condition]] = Field(default=None, deprecated=True)
class MetadataFilteringComplexCondition(BaseModel): class MetadataFilteringComplexCondition(BaseModel):
logical_operator: Optional[Literal["and", "or"]] = "and" logical_operator: Optional[Literal["and", "or"]] = "and"
conditions: Optional[list[Condition]] = Field(default=None, deprecated=True) conditions: Optional[list[Condition]] = Field(default=None, deprecated=True)

11
api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
Unescape Escape View File

@ -356,19 +356,19 @@ class KnowledgeRetrievalNode(LLMNode):
expected_value, expected_value,
temp_filters, temp_filters,
) )
sub_filters_result: ColumnElement sub_filters_result: ColumnElement
temp_filters_result: ColumnElement temp_filters_result: ColumnElement
if temp_filters and sub_filters: 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 if logical_operator == "and": # type: ignore
sub_filters_result = and_(*temp_all_filters) sub_filters_result = and_(*temp_all_filters)
else: else:
sub_filters_result = or_(*temp_all_filters) sub_filters_result = or_(*temp_all_filters)
filters.append(sub_filters_result) filters.append(sub_filters_result)
return filters return filters
if temp_filters: # text if temp_filters: # text
if logical_operator == "and": # type: ignore if logical_operator == "and": # type: ignore
temp_filters_result = and_(*temp_filters) temp_filters_result = and_(*temp_filters)
else: else:
@ -376,7 +376,7 @@ class KnowledgeRetrievalNode(LLMNode):
filters.append(temp_filters_result) filters.append(temp_filters_result)
return filters return filters
if sub_filters: # Boolean if sub_filters: # Boolean
if logical_operator == "and": # type: ignore if logical_operator == "and": # type: ignore
sub_filters_result = and_(*sub_filters) sub_filters_result = and_(*sub_filters)
else: else:
@ -385,7 +385,6 @@ class KnowledgeRetrievalNode(LLMNode):
return filters return filters
def _get_metadata_filter_condition( def _get_metadata_filter_condition(
self, dataset_ids: list, query: str, node_data: KnowledgeRetrievalNodeData self, dataset_ids: list, query: str, node_data: KnowledgeRetrievalNodeData
) -> tuple[Optional[dict[str, list[str]]], Optional[MetadataCondition]]: ) -> tuple[Optional[dict[str, list[str]]], Optional[MetadataCondition]]:

Write Preview
Loading…
Cancel
Save