Skip to content

Commit 297d358

Browse files
committed
Python: Fix Qdrant vector search for qdrant-client 1.16+ and single-comparison filters
AsyncQdrantClient.search was removed in qdrant-client 1.16, so the vector search path now calls query_points, which exists since 1.10 and is already used by hybrid search. The extra now requires qdrant-client ~= 1.10. A filter with one comparison is parsed to a bare FieldCondition, which Qdrant rejects. It is now wrapped in a Filter.
1 parent 64005c7 commit 297d358

5 files changed

Lines changed: 117 additions & 16 deletions

File tree

‎python/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ postgres = [
136136
"psycopg[binary,pool] ~= 3.2"
137137
]
138138
qdrant = [
139-
"qdrant-client ~= 1.9"
139+
"qdrant-client ~= 1.10"
140140
]
141141
redis = [
142142
"redis[hiredis] >= 6,< 8",

‎python/semantic_kernel/connectors/qdrant.py‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ async def _inner_search(
274274
vector: Sequence[float | int] | None = None,
275275
**kwargs: Any,
276276
) -> KernelSearchResults[VectorSearchResult[TModel]]:
277-
query_vector: tuple[str, Sequence[float | int]] | Sequence[float | int] | None = None
278-
279277
if not vector:
280278
vector = await self._generate_vector_from_values(values, options)
281279

@@ -287,19 +285,28 @@ async def _inner_search(
287285
raise VectorStoreOperationException(
288286
f"Vector field {options.vector_property_name} not found in data model definition."
289287
)
290-
query_vector = (vector_field.storage_name or vector_field.name, vector) if self.named_vectors else vector
291-
filters: Filter | list[Filter] | None = self._build_filter(options.filter) # type: ignore
292-
filter: Filter | None = Filter(must=filters) if filters and isinstance(filters, list) else filters # type: ignore
288+
filters = self._build_filter(options.filter)
289+
filter: Filter | None = None
290+
if isinstance(filters, list):
291+
filter = Filter(must=filters)
292+
elif isinstance(filters, Filter):
293+
filter = filters
294+
elif filters is not None:
295+
# a single comparison such as `x.price > 5` is a FieldCondition, but Qdrant expects a Filter here
296+
filter = Filter(must=[filters])
293297
if search_type == SearchType.VECTOR:
294-
results = await self.qdrant_client.search(
298+
# AsyncQdrantClient.search was removed in qdrant-client 1.16, query_points exists since 1.10.
299+
response = await self.qdrant_client.query_points(
295300
collection_name=self.collection_name,
296-
query_vector=query_vector, # type: ignore
301+
query=vector, # type: ignore
302+
using=(vector_field.storage_name or vector_field.name) if self.named_vectors else None,
297303
query_filter=filter,
298304
with_vectors=options.include_vectors,
299305
limit=options.top,
300306
offset=options.skip,
301307
**kwargs,
302308
)
309+
results = response.points
303310
else:
304311
# Hybrid search: vector + keywords (RRF fusion)
305312
# 1. Get keywords and text field

‎python/tests/unit/connectors/memory/test_qdrant.py‎

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from pytest import fixture, mark, raises
66
from qdrant_client.async_qdrant_client import AsyncQdrantClient
7-
from qdrant_client.models import Datatype, Distance, FieldCondition, MatchValue, VectorParams
7+
from qdrant_client.models import Datatype, Distance, FieldCondition, Filter, MatchValue, VectorParams
88

99
from semantic_kernel.connectors.qdrant import QdrantCollection, QdrantStore
1010
from semantic_kernel.data.vector import DistanceFunction, VectorStoreField
@@ -109,12 +109,13 @@ def mock_delete():
109109

110110
@fixture(autouse=True)
111111
def mock_search():
112-
with patch(f"{BASE_PATH}.search") as mock_search:
112+
with patch(f"{BASE_PATH}.query_points") as mock_search:
113+
from qdrant_client.http.models import QueryResponse
113114
from qdrant_client.models import ScoredPoint
114115

115116
response1 = ScoredPoint(id="id1", version=1, score=0.0, payload={"content": "content"})
116117
response2 = ScoredPoint(id="id2", version=1, score=0.0, payload={"content": "content"})
117-
mock_search.return_value = [response1, response2]
118+
mock_search.return_value = QueryResponse(points=[response1, response2])
118119
yield mock_search
119120

120121

@@ -285,7 +286,8 @@ async def test_search(collection, mock_search):
285286
assert mock_search.call_count == 1
286287
mock_search.assert_called_with(
287288
collection_name="test",
288-
query_vector=[1.0, 2.0, 3.0],
289+
query=[1.0, 2.0, 3.0],
290+
using=None,
289291
query_filter=None,
290292
with_vectors=False,
291293
limit=3,
@@ -307,7 +309,8 @@ async def test_search_named_vectors(collection, mock_search):
307309
assert mock_search.call_count == 1
308310
mock_search.assert_called_with(
309311
collection_name="test",
310-
query_vector=("vector", [1.0, 2.0, 3.0]),
312+
query=[1.0, 2.0, 3.0],
313+
using="vector",
311314
query_filter=None,
312315
with_vectors=False,
313316
limit=3,
@@ -328,14 +331,45 @@ async def test_search_filter(collection, mock_search):
328331
assert mock_search.call_count == 1
329332
mock_search.assert_called_with(
330333
collection_name="test",
331-
query_vector=("vector", [1.0, 2.0, 3.0]),
332-
query_filter=FieldCondition(key="id", match=MatchValue(value="id1")),
334+
query=[1.0, 2.0, 3.0],
335+
using="vector",
336+
query_filter=Filter(must=[FieldCondition(key="id", match=MatchValue(value="id1"))]),
333337
with_vectors=False,
334338
limit=3,
335339
offset=0,
336340
)
337341

338342

343+
async def test_search_multiple_filters(collection, mock_search):
344+
await collection.search(
345+
vector=[1.0, 2.0, 3.0],
346+
include_vectors=False,
347+
filter=["lambda x: x.id == 'id1'", "lambda x: x.id != 'id2'"],
348+
)
349+
350+
assert mock_search.call_args.kwargs["query_filter"] == Filter(
351+
must=[
352+
FieldCondition(key="id", match=MatchValue(value="id1")),
353+
Filter(must_not=[FieldCondition(key="id", match=MatchValue(value="id2"))]),
354+
]
355+
)
356+
357+
358+
async def test_hybrid_search_filter(collection, mock_search):
359+
await collection.hybrid_search(
360+
values=["content"],
361+
vector=[1.0, 2.0, 3.0],
362+
additional_property_name="content",
363+
filter="lambda x: x.id == 'id1'",
364+
)
365+
366+
assert mock_search.call_count == 1
367+
dense, keywords = mock_search.call_args.kwargs["prefetch"]
368+
id_condition = FieldCondition(key="id", match=MatchValue(value="id1"))
369+
assert dense.filter == Filter(must=[id_condition])
370+
assert keywords.filter.must[0] == id_condition
371+
372+
339373
async def test_search_fail(collection):
340374
with raises(VectorSearchExecutionException, match="Search requires a vector."):
341375
await collection.search(include_vectors=False)
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Copyright (c) Microsoft. All rights reserved.
2+
3+
from pytest import fixture
4+
5+
from semantic_kernel.connectors.qdrant import QdrantCollection
6+
from semantic_kernel.data.vector import VectorStoreCollectionDefinition, VectorStoreField
7+
8+
# These tests run against the in-process Qdrant that ships with qdrant-client, so they exercise the real client API.
9+
10+
RECORDS = [
11+
{"id": 1, "temperature": 1, "vector": [1.0, 0.2]},
12+
{"id": 2, "temperature": 5, "vector": [0.0, 1.0]},
13+
{"id": 3, "temperature": 9, "vector": [1.0, 1.0]},
14+
]
15+
16+
17+
@fixture(params=[True, False], ids=["named_vectors", "unnamed_vector"])
18+
async def local_collection(request):
19+
definition = VectorStoreCollectionDefinition(
20+
fields=[
21+
VectorStoreField("key", name="id", type="int"),
22+
VectorStoreField("data", name="temperature", type="int", is_indexed=True),
23+
VectorStoreField("vector", name="vector", dimensions=2, type="float"),
24+
]
25+
)
26+
async with QdrantCollection(
27+
record_type=dict,
28+
definition=definition,
29+
collection_name="local_test",
30+
location=":memory:",
31+
named_vectors=request.param,
32+
) as collection:
33+
await collection.ensure_collection_exists()
34+
await collection.upsert(RECORDS)
35+
yield collection
36+
37+
38+
async def _ids(results) -> list[int]:
39+
return [result.record["id"] async for result in results.results]
40+
41+
42+
async def test_local_vector_search(local_collection):
43+
assert await _ids(await local_collection.search(vector=[1.0, 1.0], top=3)) == [3, 1, 2]
44+
45+
46+
async def test_local_vector_search_top_and_skip(local_collection):
47+
assert await _ids(await local_collection.search(vector=[1.0, 1.0], top=1)) == [3]
48+
assert await _ids(await local_collection.search(vector=[1.0, 1.0], top=1, skip=1)) == [1]
49+
50+
51+
async def test_local_vector_search_single_filter(local_collection):
52+
results = await local_collection.search(vector=[1.0, 1.0], filter="lambda x: x.temperature > 1")
53+
assert await _ids(results) == [3, 2]
54+
55+
56+
async def test_local_vector_search_multiple_filters(local_collection):
57+
results = await local_collection.search(
58+
vector=[1.0, 1.0], filter=["lambda x: x.temperature > 1", "lambda x: x.temperature < 9"]
59+
)
60+
assert await _ids(results) == [2]

‎python/uv.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)