AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-14 11:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: reranking disable timer error (#6910)

Browse Source
This commit is contained in:
Joe 2024-08-02 16:34:50 +08:00 committed by GitHub
parent df530b53e5
commit f97a51ce24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,23 +322,26 @@ class DatasetRetrieval:
for thread in threads: for thread in threads:
thread.join() thread.join()
if reranking_enable: with measure_time() as timer:
# do rerank for searched documents if reranking_enable:
data_post_processor = DataPostProcessor(tenant_id, reranking_mode, # do rerank for searched documents
reranking_model, weights, False) data_post_processor = DataPostProcessor(
tenant_id, reranking_mode,
reranking_model, weights, False
)
with measure_time() as timer:
all_documents = data_post_processor.invoke( all_documents = data_post_processor.invoke(
query=query, query=query,
documents=all_documents, documents=all_documents,
score_threshold=score_threshold, score_threshold=score_threshold,
top_n=top_k top_n=top_k
) )
else: else:
if index_type == "economy": if index_type == "economy":
all_documents = self.calculate_keyword_score(query, all_documents, top_k) all_documents = self.calculate_keyword_score(query, all_documents, top_k)
elif index_type == "high_quality": elif index_type == "high_quality":
all_documents = self.calculate_vector_score(all_documents, top_k, score_threshold) all_documents = self.calculate_vector_score(all_documents, top_k, score_threshold)
self._on_query(query, dataset_ids, app_id, user_from, user_id) self._on_query(query, dataset_ids, app_id, user_from, user_id)
if all_documents: if all_documents: