Skip to content

fix: propagate limit for filter #400

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
alaeddine-13 merged 2 commits into from
Jun 13, 2022
Merged

fix: propagate limit for filter #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ffd87f
fix: ignore limit for filter
alaeddine-13 Jun 10, 2022
4f89027
fix: allow limit for weaviate filter
alaeddine-13 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docarray/array/mixins/find.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def find(
)
elif query is None:
if isinstance(filter, dict):
return self._filter(filter)
return self._filter(filter, limit=limit)
else:
raise ValueError('filter must be dict when query is None')
elif isinstance(query, str) or (
Expand Down
5 changes: 3 additions & 2 deletions docarray/array/storage/weaviate/find.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
List,
Dict,
Optional,
Union,
)

import numpy as np
Expand Down Expand Up @@ -79,8 +80,7 @@ def _find_similar_vectors(
return DocumentArray(docs)

def _filter(
self,
filter: Dict,
self, filter: Dict, limit: Optional[Union[int, float]] = 20
) -> 'DocumentArray':
"""Returns a subset of documents by filtering by the given filter (Weaviate `where` filter).

Expand All @@ -94,6 +94,7 @@ def _filter(
self._client.query.get(self._class_name, '_serialized')
.with_additional('id')
.with_where(filter)
.with_limit(limit)
.do()
)

Expand Down