* 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
189 lines
6.8 KiB
Python
189 lines
6.8 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.
|
|
"""End-to-end tests for FTS-only collections (no vector field).
|
|
|
|
The schema validation rule "must have at least one vector field" has been
|
|
lifted; these tests pin the new behavior so insert / query / delete /
|
|
optimize all work on a vector-less collection.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
import zvec
|
|
from zvec import (
|
|
Collection,
|
|
CollectionOption,
|
|
DataType,
|
|
Doc,
|
|
FieldSchema,
|
|
FtsIndexParam,
|
|
OptimizeOption,
|
|
)
|
|
from zvec.model.param.query import Fts, Query
|
|
|
|
|
|
# ==================== Fixtures ====================
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def fts_collection(tmp_path_factory) -> Collection:
|
|
"""FTS-only collection: a STRING field for forward + an FTS-indexed STRING."""
|
|
temp_dir = tmp_path_factory.mktemp("zvec_fts_only")
|
|
collection_path = temp_dir / "fts_collection"
|
|
|
|
schema = zvec.CollectionSchema(
|
|
name="fts_only",
|
|
fields=[
|
|
FieldSchema("title", DataType.STRING, nullable=False),
|
|
FieldSchema(
|
|
"content",
|
|
DataType.STRING,
|
|
nullable=False,
|
|
index_param=FtsIndexParam(
|
|
tokenizer_name="standard",
|
|
filters=["lowercase"],
|
|
),
|
|
),
|
|
],
|
|
# vectors omitted on purpose — schema validation must accept this.
|
|
)
|
|
|
|
coll = zvec.create_and_open(
|
|
path=str(collection_path),
|
|
schema=schema,
|
|
option=CollectionOption(read_only=False, enable_mmap=True),
|
|
)
|
|
assert coll is not None
|
|
|
|
try:
|
|
yield coll
|
|
finally:
|
|
try:
|
|
coll.destroy()
|
|
except Exception as e:
|
|
print(f"Warning: failed to destroy collection: {e}")
|
|
|
|
|
|
def _make_docs() -> list[Doc]:
|
|
"""5-doc corpus where 4 contain 'hello' and doc 4 is the only outlier."""
|
|
return [
|
|
Doc(id="pk_0", fields={"title": "intro", "content": "hello world"}),
|
|
Doc(id="pk_1", fields={"title": "guide", "content": "hello foo bar"}),
|
|
Doc(id="pk_2", fields={"title": "tips", "content": "hello baz"}),
|
|
Doc(id="pk_3", fields={"title": "more", "content": "hello hello"}),
|
|
Doc(id="pk_4", fields={"title": "other", "content": "nothing relevant"}),
|
|
]
|
|
|
|
|
|
def _fts_query(coll: Collection, term: str) -> list[Doc]:
|
|
"""Run a single-term FTS match query against the `content` field."""
|
|
return coll.query(
|
|
queries=Query(field_name="content", fts=Fts(match_string=term)),
|
|
topk=10,
|
|
)
|
|
|
|
|
|
# ==================== Tests ====================
|
|
|
|
|
|
class TestFtsOnlyCollectionSchema:
|
|
def test_create_and_open_without_vectors(self, fts_collection: Collection):
|
|
"""Schema with zero vector fields must be accepted by validate()."""
|
|
assert fts_collection.schema.name == "fts_only"
|
|
assert {f.name for f in fts_collection.schema.fields} == {"title", "content"}
|
|
# Empty vectors is the whole point of the test.
|
|
assert list(fts_collection.schema.vectors) == []
|
|
assert fts_collection.stats.doc_count == 0
|
|
|
|
def test_create_schema_omitting_vectors_kwarg(self):
|
|
"""Constructing CollectionSchema without `vectors=` argument is valid."""
|
|
schema = zvec.CollectionSchema(
|
|
name="bare_fts",
|
|
fields=[
|
|
FieldSchema(
|
|
"content",
|
|
DataType.STRING,
|
|
nullable=False,
|
|
index_param=FtsIndexParam(),
|
|
),
|
|
],
|
|
)
|
|
assert list(schema.vectors) == []
|
|
assert {f.name for f in schema.fields} == {"content"}
|
|
|
|
|
|
class TestFtsOnlyCollectionLifecycle:
|
|
def test_insert_and_fts_query(self, fts_collection: Collection):
|
|
"""FTS-only collection supports insert + FTS query end-to-end."""
|
|
results = fts_collection.insert(_make_docs())
|
|
assert all(r.ok() for r in results)
|
|
assert fts_collection.stats.doc_count == 5
|
|
|
|
hits = _fts_query(fts_collection, "hello")
|
|
assert len(hits) == 4
|
|
assert {doc.id for doc in hits} == {"pk_0", "pk_1", "pk_2", "pk_3"}
|
|
|
|
# Term that nothing in the surviving corpus contains.
|
|
assert _fts_query(fts_collection, "missing_term_xyz") == []
|
|
|
|
def test_delete_then_query(self, fts_collection: Collection):
|
|
"""Tombstone filter must drop deleted docs from FTS results."""
|
|
fts_collection.insert(_make_docs())
|
|
statuses = fts_collection.delete(["pk_0", "pk_4"])
|
|
assert all(s.ok() for s in statuses)
|
|
assert fts_collection.stats.doc_count == 3
|
|
|
|
hits = _fts_query(fts_collection, "hello")
|
|
assert len(hits) == 3
|
|
assert {doc.id for doc in hits} == {"pk_1", "pk_2", "pk_3"}
|
|
# pk_4's unique term is filtered out post-delete.
|
|
assert _fts_query(fts_collection, "nothing") == []
|
|
|
|
def test_optimize_rebuilds_fts(self, fts_collection: Collection):
|
|
"""Optimize with >30% deletes triggers ReduceFts; recall unchanged."""
|
|
fts_collection.insert(_make_docs())
|
|
# 40% delete ratio — above COMPACT_DELETE_RATIO_THRESHOLD=0.3, so
|
|
# build_compact_task picks the rebuild path and ReduceFts runs.
|
|
fts_collection.delete(["pk_0", "pk_4"])
|
|
|
|
before = {doc.id for doc in _fts_query(fts_collection, "hello")}
|
|
assert before == {"pk_1", "pk_2", "pk_3"}
|
|
|
|
fts_collection.optimize(option=OptimizeOption())
|
|
assert fts_collection.stats.doc_count == 3
|
|
|
|
after = {doc.id for doc in _fts_query(fts_collection, "hello")}
|
|
assert after == before
|
|
assert _fts_query(fts_collection, "nothing") == []
|
|
|
|
|
|
class TestFtsOnlyCollectionQueryValidation:
|
|
def test_vector_query_rejected(self, fts_collection: Collection):
|
|
"""Vector query on a no-vector collection must raise."""
|
|
with pytest.raises(ValueError, match="No vector field found"):
|
|
fts_collection.query(
|
|
queries=Query(field_name="content", vector=[0.1, 0.2, 0.3]),
|
|
topk=5,
|
|
)
|
|
|
|
def test_id_query_rejected(self, fts_collection: Collection):
|
|
"""ID-based query on a no-vector collection must raise."""
|
|
fts_collection.insert(_make_docs()[:1])
|
|
with pytest.raises(ValueError, match="No vector field found"):
|
|
fts_collection.query(
|
|
queries=Query(field_name="content", id="pk_0"),
|
|
topk=5,
|
|
)
|