mirror of
https://github.com/qdrant/qdrant-client.git
synced 2026-08-03 16:40:59 -05:00
* new: remove vectors_count, update http and grpc models * fix: update inspection cache * new: add conversions and update interface * fix: fix some conversions * fix: fix typo * fix: fix isinstance * fix: regen async * fix: fix update_filter usage, fix isinstance * tests: collection metadata test * fix: address backward compatibility in test * new: update models, add max payload index count and copy vectors * fix; update _inspection_cache * new: add read consistency to count points * Allow uuids in interface (#1085) * new: direct uuid support * tests: add uuid tests * fix: update inspection cache * new: add collection metadata and tests to local mode (#1089) * new: add collection metadata and tests to local mode * fix: regen async client * new: implement parametrized rrf in local mode (#1087) * new: implement parametrized rrf in local mode * refactoring: use a variable for a magic value * fix: adjust conversion according to AI * Update filter (#1090) * new: add missing update_filter, implement it in local mode * fix: fix type hint, fix update operation, fix rest uploader, add tests * fix: fix update filter is None case * fix: mypy was not a good boy * Text any filter (#1091) * new: add match text any local mode * tests: add match text any tests * new: update models, remove init_from and locks (#1100) * new: update models, remove init_from and locks * deprecate: remove init from tests * deprecate: remove lock tests * new: convert ascii_folding * fix: fix type stub * new: convert acorn * new: convert shard key with fallback * new: update grpcio and grpcio tools in generator (#1106) * new: update grpcio and grpcio tools in generator * fix: bind grpcio and tools versions to 1.62.0 in generator * Remove deprecated methods (#1103) * deprecate: remove old api methods * deprecate: remove type stub for removed methods * deprecate: remove old api methods from test_qdrant_client * deprecate: replace search with query points in test_in_memory * deprecate: replace search methods in fastembed mixin with query points * deprecate: replace old api methods in test async qdrant client * deprecate: replace search with query points in test delete points * deprecate: replace discover and context with query points in test_discovery * deprecate: replace recommend_groups with query_points_groups in test_group_recommend * deprecate: replace search_groups in test_group_search * deprecate: replace recommend with query points in test_recommendation * deprecate: replace search with query points in test search * deprecate: replace context and discover with query points in test sparse discovery * deprecate: replace search with query points in test sparse idf search * deprecate: replace recommend with query points in test sparse recommend * deprecate: replace search with query points in test sparse search * deprecate: replace missing search request with query request in qdrant_fastembed * deprecate: replace search with query points in test multivector search queries * deprecate: replace upload records with upload points in test_updates * deprecate: remove redundant structs (#1104) * deprecate: remove redundant structs * fix: do not use removed conversions in local mode * fix: remove redundant conversions, simplify types.QueryRequest * deprecate: replace old style grpc vector conversion to a new one (#1105) * deprecate: replace old style grpc vector conversion to a new one * fix: ignore union attr in conversion * review fixes --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> * new: deprecate add, query, query_batch in fastembed mixin (#1102) * new: deprecate add, query, query_batch in fastembed mixin * 1.16 -> 1.17 --------- Co-authored-by: generall <andrey@vasnetsov.com> --------- Co-authored-by: generall <andrey@vasnetsov.com> * new: yet another update * new: add initial_state to create shard key (#1109) * chore: remove obsolete imports * fix: add metadata parameter to recreate collection in local * fix: fix metadata handling in local more --------- Co-authored-by: generall <andrey@vasnetsov.com>
370 lines
12 KiB
Python
370 lines
12 KiB
Python
from typing import Any
|
|
|
|
import numpy as np
|
|
import pytest
|
|
|
|
from qdrant_client import QdrantClient, models
|
|
from qdrant_client.client_base import QdrantBase
|
|
from qdrant_client.http.exceptions import UnexpectedResponse
|
|
from tests.congruence_tests.test_common import (
|
|
COLLECTION_NAME,
|
|
compare_client_results,
|
|
generate_sparse_fixtures,
|
|
init_client,
|
|
init_local,
|
|
init_remote,
|
|
sparse_image_vector_size,
|
|
sparse_vectors_config,
|
|
)
|
|
from tests.fixtures.filters import one_random_filter_please
|
|
from tests.fixtures.points import random_sparse_vectors
|
|
|
|
secondary_collection_name = "congruence_secondary_collection"
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def fixture_points() -> list[models.PointStruct]:
|
|
return generate_sparse_fixtures(200)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def secondary_collection_points() -> list[models.PointStruct]:
|
|
return generate_sparse_fixtures(100)
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def local_client(fixture_points, secondary_collection_points) -> QdrantClient:
|
|
client = init_local()
|
|
init_client(
|
|
client, fixture_points, vectors_config={}, sparse_vectors_config=sparse_vectors_config
|
|
)
|
|
init_client(
|
|
client,
|
|
secondary_collection_points,
|
|
secondary_collection_name,
|
|
sparse_vectors_config=sparse_vectors_config,
|
|
)
|
|
return client
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def http_client(fixture_points, secondary_collection_points) -> QdrantClient:
|
|
client = init_remote()
|
|
init_client(
|
|
client, fixture_points, vectors_config={}, sparse_vectors_config=sparse_vectors_config
|
|
)
|
|
init_client(
|
|
client,
|
|
secondary_collection_points,
|
|
secondary_collection_name,
|
|
vectors_config={},
|
|
sparse_vectors_config=sparse_vectors_config,
|
|
)
|
|
return client
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def grpc_client(fixture_points, secondary_collection_points) -> QdrantClient:
|
|
client = init_remote(prefer_grpc=True)
|
|
return client
|
|
|
|
|
|
def test_context(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.ContextQuery(context=[models.ContextPair(positive=10, negative=19)]),
|
|
with_payload=True,
|
|
limit=200,
|
|
using="sparse-image",
|
|
)
|
|
|
|
compare_client_results(grpc_client, http_client, f, is_context_search=True)
|
|
compare_client_results(local_client, http_client, f, is_context_search=True)
|
|
|
|
|
|
def test_context_many_pairs(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
random_sparse_image_vector_1 = random_sparse_vectors(
|
|
{"sparse-image": sparse_image_vector_size}
|
|
)["sparse-image"]
|
|
random_sparse_image_vector_2 = random_sparse_vectors(
|
|
{"sparse-image": sparse_image_vector_size}
|
|
)["sparse-image"]
|
|
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.ContextQuery(
|
|
context=[
|
|
models.ContextPair(positive=11, negative=19),
|
|
models.ContextPair(positive=100, negative=199),
|
|
models.ContextPair(
|
|
positive=random_sparse_image_vector_1,
|
|
negative=random_sparse_image_vector_2,
|
|
),
|
|
models.ContextPair(positive=30, negative=random_sparse_image_vector_2),
|
|
models.ContextPair(positive=random_sparse_image_vector_1, negative=15),
|
|
]
|
|
),
|
|
with_payload=True,
|
|
limit=200,
|
|
using="sparse-image",
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f, is_context_search=True)
|
|
compare_client_results(local_client, http_client, f, is_context_search=True)
|
|
|
|
|
|
def test_discover(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=10, context=[models.ContextPair(positive=11, negative=19)]
|
|
)
|
|
),
|
|
with_payload=True,
|
|
limit=100,
|
|
using="sparse-image",
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
def test_discover_raw_target(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
random_sparse_image_vector = random_sparse_vectors({"sparse-image": sparse_image_vector_size})[
|
|
"sparse-image"
|
|
]
|
|
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=random_sparse_image_vector,
|
|
context=[models.ContextPair(positive=10, negative=19)],
|
|
)
|
|
),
|
|
limit=100,
|
|
using="sparse-image",
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
def test_context_raw_positive(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
random_sparse_image_vector = random_sparse_vectors({"sparse-image": sparse_image_vector_size})[
|
|
"sparse-image"
|
|
]
|
|
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=10,
|
|
context=[models.ContextPair(positive=random_sparse_image_vector, negative=19)],
|
|
)
|
|
),
|
|
limit=10,
|
|
using="sparse-image",
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
def test_only_target(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(discover=models.DiscoverInput(target=10, context=[])),
|
|
with_payload=True,
|
|
limit=10,
|
|
using="sparse-image",
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
def test_discover_from_another_collection(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=10, context=[models.ContextPair(positive=15, negative=7)]
|
|
)
|
|
),
|
|
with_payload=True,
|
|
limit=10,
|
|
using="sparse-image",
|
|
lookup_from=models.LookupLocation(
|
|
collection=secondary_collection_name,
|
|
vector="sparse-image",
|
|
),
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
def test_discover_batch(
|
|
local_client,
|
|
http_client,
|
|
grpc_client,
|
|
):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.QueryResponse]:
|
|
return client.query_batch_points(
|
|
collection_name=COLLECTION_NAME,
|
|
requests=[
|
|
models.QueryRequest(
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=10, context=[models.ContextPair(positive=15, negative=7)]
|
|
)
|
|
),
|
|
limit=5,
|
|
using="sparse-image",
|
|
),
|
|
models.QueryRequest(
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=11, context=[models.ContextPair(positive=15, negative=17)]
|
|
)
|
|
),
|
|
limit=6,
|
|
using="sparse-image",
|
|
lookup_from=models.LookupLocation(
|
|
collection=secondary_collection_name,
|
|
vector="sparse-image",
|
|
),
|
|
),
|
|
],
|
|
)
|
|
|
|
compare_client_results(grpc_client, http_client, f)
|
|
compare_client_results(local_client, http_client, f)
|
|
|
|
|
|
@pytest.mark.parametrize("filter_", [one_random_filter_please() for _ in range(10)])
|
|
def test_discover_with_filters(local_client, http_client, grpc_client, filter_: models.Filter):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=10, context=[models.ContextPair(positive=15, negative=7)]
|
|
)
|
|
),
|
|
limit=15,
|
|
using="sparse-image",
|
|
query_filter=filter_,
|
|
).points
|
|
|
|
|
|
@pytest.mark.parametrize("filter_", [one_random_filter_please() for _ in range(10)])
|
|
def test_context_with_filters(local_client, http_client, grpc_client, filter_: models.Filter):
|
|
def f(client: QdrantBase, **kwargs: dict[str, Any]) -> list[models.ScoredPoint]:
|
|
return client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=models.ContextQuery(context=[models.ContextPair(positive=15, negative=7)]),
|
|
limit=200,
|
|
using="sparse-image",
|
|
query_filter=filter_,
|
|
).points
|
|
|
|
compare_client_results(grpc_client, http_client, f, is_context_search=True)
|
|
compare_client_results(local_client, http_client, f, is_context_search=True)
|
|
|
|
|
|
def test_query_with_nan():
|
|
fixture_points = generate_sparse_fixtures()
|
|
using = "sparse-image"
|
|
|
|
local_client = init_local()
|
|
remote_client = init_remote()
|
|
|
|
init_client(
|
|
local_client,
|
|
fixture_points,
|
|
vectors_config={},
|
|
sparse_vectors_config=sparse_vectors_config,
|
|
)
|
|
init_client(
|
|
remote_client,
|
|
fixture_points,
|
|
vectors_config={},
|
|
sparse_vectors_config=sparse_vectors_config,
|
|
)
|
|
|
|
sparse_vector_dicts = [
|
|
random_sparse_vectors({using: sparse_image_vector_size}) for _ in range(3)
|
|
]
|
|
sparse_vectors = [sparse_vector_dict[using] for sparse_vector_dict in sparse_vector_dicts]
|
|
|
|
sparse_vector_with_nan = sparse_vectors[0]
|
|
sparse_vector_with_nan.values[0] = np.nan
|
|
|
|
sparse_vector = sparse_vectors[1]
|
|
sparse_vector_2 = sparse_vectors[2]
|
|
|
|
for target, pos, neg in (
|
|
[None, sparse_vector_with_nan, sparse_vector],
|
|
[None, sparse_vector, sparse_vector_with_nan],
|
|
[sparse_vector_with_nan, sparse_vector, sparse_vector_2],
|
|
):
|
|
if target is not None:
|
|
query = models.DiscoverQuery(
|
|
discover=models.DiscoverInput(
|
|
target=target, context=[models.ContextPair(positive=pos, negative=neg)]
|
|
)
|
|
)
|
|
else:
|
|
query = models.ContextQuery(context=models.ContextPair(positive=pos, negative=neg))
|
|
with pytest.raises(AssertionError):
|
|
local_client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=query,
|
|
using=using,
|
|
)
|
|
|
|
with pytest.raises(UnexpectedResponse):
|
|
remote_client.query_points(
|
|
collection_name=COLLECTION_NAME,
|
|
query=query,
|
|
using=using,
|
|
)
|