Skip to content

Fix HybridRetriever cutoff and KeyError with small collections #49

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

Open
tavian-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix HybridRetriever cutoff and KeyError with small collections #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion retriv/base_retriever.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def prepare_results(self, doc_ids: List[str], scores: np.ndarray) -> List[dict]:
return results

def map_internal_ids_to_original_ids(self, doc_ids: Iterable) -> List[str]:
return [self.id_mapping[doc_id] for doc_id in doc_ids]
return [self.id_mapping[doc_id] for doc_id in doc_ids if doc_id != -1]

def save(self):
raise NotImplementedError()
Expand Down
10 changes: 6 additions & 4 deletions retriv/hybrid_retriever.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,9 @@ def search(
List: results.
"""

sparse_results = self.sparse_retriever.search(query, False, 1_000)
dense_results = self.dense_retriever.search(query, False, 1_000)
sub_cutoff = max(cutoff, 1_000)
sparse_results = self.sparse_retriever.search(query, False, sub_cutoff)
dense_results = self.dense_retriever.search(query, False, sub_cutoff)
hybrid_results = self.merger.fuse([sparse_results, dense_results])
return (
self.prepare_results(
Expand Down Expand Up @@ -282,8 +283,9 @@ def msearch(
Dict: results.
"""

sparse_results = self.sparse_retriever.msearch(queries, 1_000)
dense_results = self.dense_retriever.msearch(queries, 1_000, batch_size)
sub_cutoff = max(cutoff, 1_000)
sparse_results = self.sparse_retriever.msearch(queries, sub_cutoff)
dense_results = self.dense_retriever.msearch(queries, sub_cutoff, batch_size)
return self.merger.mfuse([sparse_results, dense_results], cutoff)

def bsearch(
Expand Down