refactor weaviate filters

Author: ds-juliamay

packages/ragbits-core/src/ragbits/core/vector_stores/weaviate_vector.py

@@ -1,5 +1,3 @@
-from functools import reduce
-from operator import and_
 from typing import TypeVar, cast
 from uuid import UUID
 
@@ -9,7 +7,7 @@
 from weaviate import WeaviateAsyncClient
 from weaviate.classes.config import Configure, VectorDistances
 from weaviate.classes.query import Filter, MetadataQuery
-from weaviate.collections.classes.filters import _Filters
+from weaviate.collections.classes.filters import FilterReturn
 
 from ragbits.core.audit.traces import trace
 from ragbits.core.embeddings import Embedder
@@ -261,7 +259,7 @@ async def remove(self, ids: list[UUID]) -> None:
                 await index.data.delete_many(where=Filter.by_id().contains_any(ids))
 
     @staticmethod
-    def _create_weaviate_filter(where: WhereQuery, separator: str) -> _Filters:
+    def _create_weaviate_filter(where: WhereQuery, separator: str) -> FilterReturn:
         """
         Creates the Filter from the given WhereQuery.
 
@@ -274,13 +272,16 @@ def _create_weaviate_filter(where: WhereQuery, separator: str) -> _Filters:
         """
         where = flatten_dict(where)  # type: ignore
 
-        filters = (
-            Filter.by_property(f"metadata{separator}{key.replace('.', separator)}").equal(cast(str | int | bool, value))
-            for key, value in where.items()
+        filters = Filter.all_of(
+            [
+                Filter.by_property(f"metadata{separator}{key.replace('.', separator)}").equal(
+                    cast(str | int | bool, value)
+                )
+                for key, value in where.items()
+            ]
         )
 
-        filters = reduce(and_, filters)  # type: ignore
-        return filters  # type: ignore
+        return filters
 
     async def list(
         self,

packages/ragbits-core/tests/unit/vector_stores/test_weaviate.py

@@ -4,7 +4,7 @@
 import pytest
 import weaviate.classes as wvc
 from weaviate.classes.query import Filter
-from weaviate.collections.classes.filters import _FilterAnd
+from weaviate.collections.classes.filters import _FilterAnd, _FilterValue
 from weaviate.collections.classes.internal import MetadataReturn, Object
 
 from ragbits.core.embeddings.dense import NoopEmbedder
@@ -472,13 +472,13 @@ async def test_create_weaviate_filter():
     where = {"a": "A", "b": 3, "c": True}
     weaviate_filter = WeaviateVectorStore._create_weaviate_filter(where, separator="___")  # type: ignore
     assert isinstance(weaviate_filter, _FilterAnd)
-    assert isinstance(weaviate_filter.filters[0], _FilterAnd)
-    assert weaviate_filter.filters[0].filters[0].target == "metadata___a"  # type: ignore
-    assert weaviate_filter.filters[0].filters[0].value == "A"  # type: ignore
-    assert weaviate_filter.filters[0].filters[1].target == "metadata___b"  # type: ignore
-    assert weaviate_filter.filters[0].filters[1].value == 3  # type: ignore
-    assert weaviate_filter.filters[1].target == "metadata___c"  # type: ignore
-    assert weaviate_filter.filters[1].value  # type: ignore
+    assert isinstance(weaviate_filter.filters[0], _FilterValue)
+    assert weaviate_filter.filters[0].target == "metadata___a"  # type: ignore
+    assert weaviate_filter.filters[0].value == "A"  # type: ignore
+    assert weaviate_filter.filters[1].target == "metadata___b"  # type: ignore
+    assert weaviate_filter.filters[1].value == 3  # type: ignore
+    assert weaviate_filter.filters[2].target == "metadata___c"  # type: ignore
+    assert weaviate_filter.filters[2].value  # type: ignore
 
 
 @pytest.mark.asyncio