Skip to content

refactor: use contains_any instead of Chaining where = where | f #30559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazywoola merged 2 commits into from
Jan 5, 2026
Merged

refactor: use contains_any instead of Chaining where = where | f #30559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4966f
refactor: use contains_any instead of Chaining where = where | f
fatelei Jan 5, 2026
205791a
[autofix.ci] apply automated fixes
autofix-ci[bot] Jan 5, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class WeaviateVector(BaseVector):
in a Weaviate collection.
"""

_DOCUMENT_ID_PROPERTY = "document_id"

def __init__(self, collection_name: str, config: WeaviateConfig, attributes: list):
"""
Initializes the Weaviate vector store.
Expand Down Expand Up @@ -353,15 +355,12 @@ def search_by_vector(self, query_vector: list[float], **kwargs: Any) -> list[Doc
return []

col = self._client.collections.use(self._collection_name)
props = list({*self._attributes, "document_id", Field.TEXT_KEY.value})
props = list({*self._attributes, self._DOCUMENT_ID_PROPERTY, Field.TEXT_KEY.value})

where = None
doc_ids = kwargs.get("document_ids_filter") or []
if doc_ids:
ors = [Filter.by_property("document_id").equal(x) for x in doc_ids]
where = ors[0]
for f in ors[1:]:
where = where | f
where = Filter.by_property(self._DOCUMENT_ID_PROPERTY).contains_any(doc_ids)

top_k = int(kwargs.get("top_k", 4))
score_threshold = float(kwargs.get("score_threshold") or 0.0)
Expand Down Expand Up @@ -408,10 +407,7 @@ def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
where = None
doc_ids = kwargs.get("document_ids_filter") or []
if doc_ids:
ors = [Filter.by_property("document_id").equal(x) for x in doc_ids]
where = ors[0]
for f in ors[1:]:
where = where | f
where = Filter.by_property(self._DOCUMENT_ID_PROPERTY).contains_any(doc_ids)

top_k = int(kwargs.get("top_k", 4))

Expand Down