mirror of
https://github.com/qdrant/qdrant.git
synced 2026-07-31 07:00:56 -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>
407 lines
13 KiB
Python
407 lines
13 KiB
Python
import math
|
|
import random
|
|
|
|
import pytest
|
|
|
|
from .helpers.collection_setup import basic_collection_setup, drop_collection
|
|
from .helpers.helpers import request_with_validation
|
|
|
|
|
|
@pytest.fixture(scope='module', autouse=True)
|
|
def collection_name_lookup(collection_name):
|
|
return f"{collection_name}_lookup"
|
|
|
|
|
|
def random_vector(dim=4):
|
|
return [random.random() for _ in range(dim)]
|
|
|
|
|
|
def random_example(dim=4, min_id=1, max_id=8):
|
|
if random.random() < 0.5:
|
|
return random_vector(dim)
|
|
else:
|
|
return random.randint(min_id, max_id)
|
|
|
|
|
|
def count_ids_in_examples(context, target) -> int:
|
|
set_ = set()
|
|
for pair in context:
|
|
for example in [pair["positive"], pair["negative"]]:
|
|
if isinstance(example, int):
|
|
set_.add(example)
|
|
if isinstance(target, int):
|
|
set_.add(target)
|
|
return len(set_)
|
|
|
|
|
|
@pytest.fixture(autouse=True, scope="module")
|
|
def setup(on_disk_vectors, collection_name, collection_name_lookup):
|
|
basic_collection_setup(collection_name=collection_name, on_disk_vectors=on_disk_vectors)
|
|
yield
|
|
drop_collection(collection_name=collection_name)
|
|
# delete potential lookup_collection as well
|
|
drop_collection(collection_name=collection_name_lookup)
|
|
|
|
|
|
# Context is when we don't include a target vector
|
|
def test_context(collection_name):
|
|
context = [
|
|
{"positive": random_example(), "negative": random_example()},
|
|
{"positive": random_example(), "negative": random_example()},
|
|
]
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"context": context},
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
scored_points = response.json()["result"]["points"]
|
|
|
|
assert len(scored_points) == 8 - count_ids_in_examples(context, None)
|
|
|
|
# Score in context search relates to loss, so max score for context search is 0.0
|
|
for point in scored_points:
|
|
assert point["score"] <= 0.0
|
|
|
|
|
|
# When we only use target, it should be the exact same as search
|
|
def test_only_target_is_search_with_different_scoring(collection_name):
|
|
target = random_vector()
|
|
|
|
# First, a plain nearest query
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": target,
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
search_points = response.json()["result"]["points"]
|
|
|
|
# Then, discover
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
# `context` must be spelled out: unlike the legacy discover API,
|
|
# `DiscoverInput` requires the key, and only accepts an explicit
|
|
# null to mean "no context".
|
|
"query": {"discover": {"target": target, "context": None}},
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
discover_points = response.json()["result"]["points"]
|
|
|
|
assert len(discover_points) == 8
|
|
|
|
# Results should be in same order, but different scores
|
|
assert len(search_points) == len(discover_points)
|
|
for search_point, discover_point in zip(search_points, discover_points):
|
|
assert search_point["id"] == discover_point["id"]
|
|
assert search_point["score"] != discover_point["score"]
|
|
|
|
|
|
# Only when we use both target and context, we are doing a discover request
|
|
def test_discover_same_context(collection_name):
|
|
target1 = random_example()
|
|
context = [
|
|
{"positive": random_example(), "negative": random_example()},
|
|
{"positive": random_example(), "negative": random_example()},
|
|
]
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"discover": {"target": target1, "context": context}},
|
|
"limit": 8,
|
|
"params": {
|
|
"exact": True,
|
|
},
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
scored_points1 = response.json()["result"]["points"]
|
|
|
|
assert len(scored_points1) == 8 - count_ids_in_examples(context, target1)
|
|
|
|
target2 = random_example()
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"discover": {"target": target2, "context": context}},
|
|
"limit": 8,
|
|
"params": {
|
|
"exact": True,
|
|
},
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
scored_points2 = response.json()["result"]["points"]
|
|
|
|
assert len(scored_points2) == 8 - count_ids_in_examples(context, target2)
|
|
|
|
# We keep same context, so context part of the score (integer part) should be the same,
|
|
# while target part of the score (decimal part) should be different
|
|
|
|
scored_points_2_map = {point["id"]: point for point in scored_points2}
|
|
|
|
for point1, point2 in zip(scored_points1, scored_points2):
|
|
if point1["id"] in scored_points_2_map:
|
|
point2 = scored_points_2_map[point1["id"]]
|
|
assert math.floor(point1["score"]) == math.floor(point2["score"])
|
|
|
|
target_score1 = point1["score"] - math.floor(point1["score"])
|
|
target_score2 = point2["score"] - math.floor(point2["score"])
|
|
if target1 == target2:
|
|
assert math.isclose(target_score1, target_score2, rel_tol=1e-5)
|
|
else:
|
|
assert not math.isclose(target_score1, target_score2, rel_tol=1e-5)
|
|
|
|
|
|
def test_discover_same_target(collection_name):
|
|
target = random_example()
|
|
|
|
context1 = [
|
|
{"positive": random_example(), "negative": random_example()},
|
|
{"positive": random_example(), "negative": random_example()},
|
|
]
|
|
|
|
context2 = [
|
|
{"positive": random_example(), "negative": random_example()},
|
|
{"positive": random_example(), "negative": random_example()},
|
|
]
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"discover": {"target": target, "context": context1}},
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
scored_points1 = response.json()["result"]["points"]
|
|
|
|
assert len(scored_points1) == 8 - count_ids_in_examples(context1, target)
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"discover": {"target": target, "context": context2}},
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
scored_points2 = response.json()["result"]["points"]
|
|
|
|
assert len(scored_points2) == 8 - count_ids_in_examples(context2, target)
|
|
|
|
# We keep same target, so context part of the score (integer part) can be different,
|
|
# while target part of the score (decimal part) should be the same
|
|
scored_points2_map = {point["id"]: point for point in scored_points2}
|
|
|
|
for point1 in scored_points1:
|
|
if point1["id"] in scored_points2_map:
|
|
point2 = scored_points2_map[point1["id"]]
|
|
|
|
target_score1 = point1["score"] - math.floor(point1["score"])
|
|
target_score2 = point2["score"] - math.floor(point2["score"])
|
|
assert math.isclose(target_score1, target_score2, rel_tol=1e-5)
|
|
|
|
|
|
def test_discover_batch(collection_name):
|
|
targets = []
|
|
contexts = []
|
|
single_results = []
|
|
|
|
# Singles
|
|
for i in range(10):
|
|
target = random_example()
|
|
targets.append(target)
|
|
|
|
context = [
|
|
{"positive": random_example(), "negative": random_example()},
|
|
{"positive": random_example(), "negative": random_example()},
|
|
]
|
|
contexts.append(context)
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {"discover": {"target": target, "context": context}},
|
|
"limit": 8,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
single_results.append(response.json()["result"])
|
|
|
|
# Batch
|
|
searches = [
|
|
{
|
|
"query": {"discover": {"target": target, "context": context}},
|
|
"limit": 8,
|
|
}
|
|
for target, context in zip(targets, contexts)
|
|
]
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query/batch",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"searches": searches,
|
|
},
|
|
)
|
|
|
|
batch_results = response.json()["result"]
|
|
|
|
assert len(single_results) == len(batch_results)
|
|
for single_result, batch_result in zip(single_results, batch_results):
|
|
assert single_result == batch_result
|
|
|
|
|
|
def test_null_offset(collection_name):
|
|
target = random_example()
|
|
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
# `context` must be spelled out: unlike the legacy discover API,
|
|
# `DiscoverInput` requires the key, and only accepts an explicit
|
|
# null to mean "no context".
|
|
"query": {"discover": {"target": target, "context": None}},
|
|
"limit": 8,
|
|
"offset": None,
|
|
},
|
|
)
|
|
assert response.ok, response.json()
|
|
|
|
|
|
def test_discover_lookup(collection_name, collection_name_lookup):
|
|
# delete lookup collection if exists
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="DELETE",
|
|
path_params={'collection_name': collection_name_lookup},
|
|
)
|
|
assert response.ok, response.text
|
|
|
|
# re-create lookup collection
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}',
|
|
method="PUT",
|
|
path_params={'collection_name': collection_name_lookup},
|
|
body={
|
|
"vectors": {
|
|
"other": {
|
|
"size": 4,
|
|
"distance": "Dot",
|
|
}
|
|
}
|
|
}
|
|
)
|
|
assert response.ok, response.text
|
|
|
|
# insert vectors to lookup collection
|
|
response = request_with_validation(
|
|
api='/collections/{collection_name}/points',
|
|
method="PUT",
|
|
path_params={'collection_name': collection_name_lookup},
|
|
query_params={'wait': 'true'},
|
|
body={
|
|
"points": [
|
|
{
|
|
"id": 1,
|
|
"vector": {"other": [1.0, 0.0, 0.0, 0.0]},
|
|
},
|
|
{
|
|
"id": 2,
|
|
"vector": {"other": [0.0, 0.0, 0.0, 2.0]},
|
|
},
|
|
]
|
|
}
|
|
)
|
|
assert response.ok, response.text
|
|
|
|
# check discover by id + lookup_from
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {
|
|
"discover": {
|
|
"target": [0.2, 0.1, 0.9, 0.7],
|
|
"context": [
|
|
{
|
|
"positive": 1,
|
|
"negative": 2
|
|
},
|
|
],
|
|
}
|
|
},
|
|
"limit": 10,
|
|
"lookup_from": {
|
|
"collection": collection_name_lookup,
|
|
"vector": "other"
|
|
}
|
|
},
|
|
)
|
|
assert response.ok, response.text
|
|
discover_result_by_id = response.json()["result"]["points"]
|
|
|
|
# check discover by vector + lookup_from
|
|
response = request_with_validation(
|
|
api="/collections/{collection_name}/points/query",
|
|
method="POST",
|
|
path_params={"collection_name": collection_name},
|
|
body={
|
|
"query": {
|
|
"discover": {
|
|
"target": [0.2, 0.1, 0.9, 0.7],
|
|
"context": [
|
|
{
|
|
"positive": [1.0, 0.0, 0.0, 0.0],
|
|
"negative": [0.0, 0.0, 0.0, 2.0]
|
|
},
|
|
],
|
|
}
|
|
},
|
|
"limit": 10,
|
|
},
|
|
)
|
|
assert response.ok, response.text
|
|
discover_result_by_vector = response.json()["result"]["points"]
|
|
|
|
# check if results are the same
|
|
assert discover_result_by_id == discover_result_by_vector, f"discover_result_by_id: {discover_result_by_id}, discover_result_by_vector: {discover_result_by_vector}"
|