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

fix ruff check

Browse Source 
Signed-off-by: kenwoodjw <blackxin55+@gmail.com>
pull/20589/head
kenwoodjw 12 months ago
parent 0ad9252458
commit 5ab4553793
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File

11
api/core/rag/retrieval/dataset_retrieval.py
Unescape Escape View File

@ -1048,9 +1048,9 @@ class DatasetRetrieval:
filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) != value) filters.append(sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) != value)
case "in": case "in":
if isinstance(value, list | tuple): if isinstance(value, list | tuple):
if not value: if not value:
return filters return filters
or_conditions = [] or_conditions = []
for i, v in enumerate(value): for i, v in enumerate(value):
if isinstance(v, str): if isinstance(v, str):
@ -1063,7 +1063,7 @@ class DatasetRetrieval:
else: else:
v_str = str(v) v_str = str(v)
or_conditions.append(DatasetDocument.doc_metadata[metadata_name] == f'"{v_str}"') or_conditions.append(DatasetDocument.doc_metadata[metadata_name] == f'"{v_str}"')
if or_conditions: if or_conditions:
filters.append(or_(*or_conditions)) filters.append(or_(*or_conditions))
else: else:
@ -1078,13 +1078,12 @@ class DatasetRetrieval:
if isinstance(value, list | tuple): if isinstance(value, list | tuple):
if not value: if not value:
return filters return filters
and_conditions = [] and_conditions = []
for i, v in enumerate(value): for i, v in enumerate(value):
if isinstance(v, str): if isinstance(v, str):
and_conditions.append(DatasetDocument.doc_metadata[metadata_name] != f'"{v}"') and_conditions.append(DatasetDocument.doc_metadata[metadata_name] != f'"{v}"')
elif isinstance(v, int | float): elif isinstance(v, int | float):
and_conditions.append( and_conditions.append(
sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) != v sqlalchemy_cast(DatasetDocument.doc_metadata[metadata_name].astext, Float) != v
) )
@ -1092,7 +1091,7 @@ class DatasetRetrieval:
else: else:
v_str = str(v) v_str = str(v)
and_conditions.append(DatasetDocument.doc_metadata[metadata_name] != f'"{v_str}"') and_conditions.append(DatasetDocument.doc_metadata[metadata_name] != f'"{v_str}"')
if and_conditions: if and_conditions:
filters.append(and_(*and_conditions)) filters.append(and_(*and_conditions))
else: else:

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

@ -533,14 +533,13 @@ class KnowledgeRetrievalNode(LLMNode):
if isinstance(value, list | tuple): if isinstance(value, list | tuple):
if not value: if not value:
return filters return filters
# Generate matching conditions for each value, supporting both number and string matching # Generate matching conditions for each value, supporting both number and string matching
or_conditions = [] or_conditions = []
for i, v in enumerate(value): for i, v in enumerate(value):
if isinstance(v, str): if isinstance(v, str):
or_conditions.append(Document.doc_metadata[metadata_name] == f'"{v}"') or_conditions.append(Document.doc_metadata[metadata_name] == f'"{v}"')
elif isinstance(v, int | float): elif isinstance(v, int | float):
or_conditions.append( or_conditions.append(
sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) == v sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) == v
) )
@ -548,7 +547,7 @@ class KnowledgeRetrievalNode(LLMNode):
else: else:
v_str = str(v) v_str = str(v)
or_conditions.append(Document.doc_metadata[metadata_name] == f'"{v_str}"') or_conditions.append(Document.doc_metadata[metadata_name] == f'"{v_str}"')
if or_conditions: if or_conditions:
filters.append(or_(*or_conditions)) filters.append(or_(*or_conditions))
else: else:
@ -559,16 +558,15 @@ class KnowledgeRetrievalNode(LLMNode):
filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) == value) filters.append(sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) == value)
case "not in": case "not in":
if isinstance(value, list | tuple): if isinstance(value, list | tuple):
if not value: if not value:
return filters return filters
# generate not in conditions # generate not in conditions
and_conditions = [] and_conditions = []
for i, v in enumerate(value): for i, v in enumerate(value):
if isinstance(v, str): if isinstance(v, str):
and_conditions.append(Document.doc_metadata[metadata_name] != f'"{v}"') and_conditions.append(Document.doc_metadata[metadata_name] != f'"{v}"')
elif isinstance(v, int | float): elif isinstance(v, int | float):
and_conditions.append( and_conditions.append(
sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) != v sqlalchemy_cast(Document.doc_metadata[metadata_name].astext, Float) != v
) )
@ -576,7 +574,7 @@ class KnowledgeRetrievalNode(LLMNode):
else: else:
v_str = str(v) v_str = str(v)
and_conditions.append(Document.doc_metadata[metadata_name] != f'"{v_str}"') and_conditions.append(Document.doc_metadata[metadata_name] != f'"{v_str}"')
if and_conditions: if and_conditions:
filters.append(and_(*and_conditions)) filters.append(and_(*and_conditions))
else: else:

Write Preview
Loading…
Cancel
Save