mirror of
https://github.com/qdrant/qdrant.git
synced 2026-07-31 23:20:52 -05:00
* Remove deprecated search/recommend/discover endpoints from OpenAPI Remove deprecated REST API endpoint definitions from the OpenAPI generator. These endpoints were deprecated in v1.13.3 (`f4ced2567`, #5907, 2025-01-30) in favor of the universal `/points/query` endpoint: - POST /points/search - POST /points/search/batch - POST /points/search/groups - POST /points/recommend - POST /points/recommend/batch - POST /points/recommend/groups - POST /points/discover - POST /points/discover/batch Also removes the corresponding request types from the schema generator and updates the expected API count in the consistency check. Co-authored-by: Cursor <cursoragent@cursor.com> * Migrate OpenAPI integration tests to /points/query The deprecated /points/search, /points/recommend and /points/discover endpoints (along with their /batch and /groups variants) were removed from the OpenAPI spec, which caused validation failures in the Python integration test harness. This commit migrates the affected tests to the universal /points/query endpoint: - Delete tests dedicated to the deprecated endpoints: test_recommend.py, test_discover.py, test_multicollection_reco.py, test_recommendation_multivector.py - Refactor remaining tests to call /points/query (and /query/batch, /query/groups), translating request bodies (vector -> query / using, positive/negative -> query.recommend, target/context -> query.discover) and unwrapping the new result.points response shape. - Drop equivalence assertions against the now-removed legacy endpoints. Co-authored-by: Cursor <cursoragent@cursor.com> * Relax non-empty assertions in migrated recommend/discover tests The previous migration added `len(...) > 0` assertions to tests that previously only checked equivalence between the deprecated and new API. These assertions are too strict because the parametrized `query_filter` cases legitimately produce empty result sets. Drop the `> 0` assertion and rely on `request_with_validation` to verify the response is well-formed and HTTP OK. Co-authored-by: Cursor <cursoragent@cursor.com> * Migrate remaining OpenAPI tests off deprecated search endpoints Tests added to dev after the original migration was written still call /points/search and /points/recommend/groups through `request_with_validation`, which resolves the endpoint against the OpenAPI spec and therefore breaks once the endpoint is not in the spec: - test_turbo4_storage.py, test_sparse_idf_corpus.py, test_validation.py: translate /points/search to /points/query (vector{name,vector} -> query + using, result -> result.points). - test_group.py: drop the /points/recommend/groups half of the lookup_from validation test in favour of the query equivalent. test_sparse_idf_corpus.py's test_query_api_supports_idf_corpus goes away: with the helper on /points/query every test in the file now exercises what it asserted. Also record why test_recommend_group cannot assert on its groups: it uses every point in the collection as a recommend example, so all of them are excluded and the result is legitimately empty. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Regenerate openapi.json without the deprecated search endpoints Drops the 8 deprecated paths and the request schemas that only they referenced: Search/Recommend/Discover request (+Batch, +Groups) types and their exclusive dependencies (NamedVector, NamedSparseVector, NamedVectorStruct, UsingVector, RecommendExample, ContextExamplePair). Regenerated output is a strict subset of the previous spec, and every remaining $ref still resolves. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Deprecate the search/recommend/discover RPCs in gRPC The REST counterparts have carried `deprecated: true` since v1.13.3 and are now gone from the OpenAPI spec, while the gRPC RPCs never got any deprecation annotation at all. Mark all 8 with `option deprecated = true` so generated clients warn, and point each doc comment at its `Query` replacement. tonic puts `#[deprecated]` on the generated client methods only; the server trait gets the doc comment alone, so our own `impl` is unaffected. The RPCs keep serving traffic — this is annotation only. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Restore the deleted recommend/discover suites on /points/query The earlier migration deleted these four files outright, but the query-side tests it left behind are all shallow smoke tests (`len(result) > 0`, `"points" in result[0]`). The deleted ones carried invariants with no query-API equivalent anywhere, so deleting them was a real loss of coverage rather than de-duplication: - test_recommend.py: default strategy equals average_vector; batch results identical to sequential singles across six request shapes; best_score with only negatives yields all-negative scores; best_score with a single positive orders identically to a nearest query; raw vectors as examples equal ids as examples. - test_discover.py: context-only scores are all <= 0; target-only orders identically to a nearest query but scores differently; with a fixed context the integer part of the score is stable while the decimal part moves, and vice versa with a fixed target; batch equals singles; lookup_from by id equals by vector. - test_multicollection_reco.py: cross-collection lookup_from, plus wrong-vector-size, unknown-collection and unknown-vector rejections. - test_recommendation_multivector.py: the same recommend invariants over a max_sim multivector collection, which the query suite never covered. Only test_recommend_missing_lookup_from_collection_with_raw_vector is dropped as genuinely redundant — test_query.py's test_query_missing_lookup_from_collection covers query, query/batch and prefetch. Two request-shape differences the translation had to absorb: - Giving no examples at all is 422 (a RecommendInput validation rule), where the legacy API reported 400 from the query itself. A malformed example, such as an empty vector, is still 400. - DiscoverInput requires the `context` key and accepts only an explicit null to mean "no context", so target-only discover must spell it out. The legacy API let it be omitted. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
328 lines
10 KiB
Python
328 lines
10 KiB
Python
import random
|
|
|
|
import pytest
|
|
|
|
from .helpers.collection_setup import drop_collection
|
|
from .helpers.helpers import request_with_validation
|
|
|
|
|
|
VECTOR_SIZE = 64
|
|
NUM_POINTS = 50
|
|
|
|
|
|
def _random_vector(rng):
|
|
return [rng.uniform(-1.0, 1.0) for _ in range(VECTOR_SIZE)]
|
|
|
|
|
|
def turboquant_collection_setup(collection_name, on_disk_vectors, on_disk_payload):
|
|
drop_collection(collection_name=collection_name)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="PUT",
|
|
path_params={'collection_name': collection_name},
|
|
body={
|
|
"vectors": {
|
|
"image": {
|
|
"size": VECTOR_SIZE,
|
|
"distance": "Cosine",
|
|
"on_disk": on_disk_vectors,
|
|
"quantization_config": {
|
|
"turbo": {
|
|
"bits": "bits4",
|
|
"always_ram": True,
|
|
}
|
|
},
|
|
},
|
|
"audio": {
|
|
"size": VECTOR_SIZE,
|
|
"distance": "Dot",
|
|
"on_disk": on_disk_vectors,
|
|
"quantization_config": {
|
|
"turbo": {
|
|
"bits": "bits2",
|
|
}
|
|
},
|
|
},
|
|
# Euclid + bits1_5 covers the L2 score path and the only
|
|
# bit size whose `padded_dim` rounds up to 3*dim/2.
|
|
"text": {
|
|
"size": VECTOR_SIZE,
|
|
"distance": "Euclid",
|
|
"on_disk": on_disk_vectors,
|
|
"quantization_config": {
|
|
"turbo": {
|
|
"bits": "bits1_5",
|
|
}
|
|
},
|
|
},
|
|
},
|
|
"quantization_config": {
|
|
"turbo": {
|
|
"bits": "bits1",
|
|
"always_ram": True,
|
|
}
|
|
},
|
|
"on_disk_payload": on_disk_payload,
|
|
}
|
|
)
|
|
assert response.ok
|
|
|
|
rng = random.Random(42)
|
|
points = []
|
|
for point_id in range(1, NUM_POINTS + 1):
|
|
points.append({
|
|
"id": point_id,
|
|
"vector": {
|
|
"image": _random_vector(rng),
|
|
"audio": _random_vector(rng),
|
|
"text": _random_vector(rng),
|
|
},
|
|
"payload": {"city": "Berlin" if point_id % 2 == 0 else "London"},
|
|
})
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points',
|
|
method="PUT",
|
|
path_params={'collection_name': collection_name},
|
|
query_params={'wait': 'true'},
|
|
body={"points": points}
|
|
)
|
|
assert response.ok
|
|
|
|
|
|
@pytest.fixture(autouse=True, scope="module")
|
|
def setup(on_disk_vectors, on_disk_payload, collection_name):
|
|
turboquant_collection_setup(
|
|
collection_name=collection_name,
|
|
on_disk_vectors=on_disk_vectors,
|
|
on_disk_payload=on_disk_payload,
|
|
)
|
|
yield
|
|
drop_collection(collection_name=collection_name)
|
|
|
|
|
|
def test_turboquant_config_persists(on_disk_vectors, collection_name):
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="GET",
|
|
path_params={'collection_name': collection_name},
|
|
)
|
|
assert response.ok
|
|
|
|
config = response.json()['result']['config']
|
|
vectors = config['params']['vectors']
|
|
|
|
assert vectors['image']['quantization_config']['turbo']['bits'] == "bits4"
|
|
assert vectors['image']['quantization_config']['turbo']['always_ram'] is True
|
|
assert vectors['image']['on_disk'] == on_disk_vectors
|
|
|
|
assert vectors['audio']['quantization_config']['turbo']['bits'] == "bits2"
|
|
assert 'always_ram' not in vectors['audio']['quantization_config']['turbo']
|
|
assert vectors['audio']['on_disk'] == on_disk_vectors
|
|
|
|
assert vectors['text']['quantization_config']['turbo']['bits'] == "bits1_5"
|
|
assert 'always_ram' not in vectors['text']['quantization_config']['turbo']
|
|
assert vectors['text']['on_disk'] == on_disk_vectors
|
|
|
|
assert config['quantization_config']['turbo']['bits'] == "bits1"
|
|
assert config['quantization_config']['turbo']['always_ram'] is True
|
|
|
|
|
|
# (vector_name, descending) — Euclid orders ascending (lower = closer).
|
|
@pytest.mark.parametrize("vector_name,descending", [
|
|
("image", True),
|
|
("audio", True),
|
|
("text", False),
|
|
])
|
|
def test_turboquant_search(collection_name, vector_name, descending):
|
|
rng = random.Random(123)
|
|
query_vector = _random_vector(rng)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points/query',
|
|
method="POST",
|
|
path_params={'collection_name': collection_name},
|
|
body={
|
|
"query": query_vector,
|
|
"using": vector_name,
|
|
"limit": 10,
|
|
}
|
|
)
|
|
assert response.ok
|
|
result = response.json()['result']['points']
|
|
assert len(result) == 10
|
|
assert all('score' in hit for hit in result)
|
|
assert all('id' in hit for hit in result)
|
|
scores = [hit['score'] for hit in result]
|
|
assert scores == sorted(scores, reverse=descending)
|
|
|
|
|
|
@pytest.mark.parametrize("vector_name", ["image", "audio", "text"])
|
|
def test_turboquant_search_with_filter(collection_name, vector_name):
|
|
rng = random.Random(7)
|
|
query_vector = _random_vector(rng)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points/query',
|
|
method="POST",
|
|
path_params={'collection_name': collection_name},
|
|
body={
|
|
"query": query_vector,
|
|
"using": vector_name,
|
|
"filter": {
|
|
"must": [{"key": "city", "match": {"value": "Berlin"}}]
|
|
},
|
|
"limit": 5,
|
|
"with_payload": True,
|
|
}
|
|
)
|
|
assert response.ok
|
|
result = response.json()['result']['points']
|
|
assert len(result) > 0
|
|
for hit in result:
|
|
assert hit['payload']['city'] == "Berlin"
|
|
|
|
|
|
def test_turboquant_query(collection_name):
|
|
rng = random.Random(99)
|
|
query_vector = _random_vector(rng)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points/query',
|
|
method="POST",
|
|
path_params={'collection_name': collection_name},
|
|
body={
|
|
"query": query_vector,
|
|
"using": "image",
|
|
"limit": 5,
|
|
"with_payload": True,
|
|
}
|
|
)
|
|
assert response.ok
|
|
points = response.json()['result']['points']
|
|
assert len(points) == 5
|
|
|
|
|
|
@pytest.mark.parametrize("rescore", [True, False])
|
|
def test_turboquant_search_with_quantization_params(collection_name, rescore):
|
|
# rescore=True hits the original-vector lookup path after the quantized
|
|
# first pass; rescore=False returns quantized scores directly.
|
|
rng = random.Random(2024)
|
|
query_vector = _random_vector(rng)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points/query',
|
|
method="POST",
|
|
path_params={'collection_name': collection_name},
|
|
body={
|
|
"query": query_vector,
|
|
"using": "image",
|
|
"params": {
|
|
"quantization": {
|
|
"ignore": False,
|
|
"rescore": rescore,
|
|
"oversampling": 2.0,
|
|
}
|
|
},
|
|
"limit": 10,
|
|
}
|
|
)
|
|
assert response.ok
|
|
assert len(response.json()['result']['points']) == 10
|
|
|
|
|
|
def test_turboquant_via_patch():
|
|
# Mirrors the scalar/product PATCH pattern in test_collection_update.py:
|
|
# a plain collection becomes a turbo-quantized one through PATCH, exercising
|
|
# the QuantizationConfigDiff::Turbo branch in lib/collection/src/operations/config_diff.rs.
|
|
name = "test_turboquant_via_patch"
|
|
drop_collection(collection_name=name)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="PUT",
|
|
path_params={'collection_name': name},
|
|
body={"vectors": {"size": VECTOR_SIZE, "distance": "Cosine"}},
|
|
)
|
|
assert response.ok
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="PATCH",
|
|
path_params={'collection_name': name},
|
|
body={
|
|
"quantization_config": {
|
|
"turbo": {"bits": "bits2", "always_ram": True}
|
|
}
|
|
},
|
|
)
|
|
assert response.ok
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="GET",
|
|
path_params={'collection_name': name},
|
|
)
|
|
assert response.ok
|
|
quant = response.json()['result']['config']['quantization_config']
|
|
assert quant['turbo']['bits'] == "bits2"
|
|
assert quant['turbo']['always_ram'] is True
|
|
|
|
drop_collection(collection_name=name)
|
|
|
|
|
|
def test_turboquant_default_bits():
|
|
# Smoke test that omitting `bits` (server picks the default) is accepted
|
|
# end-to-end through the API.
|
|
name = "test_turboquant_default_bits"
|
|
drop_collection(collection_name=name)
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="PUT",
|
|
path_params={'collection_name': name},
|
|
body={
|
|
"vectors": {
|
|
"size": VECTOR_SIZE,
|
|
"distance": "Cosine",
|
|
},
|
|
"quantization_config": {
|
|
"turbo": {}
|
|
},
|
|
}
|
|
)
|
|
assert response.ok
|
|
|
|
rng = random.Random(0)
|
|
points = [
|
|
{"id": i, "vector": _random_vector(rng)}
|
|
for i in range(1, 11)
|
|
]
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points',
|
|
method="PUT",
|
|
path_params={'collection_name': name},
|
|
query_params={'wait': 'true'},
|
|
body={"points": points},
|
|
)
|
|
assert response.ok
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points/query',
|
|
method="POST",
|
|
path_params={'collection_name': name},
|
|
body={"query": _random_vector(random.Random(1)), "limit": 5},
|
|
)
|
|
assert response.ok
|
|
assert len(response.json()['result']['points']) == 5
|
|
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="GET",
|
|
path_params={'collection_name': name},
|
|
)
|
|
assert response.ok
|
|
assert 'turbo' in response.json()['result']['config']['quantization_config']
|
|
|
|
drop_collection(collection_name=name) |