* refactor: change rerank interface from map-based to vector-based (#452) - Define QueryResult = list[Doc] type alias in doc.py - Change C++ Reranker::rerank() signature from map<string, DocPtrList> to vector<DocPtrList> - Extend bind_schema() to accept field_names for index-based field lookup - Update ScoreBasedReranker/WeightedReranker/CallbackReranker implementations - Adapt collection.cc MultiQuery path to use vector<DocPtrList> - Update Python binding to expose rerank() and use vector<double> weights - Refactor Python RerankFunction interface to list[QueryResult] -> QueryResult - Remove Python-layer rerank logic from RrfReRanker/WeightedReRanker (delegate to C++) - Update query_executor to return list[list[Doc]] instead of dict - Update all related unit tests (C++ and Python) * refactor: replace list[Doc] with QueryResult type alias in executor and rerank functions * refactor: replace list[list[Doc]] with list[QueryResult] in query_executor * fix: remove unused Doc import in rerank_function.py (ruff F401) * refactor(query_executor): merge duplicate rerank return paths * refactor: RrfReRanker/WeightedReRanker.rerank() directly call C++ reranker * refactor: simplify QueryExecutor into unified class, remove Factory/subclasses/validation/concurrency * refactor: rename _VectorQuery to _SearchQuery, from_vector_query to from_search_query * refactor(query_executor): split execute into single/multi paths, rename core_vector to search_query, drop unused core_vectors * style: apply ruff formatter to test_reranker.py and query_executor.py * refactor: make rescore() private in ScoreBasedReranker hierarchy * style: apply clang-format to reranker.h * style: apply clang-format to all modified C++ files * refactor: rename private methods in QueryExecutor for clearer semantics * refactor: rename mvq to multi_query for clarity * fix: make BasicRRF test order-independent for equal scores * fix: update collection_test to use vector-based reranker interface * fix: update reranker tests to expect TypeError instead of NotImplementedError * refactor: remove PendingQuery wrapper, use SearchQuery directly in MultiQuery path * refactor: simplify MultiQuery path - remove seen_fields, merge field_names into main loop * fix: address review comments - defensive checks and remove fields param from C API - ScoreBasedReranker::rerank(): early return empty list when topn <= 0 - WeightedReranker::rescore(): null-check schema_ before use - CallbackReranker::rerank(): check callback_ is not empty before invoke - C API zvec_reranker_create_weighted(): remove unused fields parameter * fix: remove duplicate field name test (check was intentionally removed) * fix: address egolearner review comments - Rename QueryResult to DocList for clarity (见名知义) - Change docstring to #: comment for type alias - Fix output_fields check: use 'is not None' instead of truthy check (None means unset, [] means explicit empty list - different semantics) - Raise ValueError when search-by-id finds no document * refactor: remove redundant output_fields assignment in _build_search_query * refactor: address egolearner review comments (C++ refactoring) - c_api.cc: simplify weighted reranker creation with inline vector ctor - python_reranker.cc: refactor unwrap_rerank_result - take by value, early error return, move semantics - Rename C API functions for consistent naming: zvec_reranker_create_rrf -> zvec_create_rrf_reranker zvec_reranker_create_weighted -> zvec_create_weighted_reranker zvec_reranker_destroy -> zvec_destroy_reranker zvec_reranker_get_rank_constant -> zvec_get_reranker_rank_constant - reranker.h/cc: bind_schema returns Result<void>, caches vector<const FieldSchema*> to avoid repeated schema lookups in rescore - python_param.cc: rename py::arg vector_query to search_query * revert: rollback bind_schema refactoring due to thread-safety concern The field_schemas_ caching approach introduces a data race when the same WeightedReranker instance is shared across concurrent queries: bind_schema() writes field_schemas_ while rerank() reads it concurrently. Revert to storing schema_ + field_names_ and looking up fields in rescore(). Add @note thread-safety warning to WeightedReranker class documentation. * fix: unify error message format in collection.cc Change 'Vector field not found: X' to 'Invalid query: field X not found' for consistent error formatting as suggested by zhourrr. * fix: sort __all__ and remove duplicates in __init__.pyi Fix RUF022 lint error: sort __all__ alphabetically and remove duplicate entries (DenseEmbeddingFunction, ReRanker). * style: format query_executor.py with ruff formatter * fix: resolve Python test failures after FTS rebase integration - test_query_executor.py: update method names to match refactored API (_do_build -> _build_queries, _do_merge_rerank_results -> _merge_and_rerank) - test_reranker.py: fix expected exception type (TypeError from pybind11) - test_collection_fts.py: update error message match patterns - test_collection_fts_vector_hybrid.py: remove obsolete 'metrics' param, update weights from dict to positional list, adapt validation tests for multi-vector queries (now supported with reranker) - test_collection_dql.py: remove 'metrics' param, update weights format - collection.cc: distinguish FTS vs vector fields in MultiQuery path using get_fts_clause() to route field lookup correctly - reranker.cc: use get_field() instead of get_vector_field() in rescore to support FTS+vector hybrid weighted reranking * refactor: pass topn as rerank() parameter, move rerank_field to model rerankers * fix: address review comments - rename test functions and restore duplicate field check * refactor: simplify MultiQuery field lookup, let validate_and_sanitize handle type check
303 lines
10 KiB
Python
303 lines
10 KiB
Python
# Copyright 2025-present the zvec project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from __future__ import annotations
|
|
|
|
from typing import Dict, Union
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import numpy as np
|
|
import math
|
|
from _zvec.param import _SearchQuery
|
|
|
|
import pytest
|
|
from zvec.executor.query_executor import (
|
|
QueryContext,
|
|
QueryExecutor,
|
|
)
|
|
from zvec import (
|
|
RrfReRanker,
|
|
WeightedReRanker,
|
|
HnswQueryParam,
|
|
CollectionSchema,
|
|
VectorSchema,
|
|
DataType,
|
|
MetricType,
|
|
Query,
|
|
VectorQuery,
|
|
)
|
|
from zvec.extension.multi_vector_reranker import CallbackReRanker
|
|
|
|
|
|
# ----------------------------
|
|
# Mock Collection Schema
|
|
# ----------------------------
|
|
class MockCollectionSchema(CollectionSchema):
|
|
def __init__(self, vectors=Union[VectorSchema, Dict[str, VectorSchema]]):
|
|
self._vectors = (
|
|
[vectors] if not isinstance(vectors, Dict) else list(vectors.values())
|
|
)
|
|
|
|
@property
|
|
def vectors(self):
|
|
return self._vectors
|
|
|
|
|
|
# ----------------------------
|
|
# VectorQuery Test Case
|
|
# ----------------------------
|
|
class TestQuery:
|
|
def test_init(self):
|
|
query = Query(field_name="test_field")
|
|
assert query.field_name == "test_field"
|
|
assert query.id is None
|
|
assert query.vector is None
|
|
assert query.param is None
|
|
|
|
param = HnswQueryParam()
|
|
query = Query(
|
|
field_name="test_field", id="test_id", vector=[1, 2, 3], param=param
|
|
)
|
|
assert query.field_name == "test_field"
|
|
assert query.id == "test_id"
|
|
assert query.vector == [1, 2, 3]
|
|
assert query.param == param
|
|
|
|
def test_has_id(self):
|
|
query = Query(field_name="test_field")
|
|
assert not query.has_id()
|
|
|
|
query = Query(field_name="test_field", id="test_id")
|
|
assert query.has_id()
|
|
|
|
def test_has_vector(self):
|
|
query = Query(field_name="test_field")
|
|
assert not query.has_vector()
|
|
|
|
query = Query(field_name="test_field", vector=[])
|
|
assert not query.has_vector()
|
|
|
|
query = Query(field_name="test_field", vector=[1, 2, 3])
|
|
assert query.has_vector()
|
|
|
|
def test_validate_dense_fp16_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.VECTOR_FP16)
|
|
vec = np.array([1.1, 2.1, 3.1], dtype=np.float16)
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
assert np.array_equal(vec, ret)
|
|
|
|
def test_validate_dense_fp32_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.VECTOR_FP32)
|
|
vec = np.array([1.1, 2.1, 3.1], dtype=np.float32)
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
assert np.array_equal(vec, ret)
|
|
|
|
def test_validate_dense_fp64_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.VECTOR_FP64)
|
|
vec = np.array([1.1, 2.1, 3.1], dtype=np.float64)
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
assert np.array_equal(vec, ret)
|
|
|
|
def test_validate_dense_int8_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.VECTOR_INT8)
|
|
vec = np.array([1, 2, 3], dtype=np.int8)
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
assert np.array_equal(vec, ret)
|
|
|
|
def test_validate_sparse_fp32_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.SPARSE_VECTOR_FP32)
|
|
vec = {1: 1.1, 2: 2.2, 3: 3.3}
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
for k in vec.keys():
|
|
assert math.isclose(vec[k], ret[k], abs_tol=1e-6)
|
|
|
|
def test_validate_sparse_fp16_convert(self):
|
|
v = _SearchQuery()
|
|
schema = VectorSchema(name="test", data_type=DataType.SPARSE_VECTOR_FP16)
|
|
vec = {1: 1.1, 2: 2.2, 3: 3.3}
|
|
v.set_vector(schema._get_object(), vec)
|
|
ret = v.get_vector(schema._get_object())
|
|
for k in vec.keys():
|
|
assert math.isclose(np.float16(vec[k]), ret[k], abs_tol=1e-6)
|
|
|
|
|
|
class TestVectorQueryDeprecated:
|
|
def test_deprecation_warning(self):
|
|
import warnings
|
|
|
|
with warnings.catch_warnings(record=True) as w:
|
|
warnings.simplefilter("always")
|
|
vq = VectorQuery(field_name="test_field")
|
|
assert len(w) == 1
|
|
assert issubclass(w[0].category, DeprecationWarning)
|
|
assert "Query" in str(w[0].message)
|
|
|
|
def test_isinstance_compatibility(self):
|
|
import warnings
|
|
|
|
with warnings.catch_warnings(record=True):
|
|
warnings.simplefilter("always")
|
|
vq = VectorQuery(field_name="test_field")
|
|
assert isinstance(vq, Query)
|
|
|
|
|
|
class TestQueryContext:
|
|
def test_init(self):
|
|
ctx = QueryContext(topk=10)
|
|
assert ctx.topk == 10
|
|
assert ctx.queries == []
|
|
assert ctx.filter is None
|
|
assert ctx.reranker is None
|
|
assert ctx.output_fields is None
|
|
assert ctx.include_vector is False
|
|
|
|
def test_properties(self):
|
|
queries = [Query(field_name="test")]
|
|
reranker = RrfReRanker()
|
|
output_fields = ["field1", "field2"]
|
|
|
|
ctx = QueryContext(
|
|
topk=5,
|
|
filter="test_filter",
|
|
include_vector=True,
|
|
queries=queries,
|
|
output_fields=output_fields,
|
|
reranker=reranker,
|
|
)
|
|
|
|
assert ctx.topk == 5
|
|
assert ctx.queries == queries
|
|
assert ctx.filter == "test_filter"
|
|
assert ctx.reranker == reranker
|
|
assert ctx.output_fields == output_fields
|
|
assert ctx.include_vector is True
|
|
|
|
def test_properties_with_weighted_reranker(self):
|
|
queries = [Query(field_name="test")]
|
|
reranker = WeightedReRanker(
|
|
weights=[1.0],
|
|
)
|
|
|
|
ctx = QueryContext(
|
|
topk=5,
|
|
queries=queries,
|
|
reranker=reranker,
|
|
)
|
|
|
|
assert ctx.reranker == reranker
|
|
assert ctx.reranker.weights == [1.0]
|
|
|
|
def test_properties_with_callback_reranker(self):
|
|
queries = [Query(field_name="test")]
|
|
cb = lambda query_results, topn: []
|
|
reranker = CallbackReRanker(callback=cb)
|
|
|
|
ctx = QueryContext(
|
|
topk=5,
|
|
queries=queries,
|
|
reranker=reranker,
|
|
)
|
|
|
|
assert ctx.reranker == reranker
|
|
|
|
|
|
class TestQueryExecutor:
|
|
def test_init(self):
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
assert isinstance(executor, QueryExecutor)
|
|
|
|
def test_do_build_without_queries(self):
|
|
# When no queries are given, build a single vector-less query.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
ctx = QueryContext(topk=5, filter="test_filter")
|
|
|
|
result = executor._build_queries(ctx, MagicMock())
|
|
assert len(result) == 1
|
|
assert result[0].topk == 5
|
|
assert result[0].filter == "test_filter"
|
|
|
|
def test_do_build_query_wo_vector(self):
|
|
# Vector-less core query should carry the context query params.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
ctx = QueryContext(topk=7, filter="f", include_vector=True)
|
|
|
|
core_vector = executor._build_base_search_query(ctx)
|
|
assert core_vector.topk == 7
|
|
assert core_vector.filter == "f"
|
|
assert core_vector.include_vector is True
|
|
|
|
def test_do_merge_rerank_results_single_without_reranker(self):
|
|
# A single result list without a reranker is returned as-is.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
ctx = QueryContext(topk=5)
|
|
docs_list = [["doc1", "doc2"]]
|
|
|
|
result = executor._merge_and_rerank(ctx, docs_list)
|
|
assert result == ["doc1", "doc2"]
|
|
|
|
def test_do_merge_rerank_results_empty(self):
|
|
# Empty results should raise an error.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
ctx = QueryContext(topk=5)
|
|
|
|
with pytest.raises(ValueError, match="Query results is empty"):
|
|
executor._merge_and_rerank(ctx, [])
|
|
|
|
def test_do_merge_rerank_results_with_reranker(self):
|
|
# Multiple result lists are merged through the reranker.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
reranker = MagicMock()
|
|
reranker.rerank.return_value = ["merged"]
|
|
ctx = QueryContext(
|
|
topk=5,
|
|
queries=[Query(field_name="test1"), Query(field_name="test2")],
|
|
reranker=reranker,
|
|
)
|
|
docs_list = [["d1"], ["d2"]]
|
|
|
|
result = executor._merge_and_rerank(ctx, docs_list)
|
|
assert result == ["merged"]
|
|
reranker.rerank.assert_called_once_with(docs_list, ctx.topk)
|
|
|
|
def test_execute_python_pipeline(self):
|
|
# Each query is executed serially and converted into a result list.
|
|
schema = MockCollectionSchema()
|
|
executor = QueryExecutor(schema)
|
|
collection = MagicMock()
|
|
collection.Query.side_effect = [["raw1"], ["raw2"]]
|
|
vectors = [MagicMock(), MagicMock()]
|
|
|
|
with patch(
|
|
"zvec.executor.query_executor.convert_to_py_doc",
|
|
side_effect=lambda doc, schema: doc,
|
|
):
|
|
results = executor._execute_python_pipeline(vectors, collection)
|
|
assert results == [["raw1"], ["raw2"]]
|
|
assert collection.Query.call_count == 2
|