Skip to content

refactor: make Reranker stateless with std::variant value semantics (… #471

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

Merged
Cuiyus merged 9 commits into from
Jun 9, 2026
Merged

refactor: make Reranker stateless with std::variant value semantics (… #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af54e77
refactor: make Reranker stateless with std::variant value semantics (…
Cuiyus Jun 5, 2026
a9c66cb
chore: remove nightly_build.yml unrelated to reranker refactor
Cuiyus Jun 8, 2026
ac076eb
chore: remove uv.lock unrelated to reranker refactor
Cuiyus Jun 8, 2026
2e51c1b
fix: raise ValueError when multi-query has no reranker
Cuiyus Jun 8, 2026
69b3938
Merge branch 'main' into refactor/reranker-stateless-461
Cuiyus Jun 8, 2026
829f9fb
fix(reranker): use index_type FTS check for non-vector normalization
Cuiyus Jun 8, 2026
c3286ac
refactor(reranker): move Params types into reranker namespace and qua…
Cuiyus Jun 8, 2026
7a5f5d2
refactor(query): drop unused PendingQuery wrapper, use std::vector<Se…
Cuiyus Jun 8, 2026
c4516ea
refactor(reranker): make _to_cpp_params non-abstract with default Not…
Cuiyus Jun 9, 2026
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
9 changes: 7 additions & 2 deletions python/tests/detail/test_collection_dql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ def test_query_multivector_rrf(self, full_collection: Collection, doc_num):
rrf_reranker = RrfReRanker()
multi_query_result = full_collection.query(
multi_query_vectors,
topk=3,
reranker=rrf_reranker,
)
assert len(multi_query_result) > 0, (
Expand Down Expand Up @@ -876,8 +877,11 @@ def test_query_multivector_weighted(
batchdoc_and_check(full_collection, multiple_docs, doc_num, operator="insert")
doc_fields, doc_vectors = generate_vectordict_random(full_collection.schema)

weight_list = [weights[v] for v in DEFAULT_VECTOR_FIELD_NAME.values()]
weighted_reranker = WeightedReRanker(weights=weight_list)
# Weights are positional, aligned with the multi_query_vectors order
# (DEFAULT_VECTOR_FIELD_NAME insertion order). Metric normalization is
# automatic from each field's schema.
weights_list = [weights[v] for v in DEFAULT_VECTOR_FIELD_NAME.values()]
weighted_reranker = WeightedReRanker(weights_list)

single_query_results = {}
for k, v in DEFAULT_VECTOR_FIELD_NAME.items():
Expand All @@ -894,6 +898,7 @@ def test_query_multivector_weighted(

multi_query_result = full_collection.query(
multi_query_vectors,
topk=3,
reranker=weighted_reranker,
)
assert len(multi_query_result) > 0, (
Expand Down
14 changes: 8 additions & 6 deletions python/tests/test_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
InvertIndexParam,
LogLevel,
LogType,
MetricType,
OptimizeOption,
StatusCode,
Query,
Expand Down Expand Up @@ -1105,7 +1104,8 @@ def test_collection_query_with_weighted_reranker_by_multi_dense_vector(
self, collection_with_multiple_docs: Collection, multiple_docs
):
"""Test multi-vector query with Weighted reranker on multiple dense vectors."""
reranker = WeightedReRanker(weights=[0.6, 0.4])
weights = [0.6, 0.4]
reranker = WeightedReRanker(weights=weights)
result = collection_with_multiple_docs.query(
[
Query(field_name="dense", vector=multiple_docs[0].vector("dense")),
Expand All @@ -1121,7 +1121,8 @@ def test_collection_query_with_weighted_reranker_by_multi_sparse_vector(
self, collection_with_multiple_docs: Collection, multiple_docs
):
"""Test multi-vector query with Weighted reranker on multiple sparse vectors."""
reranker = WeightedReRanker(weights=[0.6, 0.4])
weights = [0.6, 0.4]
reranker = WeightedReRanker(weights=weights)
result = collection_with_multiple_docs.query(
[
Query(field_name="sparse", vector=multiple_docs[0].vector("sparse")),
Expand All @@ -1140,7 +1141,8 @@ def test_collection_query_with_weighted_reranker_by_hybrid_vector(
self, collection_with_multiple_docs: Collection, multiple_docs
):
"""Test multi-vector query with Weighted reranker combining dense + sparse."""
reranker = WeightedReRanker(weights=[0.7, 0.3])
weights = [0.7, 0.3]
reranker = WeightedReRanker(weights=weights)
result = collection_with_multiple_docs.query(
[
Query(field_name="dense", vector=multiple_docs[0].vector("dense")),
Expand All @@ -1158,7 +1160,7 @@ def test_collection_query_with_callback_reranker_by_multi_dense_vector(
"""Test multi-vector query with CallbackReRanker (Python callback via C++)."""
callback_invoked = []

def my_rerank_callback(query_results, topn):
def my_rerank_callback(query_results, fields, topn):
callback_invoked.append(True)
all_docs = []
for docs in query_results:
Expand Down Expand Up @@ -1190,7 +1192,7 @@ def test_collection_query_with_callback_reranker_by_hybrid_vector(
):
"""Test multi-vector query with CallbackReRanker combining dense + sparse."""

def my_rerank_callback(query_results, topn):
def my_rerank_callback(query_results, fields, topn):
all_docs = []
for docs in query_results:
all_docs.extend(docs)
Expand Down
Loading
Loading