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

Fix/economical knowledge retrieval (#9396)

Browse Source
This commit is contained in:
Jyong 2024-10-16 15:13:45 +08:00 committed by GitHub
parent 7d3dad3d1d
commit 50635e9c15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ class DatasetRetrieval:
"data_source_type": document.data_source_type, "data_source_type": document.data_source_type,
"segment_id": segment.id, "segment_id": segment.id,
"retriever_from": invoke_from.to_source(), "retriever_from": invoke_from.to_source(),
"score": document_score_list.get(segment.index_node_id, None), "score": document_score_list.get(segment.index_node_id, 0.0),
} }
if invoke_from.to_source() == "dev": if invoke_from.to_source() == "dev":
@ -231,12 +231,12 @@ class DatasetRetrieval:
source["content"] = segment.content source["content"] = segment.content
retrieval_resource_list.append(source) retrieval_resource_list.append(source)
if hit_callback and retrieval_resource_list: if hit_callback and retrieval_resource_list:
retrieval_resource_list = sorted(retrieval_resource_list, key=lambda x: x.get("score"), reverse=True) retrieval_resource_list = sorted(retrieval_resource_list, key=lambda x: x.get("score") or 0.0, reverse=True)
for position, item in enumerate(retrieval_resource_list, start=1): for position, item in enumerate(retrieval_resource_list, start=1):
item["position"] = position item["position"] = position
hit_callback.return_retriever_resource_info(retrieval_resource_list) hit_callback.return_retriever_resource_info(retrieval_resource_list)
if document_context_list: if document_context_list:
document_context_list = sorted(document_context_list, key=lambda x: x.score, reverse=True) document_context_list = sorted(document_context_list, key=lambda x: x.score or 0.0, reverse=True)
return str("\n".join([document_context.content for document_context in document_context_list])) return str("\n".join([document_context.content for document_context in document_context_list]))
return "" return ""

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

@ -234,7 +234,7 @@ class KnowledgeRetrievalNode(BaseNode):
retrieval_resource_list.append(source) retrieval_resource_list.append(source)
if retrieval_resource_list: if retrieval_resource_list:
retrieval_resource_list = sorted( retrieval_resource_list = sorted(
retrieval_resource_list, key=lambda x: x.get("metadata").get("score"), reverse=True retrieval_resource_list, key=lambda x: x.get("metadata").get("score") or 0.0, reverse=True
) )
position = 1 position = 1
for item in retrieval_resource_list: for item in retrieval_resource_list: