Merge branch 'dev/1.33'

Author: dirkkul

.github/workflows/main.yaml

@@ -18,14 +18,13 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  WEAVIATE_125: 1.25.34
-  WEAVIATE_126: 1.26.17
   WEAVIATE_127: 1.27.27
   WEAVIATE_128: 1.28.16
   WEAVIATE_129: 1.29.9
   WEAVIATE_130: 1.30.12
   WEAVIATE_131: 1.31.5
   WEAVIATE_132: 1.32.5
+  WEAVIATE_133: 1.33.0-rc.1
 
 jobs:
   lint-and-format:
@@ -297,14 +296,13 @@ jobs:
       fail-fast: false
       matrix:
         version: [
-          $WEAVIATE_125,
-          $WEAVIATE_126,
           $WEAVIATE_127,
           $WEAVIATE_128,
           $WEAVIATE_129,
           $WEAVIATE_130,
           $WEAVIATE_131,
-          $WEAVIATE_132
+          $WEAVIATE_132,
+          $WEAVIATE_133
         ]
     steps:
       - name: Checkout

integration/test_client.py

@@ -226,7 +226,7 @@ def test_create_export_and_recreate(client: weaviate.WeaviateClient, request: Su
         vectorizer_config=Configure.Vectorizer.text2vec_contextionary(
             vectorize_collection_name=False
         ),
-        generative_config=Configure.Generative.cohere(model="something", k=10),
+        generative_config=Configure.Generative.cohere(model="command-r-plus", k=10),
         properties=[
             Property(
                 name="name",
@@ -270,7 +270,7 @@ def test_create_export_and_recreate(client: weaviate.WeaviateClient, request: Su
 
     assert export.generative_config is not None
     assert export.generative_config.generative == GenerativeSearches.COHERE
-    assert export.generative_config.model["model"] == "something"
+    assert export.generative_config.model["model"] == "command-r-plus"
     assert export.generative_config.model["kProperty"] == 10
 
     client.collections.delete([name1, name2])
@@ -363,11 +363,6 @@ def test_client_cluster_without_lazy_shard_loading(
     #
     # We also accept LOADING/READY because it may vary
     # based on the machine running the tests.
-    expect_status = (
-        ["LAZY_LOADING"]
-        if client._connection._weaviate_version.is_at_least(1, 32, 4)
-        else ["LOADING", "READY"]
-    )
 
     try:
         collection = client.collections.create(
@@ -379,7 +374,10 @@ def test_client_cluster_without_lazy_shard_loading(
         assert len(nodes[0].shards) == 1
         assert nodes[0].shards[0].collection == collection.name
         assert nodes[0].shards[0].object_count == 0
-        assert nodes[0].shards[0].vector_indexing_status in expect_status
+        if collection._connection._weaviate_version.is_lower_than(1, 32, 0):
+            assert nodes[0].shards[0].vector_indexing_status == "READY"
+        else:
+            assert nodes[0].shards[0].vector_indexing_status == "LAZY_LOADING"
         assert nodes[0].shards[0].vector_queue_length == 0
         assert nodes[0].shards[0].compressed is False
         if collection._connection._weaviate_version.is_lower_than(1, 25, 0):

integration/test_collection.py

@@ -7,11 +7,8 @@
 
 import pytest
 
-from integration.conftest import (
-    CollectionFactory,
-    CollectionFactoryGet,
-    _sanitize_collection_name,
-)
+import weaviate.classes as wvc
+from integration.conftest import CollectionFactory, CollectionFactoryGet, _sanitize_collection_name
 from integration.constants import WEAVIATE_LOGO_NEW_ENCODED, WEAVIATE_LOGO_OLD_ENCODED
 from weaviate.collections.classes.batch import ErrorObject
 from weaviate.collections.classes.config import (
@@ -23,9 +20,7 @@
     Tokenization,
     Vectorizers,
 )
-from weaviate.collections.classes.data import (
-    DataObject,
-)
+from weaviate.collections.classes.data import DataObject
 from weaviate.collections.classes.grpc import (
     PROPERTIES,
     PROPERTY,
@@ -39,16 +34,8 @@
     Sort,
     _Sorting,
 )
-from weaviate.collections.classes.internal import (
-    Object,
-    ReferenceToMulti,
-    _CrossReference,
-)
-from weaviate.collections.classes.types import (
-    PhoneNumber,
-    WeaviateProperties,
-    _PhoneNumber,
-)
+from weaviate.collections.classes.internal import Object, ReferenceToMulti, _CrossReference
+from weaviate.collections.classes.types import PhoneNumber, WeaviateProperties, _PhoneNumber
 from weaviate.exceptions import (
     UnexpectedStatusCodeError,
     WeaviateInsertInvalidPropertyError,
@@ -59,8 +46,6 @@
 )
 from weaviate.types import UUID, UUIDS
 
-import weaviate.classes as wvc
-
 UUID1 = uuid.UUID("806827e0-2b31-43ca-9269-24fa95a221f9")
 UUID2 = uuid.UUID("8ad0d33c-8db1-4437-87f3-72161ca2a51a")
 UUID3 = uuid.UUID("83d99755-9deb-4b16-8431-d1dff4ab0a75")

integration/test_collection_filter.py

@@ -7,18 +7,9 @@
 
 import weaviate
 from integration.conftest import CollectionFactory
-from weaviate.collections.classes.config import (
-    Configure,
-    DataType,
-    Property,
-    ReferenceProperty,
-)
+from weaviate.collections.classes.config import Configure, DataType, Property, ReferenceProperty
 from weaviate.collections.classes.data import DataObject
-from weaviate.collections.classes.filters import (
-    Filter,
-    _Filters,
-    _FilterValue,
-)
+from weaviate.collections.classes.filters import Filter, _Filters, _FilterValue
 from weaviate.collections.classes.grpc import MetadataQuery, QueryReference, Sort
 from weaviate.collections.classes.internal import ReferenceToMulti
 from weaviate.types import UUID
@@ -30,6 +21,7 @@
 UUID1 = uuid.uuid4()
 UUID2 = uuid.uuid4()
 UUID3 = uuid.uuid4()
+UUID4 = uuid.uuid4()
 
 
 @pytest.mark.parametrize(
@@ -246,48 +238,50 @@ def test_filters_comparison(
 
 
 @pytest.mark.parametrize(
-    "weaviate_filter,results",
+    "weaviate_filter,results,require_version",
     [
-        (Filter.by_property("ints").contains_any([1, 4]), [0, 3]),
-        (Filter.by_property("ints").contains_any([1.0, 4]), [0, 3]),
-        (Filter.by_property("ints").contains_any([10]), []),
-        (Filter.by_property("int").contains_any([1]), [0, 1]),
-        (Filter.by_property("text").contains_any(["test"]), [0, 1]),
-        (Filter.by_property("text").contains_any(["real", "deal"]), [1, 2, 3]),
-        (Filter.by_property("texts").contains_any(["test"]), [0, 1]),
-        (Filter.by_property("texts").contains_any(["real", "deal"]), [1, 2, 3]),
-        (Filter.by_property("float").contains_any([2.0]), []),
-        (Filter.by_property("float").contains_any([2]), []),
-        (Filter.by_property("float").contains_any([8]), [3]),
-        (Filter.by_property("float").contains_any([8.0]), [3]),
-        (Filter.by_property("floats").contains_any([2.0]), [0, 1]),
-        (Filter.by_property("floats").contains_any([0.4, 0.7]), [0, 1, 3]),
-        (Filter.by_property("floats").contains_any([2]), [0, 1]),
-        (Filter.by_property("bools").contains_any([True, False]), [0, 1, 3]),
-        (Filter.by_property("bools").contains_any([False]), [0, 1]),
-        (Filter.by_property("bool").contains_any([True]), [0, 1, 3]),
-        (Filter.by_property("ints").contains_all([1, 4]), [0]),
-        (Filter.by_property("text").contains_all(["real", "test"]), [1]),
-        (Filter.by_property("texts").contains_all(["real", "test"]), [1]),
-        (Filter.by_property("floats").contains_all([0.7, 2]), [1]),
-        (Filter.by_property("bools").contains_all([True, False]), [0]),
-        (Filter.by_property("bool").contains_all([True, False]), []),
-        (Filter.by_property("bool").contains_all([True]), [0, 1, 3]),
-        (Filter.by_property("dates").contains_any([NOW, MUCH_LATER]), [0, 1, 3]),
-        (Filter.by_property("dates").contains_any([NOW]), [0, 1]),
-        (Filter.by_property("date").equal(NOW), [0]),
-        (Filter.by_property("date").greater_than(NOW), [1, 3]),
-        (Filter.by_property("uuids").contains_all([UUID2, UUID1]), [0, 3]),
-        (Filter.by_property("uuids").contains_any([UUID2, UUID1]), [0, 1, 3]),
-        (Filter.by_property("uuid").contains_any([UUID3]), []),
-        (Filter.by_property("uuid").contains_any([UUID1]), [0]),
-        (Filter.by_property("_id").contains_any([UUID1, UUID3]), [0, 2]),
+        (Filter.by_property("ints").contains_any([1, 4]), [0, 3], None),
+        (Filter.by_property("ints").contains_any([1.0, 4]), [0, 3], None),
+        (Filter.by_property("ints").contains_any([10]), [], None),
+        (Filter.by_property("int").contains_any([1]), [0, 1], None),
+        (Filter.by_property("text").contains_any(["test"]), [0, 1], None),
+        (Filter.by_property("text").contains_any(["real", "deal"]), [1, 2, 3], None),
+        (Filter.by_property("texts").contains_any(["test"]), [0, 1], None),
+        (Filter.by_property("texts").contains_any(["real", "deal"]), [1, 2, 3], None),
+        (Filter.by_property("float").contains_any([2.0]), [], None),
+        (Filter.by_property("float").contains_any([2]), [], None),
+        (Filter.by_property("float").contains_any([8]), [3], None),
+        (Filter.by_property("float").contains_any([8.0]), [3], None),
+        (Filter.by_property("floats").contains_any([2.0]), [0, 1], None),
+        (Filter.by_property("floats").contains_any([0.4, 0.7]), [0, 1, 3], None),
+        (Filter.by_property("floats").contains_any([2]), [0, 1], None),
+        (Filter.by_property("bools").contains_any([True, False]), [0, 1, 3], None),
+        (Filter.by_property("bools").contains_any([False]), [0, 1], None),
+        (Filter.by_property("bool").contains_any([True]), [0, 1, 3], None),
+        (Filter.by_property("ints").contains_all([1, 4]), [0], None),
+        (Filter.by_property("text").contains_all(["real", "test"]), [1], None),
+        (Filter.by_property("texts").contains_all(["real", "test"]), [1], None),
+        (Filter.by_property("floats").contains_all([0.7, 2]), [1], None),
+        (Filter.by_property("bools").contains_all([True, False]), [0], None),
+        (Filter.by_property("bool").contains_all([True, False]), [], None),
+        (Filter.by_property("bool").contains_all([True]), [0, 1, 3], None),
+        (Filter.by_property("dates").contains_any([NOW, MUCH_LATER]), [0, 1, 3], None),
+        (Filter.by_property("dates").contains_any([NOW]), [0, 1], None),
+        (Filter.by_property("date").equal(NOW), [0], None),
+        (Filter.by_property("date").greater_than(NOW), [1, 3], None),
+        (Filter.by_property("uuids").contains_all([UUID2, UUID1]), [0, 3], None),
+        (Filter.by_property("uuids").contains_any([UUID2, UUID1]), [0, 1, 3], None),
+        (Filter.by_property("uuid").contains_any([UUID3]), [], None),
+        (Filter.by_property("uuid").contains_any([UUID1]), [0], None),
+        (Filter.by_property("_id").contains_any([UUID1, UUID3]), [0, 2], None),
+        (Filter.by_property("_id").contains_none([UUID1, UUID2, UUID3, UUID4]), [], (1, 33, 0)),
     ],
 )
 def test_filters_contains(
     collection_factory: CollectionFactory,
     weaviate_filter: _FilterValue,
     results: List[int],
+    require_version: Optional[tuple[int, int, int]],
 ) -> None:
     collection = collection_factory(
         vectorizer_config=Configure.Vectorizer.none(),
@@ -307,6 +301,11 @@ def test_filters_contains(
         ],
     )
 
+    if require_version and collection._connection._weaviate_version.is_lower_than(*require_version):
+        pytest.skip(
+            f"{weaviate_filter} is not supported in v{'.'.join(str(_) for _ in require_version)}"
+        )
+
     uuids = [
         collection.data.insert(
             {
@@ -370,7 +369,8 @@ def test_filters_contains(
                 "date": MUCH_LATER,
                 "uuids": [UUID1, UUID2],
                 "uuid": UUID2,
-            }
+            },
+            uuid=UUID4,
         ),
     ]
 

integration/test_rbac.py

@@ -337,6 +337,30 @@
             ),
             32,
         ),
+        (
+            Permissions.alias(alias="", collection="*", read=True, delete=True),
+            Role(
+                name="AlliasRole2",
+                alias_permissions=[
+                    AliasPermissionOutput(
+                        alias="*",
+                        collection="*",
+                        actions={Actions.Alias.READ, Actions.Alias.DELETE},
+                    )
+                ],
+                cluster_permissions=[],
+                users_permissions=[],
+                collections_permissions=[],
+                roles_permissions=[],
+                data_permissions=[],
+                backups_permissions=[],
+                nodes_permissions=[],
+                tenants_permissions=[],
+                replicate_permissions=[],
+                groups_permissions=[],
+            ),
+            32,  # Minimum version for alias permissions
+        ),
         (
             Permissions.alias(alias="*", collection="*", read=True, delete=True),
             Role(

mock_tests/conftest.py

@@ -15,14 +15,14 @@
 from weaviate.proto.v1 import (
     batch_delete_pb2,
     batch_pb2,
-    health_pb2,
-    health_pb2_grpc,
     properties_pb2,
     search_get_pb2,
     tenants_pb2,
     weaviate_pb2_grpc,
 )
 
+from grpc_health.v1 import health_pb2, health_pb2_grpc
+
 MOCK_IP = "127.0.0.1"
 MOCK_PORT = 23536
 MOCK_PORT_GRPC = 23537
@@ -55,15 +55,15 @@ def ready_mock(httpserver: HTTPServer):
 
 @pytest.fixture(scope="function")
 def weaviate_mock(ready_mock: HTTPServer):
-    ready_mock.expect_request("/v1/meta").respond_with_json({"version": "1.25"})
+    ready_mock.expect_request("/v1/meta").respond_with_json({"version": "1.33"})
     ready_mock.expect_request("/v1/nodes").respond_with_json({"nodes": [{"gitHash": "ABC"}]})
 
     yield ready_mock
 
 
 @pytest.fixture(scope="function")
 def weaviate_no_auth_mock(weaviate_mock: HTTPServer):
-    weaviate_mock.expect_request("/v1/meta").respond_with_json({"version": "1.25"})
+    weaviate_mock.expect_request("/v1/meta").respond_with_json({"version": "1.33"})
     weaviate_mock.expect_request("/v1/.well-known/openid-configuration").respond_with_response(
         Response(json.dumps({}), status=404)
     )

mock_tests/test_collection.py

@@ -295,7 +295,7 @@ def test_node_with_timeout(
     httpserver: HTTPServer, start_grpc_server: grpc.Server, output: Literal["minimal", "verbose"]
 ) -> None:
     httpserver.expect_request("/v1/.well-known/ready").respond_with_json({})
-    httpserver.expect_request("/v1/meta").respond_with_json({"version": "1.24"})
+    httpserver.expect_request("/v1/meta").respond_with_json({"version": "1.33"})
 
     httpserver.expect_request("/v1/nodes").respond_with_json(
         status=200,

requirements-devel.txt

@@ -3,6 +3,7 @@ validators==0.34.0
 authlib==1.6.4
 grpcio==1.66.2
 grpcio-tools==1.66.2
+grpcio-health-checking==1.66.2
 pydantic==2.8.0
 deprecation==2.1.0
 

test/collection/test_config.py

@@ -2084,7 +2084,7 @@ def test_config_with_named_vectors(
     (
         [
             Configure.Vectors.text2vec_aws(
-                name="test", region="us-east-1", source_properties=["prop"]
+                name="test", region="us-east-1", source_properties=["prop"], model="model"
             )
         ],
         {
@@ -2095,6 +2095,7 @@ def test_config_with_named_vectors(
                         "vectorizeClassName": True,
                         "region": "us-east-1",
                         "service": "bedrock",
+                        "model": "model",
                     }
                 },
                 "vectorIndexType": "hnsw",