Skip to content

Commit a7e2374

Browse files
JohnJyongparambharat
authored andcommitted
fix tidb metadata filter (langgenius#16237)
1 parent 760b427 commit a7e2374

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py

+6-12
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,13 @@ def search_by_vector(self, query_vector: list[float], **kwargs: Any) -> list[Doc
328328
)
329329
document_ids_filter = kwargs.get("document_ids_filter")
330330
if document_ids_filter:
331-
should_conditions = []
332-
for document_id_filter in document_ids_filter:
333-
should_conditions.append(
331+
if filter.must:
332+
filter.must.append(
334333
models.FieldCondition(
335334
key="metadata.document_id",
336-
match=models.MatchValue(value=document_id_filter),
335+
match=models.MatchAny(any=document_ids_filter),
337336
)
338337
)
339-
if should_conditions:
340-
filter.should = should_conditions # type: ignore
341338
results = self._client.search(
342339
collection_name=self._collection_name,
343340
query_vector=query_vector,
@@ -382,16 +379,13 @@ def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
382379
)
383380
document_ids_filter = kwargs.get("document_ids_filter")
384381
if document_ids_filter:
385-
should_conditions = []
386-
for document_id_filter in document_ids_filter:
387-
should_conditions.append(
382+
if scroll_filter.must:
383+
scroll_filter.must.append(
388384
models.FieldCondition(
389385
key="metadata.document_id",
390-
match=models.MatchValue(value=document_id_filter),
386+
match=models.MatchAny(any=document_ids_filter),
391387
)
392388
)
393-
if should_conditions:
394-
scroll_filter.should = should_conditions # type: ignore
395389
response = self._client.scroll(
396390
collection_name=self._collection_name,
397391
scroll_filter=scroll_filter,

0 commit comments

Comments
 (0)