Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/economical knowledge retrieval #9396

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Fix/economical knowledge retrieval #9396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca8bbb7
add the default score value for economical knowledge retrieval
JohnJyong Oct 16, 2024
29e6efd
add the default score value for economical knowledge retrieval
JohnJyong Oct 16, 2024
c54b37f
add the default score value for economical knowledge retrieval
JohnJyong Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/core/rag/retrieval/dataset_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def retrieve(
"data_source_type": document.data_source_type,
"segment_id": segment.id,
"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":
Expand All @@ -231,12 +231,12 @@ def retrieve(
source["content"] = segment.content
retrieval_resource_list.append(source)
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):
item["position"] = position
hit_callback.return_retriever_resource_info(retrieval_resource_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 ""

Expand Down
2 changes: 1 addition & 1 deletion api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def _fetch_dataset_retriever(self, node_data: KnowledgeRetrievalNodeData, query:
retrieval_resource_list.append(source)
if retrieval_resource_list:
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
for item in retrieval_resource_list:
Expand Down
Loading