fix: propagate limit for filter (#400)

alaeddine-13 · web-flow · commit 64f8ff5dfebb · 2022-06-13T15:33:20.000+02:00
* fix: ignore limit for filter

* fix: allow limit for weaviate filter
diff --git a/docarray/array/mixins/find.py b/docarray/array/mixins/find.py
@@ -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 (
diff --git a/docarray/array/storage/weaviate/find.py b/docarray/array/storage/weaviate/find.py
@@ -5,6 +5,7 @@
     List,
     Dict,
     Optional,
+    Union,
 )
 
 import numpy as np
@@ -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).
 
@@ -94,6 +94,7 @@ def _filter(
             self._client.query.get(self._class_name, '_serialized')
             .with_additional('id')
             .with_where(filter)
+            .with_limit(limit)
             .do()
         )
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ def find(`
`141`	`141`	`)`
`142`	`142`	`elif query is None:`
`143`	`143`	`if isinstance(filter, dict):`
`144`		`- return self._filter(filter)`
	`144`	`+ return self._filter(filter, limit=limit)`
`145`	`145`	`else:`
`146`	`146`	`raise ValueError('filter must be dict when query is None')`
`147`	`147`	`elif isinstance(query, str) or (`