Dev/1.29

.github/workflows/main.yaml

@@ -23,6 +23,7 @@ env:
   WEAVIATE_126: 1.26.14
   WEAVIATE_127: 1.27.12
   WEAVIATE_128: stable-v1.28-9075f00
+  WEAVIATE_129: 1.29.0-rc.1
 
 jobs:
   lint-and-format:
@@ -54,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.9", "3.10", "3.11", "3.12"]
+        version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         folder: ["weaviate"]
     steps:
       - uses: actions/checkout@v4
@@ -75,7 +76,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.9", "3.10", "3.11", "3.12"]
+        version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         folder: ["test", "mock_tests"]
     steps:
       - uses: actions/checkout@v4
@@ -98,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["3.9", "3.10", "3.11", "3.12"]
+        version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         optional_dependencies: [false]
     steps:
       - uses: actions/checkout@v4
@@ -129,11 +130,11 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          { py: "3.9", weaviate: $WEAVIATE_124},
-          { py: "3.10", weaviate: $WEAVIATE_125},
-          { py: "3.11", weaviate: $WEAVIATE_126},
-          { py: "3.12", weaviate: $WEAVIATE_127},
-          { py: "3.13", weaviate: $WEAVIATE_128}
+          { py: "3.9", weaviate: $WEAVIATE_129},
+          { py: "3.10", weaviate: $WEAVIATE_129},
+          { py: "3.11", weaviate: $WEAVIATE_129},
+          { py: "3.12", weaviate: $WEAVIATE_129},
+          { py: "3.13", weaviate: $WEAVIATE_129}
         ]
         optional_dependencies: [false]
     steps:
@@ -184,11 +185,11 @@ jobs:
       fail-fast: false
       matrix:
         versions: [
-          { py: "3.9", weaviate: $WEAVIATE_128},
-          { py: "3.10", weaviate: $WEAVIATE_128},
-          { py: "3.11", weaviate: $WEAVIATE_128},
-          { py: "3.12", weaviate: $WEAVIATE_128},
-          { py: "3.13", weaviate: $WEAVIATE_128}
+          { py: "3.9", weaviate: $WEAVIATE_129},
+          { py: "3.10", weaviate: $WEAVIATE_129},
+          { py: "3.11", weaviate: $WEAVIATE_129},
+          { py: "3.12", weaviate: $WEAVIATE_129},
+          { py: "3.13", weaviate: $WEAVIATE_129}
         ]
         optional_dependencies: [false]
     steps:
@@ -274,10 +275,12 @@ jobs:
       fail-fast: false
       matrix:
         server: [
+          $WEAVIATE_124,
           $WEAVIATE_125,
           $WEAVIATE_126,
           $WEAVIATE_127,
-          $WEAVIATE_128
+          $WEAVIATE_128,
+          $WEAVIATE_129
         ]
     steps:
       - name: Checkout

ci/docker-compose-generative.yml → ci/docker-compose-modules.yml

@@ -1,7 +1,7 @@
 ---
 version: '3.4'
 services:
-  weaviate_openai:
+  weaviate_modules:
     command:
       - --host
       - 0.0.0.0
@@ -19,6 +19,6 @@ services:
       AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
       PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
       DEFAULT_VECTORIZER_MODULE: 'text2vec-openai'
-      ENABLE_MODULES: 'text2vec-openai,generative-openai,text2vec-cohere,generative-cohere'
+      ENABLE_MODULES: 'text2colbert-jinaai,text2vec-openai,generative-openai,text2vec-cohere,generative-cohere,reranker-cohere'
       CLUSTER_HOSTNAME: 'node1'
       DISABLE_TELEMETRY: 'true'

integration/test_collection_aggregate.py

@@ -201,17 +201,24 @@ def test_over_all_with_filters_ref(collection_factory: CollectionFactory) -> Non
     assert res.properties["text"].count == 1
     assert res.properties["text"].top_occurrences[0].value == "two"
 
-    with pytest.raises(WeaviateInvalidInputError):
-        res = collection.aggregate.over_all(
-            filters=Filter.by_ref("ref")
-            .by_property("text")
-            .equal("one"),  # gRPC-compat API not support by GQL aggregation
-            return_metrics=[Metrics("text").text(count=True, top_occurrences_value=True)],
-        )
+    query = lambda: collection.aggregate.over_all(
+        filters=Filter.by_ref("ref").by_property("text").equal("one"),
+        return_metrics=[Metrics("text").text(count=True, top_occurrences_value=True)],
+    )
+    if collection._connection._weaviate_version.is_lower_than(1, 29, 0):
+        with pytest.raises(WeaviateInvalidInputError):
+            query()
+    else:
+        res = query()
+        assert isinstance(res.properties["text"], AggregateText)
+        assert res.properties["text"].count == 1
+        assert res.properties["text"].top_occurrences[0].value == "two"
 
 
 def test_wrong_aggregation(collection_factory: CollectionFactory) -> None:
     collection = collection_factory(properties=[Property(name="text", data_type=DataType.TEXT)])
+    if collection._connection._weaviate_version.is_at_least(1, 29, 0):
+        pytest.skip("GQL is only used for versions 1.28.4 and lower")
     with pytest.raises(WeaviateQueryError) as e:
         collection.aggregate.over_all(total_count=False)
     assert (
@@ -658,13 +665,19 @@ def test_group_by_aggregation_argument(collection_factory: CollectionFactory) ->
     groups = res.groups
     assert len(groups) == 2
     assert groups[0].grouped_by.prop == "int"
-    assert groups[0].grouped_by.value == "1" or groups[1].grouped_by.value == "1"
+    if collection._connection._weaviate_version.is_lower_than(1, 29, 0):
+        assert groups[0].grouped_by.value == "1" or groups[1].grouped_by.value == "1"
+    else:
+        assert groups[0].grouped_by.value == 1 or groups[1].grouped_by.value == 1
     assert isinstance(groups[0].properties["text"], AggregateText)
     assert groups[0].properties["text"].count == 1
     assert isinstance(groups[0].properties["int"], AggregateInteger)
     assert groups[0].properties["int"].count == 1
     assert groups[1].grouped_by.prop == "int"
-    assert groups[1].grouped_by.value == "2" or groups[0].grouped_by.value == "2"
+    if collection._connection._weaviate_version.is_lower_than(1, 29, 0):
+        assert groups[1].grouped_by.value == "2" or groups[0].grouped_by.value == "2"
+    else:
+        assert groups[1].grouped_by.value == 2 or groups[0].grouped_by.value == 2
     assert isinstance(groups[1].properties["text"], AggregateText)
     assert groups[1].properties["text"].count == 1
     assert isinstance(groups[1].properties["int"], AggregateInteger)

integration/test_collection_openai.py

@@ -578,18 +578,18 @@ def test_openai_batch_upload(openai_collection: OpenAICollection, request: SubRe
 
 
 def test_queries_with_rerank_and_generative(collection_factory: CollectionFactory) -> None:
-    api_key = os.environ.get("OPENAI_APIKEY")
+    api_key = os.environ.get("COHERE_APIKEY")
     if api_key is None:
-        pytest.skip("No OpenAI API key found.")
+        pytest.skip("No Cohere API key found.")
 
     collection = collection_factory(
         name="Test_test_queries_with_rerank_and_generative",
-        generative_config=Configure.Generative.openai(),
-        reranker_config=Configure.Reranker.transformers(),
-        vectorizer_config=Configure.Vectorizer.text2vec_openai(),
+        generative_config=Configure.Generative.cohere(),
+        reranker_config=Configure.Reranker.cohere(),
+        vectorizer_config=Configure.Vectorizer.text2vec_cohere(),
         properties=[Property(name="text", data_type=DataType.TEXT)],
-        ports=(8079, 50050),
-        headers={"X-OpenAI-Api-Key": api_key},
+        ports=(8086, 50057),
+        headers={"X-Cohere-Api-Key": api_key},
     )
     if collection._connection._weaviate_version < _ServerVersion(1, 23, 1):
         pytest.skip("Generative reranking requires Weaviate 1.23.1 or higher")

integration/test_collection_rerank.py

@@ -3,7 +3,6 @@
 import pytest
 
 import weaviate.classes as wvc
-from weaviate.util import _ServerVersion
 from .conftest import CollectionFactory
 
 
@@ -13,7 +12,7 @@ def test_query_using_rerank_with_old_server(collection_factory: CollectionFactor
         vectorizer_config=wvc.config.Configure.Vectorizer.none(),
         properties=[wvc.config.Property(name="text", data_type=wvc.config.DataType.TEXT)],
     )
-    if collection._connection._weaviate_version >= _ServerVersion(1, 23, 1):
+    if collection._connection._weaviate_version.is_at_least(1, 23, 1):
         pytest.skip("Reranking works with 1.23.1 or higher so no need to test this")
 
     collection.data.insert_many([{"text": "This is a test"}, {"text": "This is another test"}])
@@ -28,18 +27,19 @@ def test_query_using_rerank_with_old_server(collection_factory: CollectionFactor
 
 
 def test_queries_with_rerank(collection_factory: CollectionFactory) -> None:
-    api_key = os.environ.get("OPENAI_APIKEY")
+    api_key = os.environ.get("COHERE_APIKEY")
     if api_key is None:
-        pytest.skip("No OpenAI API key found.")
+        pytest.skip("No Cohere API key found.")
 
     collection = collection_factory(
         name="Test_test_queries_with_rerank",
-        reranker_config=wvc.config.Configure.Reranker.custom("reranker-dummy"),
-        vectorizer_config=wvc.config.Configure.Vectorizer.text2vec_openai(),
+        reranker_config=wvc.config.Configure.Reranker.cohere(),
+        vectorizer_config=wvc.config.Configure.Vectorizer.text2vec_cohere(),
         properties=[wvc.config.Property(name="text", data_type=wvc.config.DataType.TEXT)],
-        headers={"X-OpenAI-Api-Key": api_key},
+        headers={"X-Cohere-Api-Key": api_key},
+        ports=(8086, 50057),
     )
-    if collection._connection._weaviate_version < _ServerVersion(1, 23, 1):
+    if collection._connection._weaviate_version.is_lower_than(1, 23, 1):
         pytest.skip("Reranking requires Weaviate 1.23.1 or higher")
 
     insert = collection.data.insert_many(
@@ -83,20 +83,21 @@ def test_queries_with_rerank(collection_factory: CollectionFactory) -> None:
 
 
 def test_queries_with_rerank_and_group_by(collection_factory: CollectionFactory) -> None:
-    api_key = os.environ.get("OPENAI_APIKEY")
+    api_key = os.environ.get("COHERE_APIKEY")
     if api_key is None:
-        pytest.skip("No OpenAI API key found.")
+        pytest.skip("No Cohere API key found.")
 
     collection = collection_factory(
         name="Test_test_queries_with_rerank_and_group_by",
-        reranker_config=wvc.config.Configure.Reranker.custom("reranker-dummy"),
-        vectorizer_config=wvc.config.Configure.Vectorizer.text2vec_openai(
+        reranker_config=wvc.config.Configure.Reranker.cohere(),
+        vectorizer_config=wvc.config.Configure.Vectorizer.text2vec_cohere(
             vectorize_collection_name=False
         ),
         properties=[wvc.config.Property(name="text", data_type=wvc.config.DataType.TEXT)],
-        headers={"X-OpenAI-Api-Key": api_key},
+        headers={"X-Cohere-Api-Key": api_key},
+        ports=(8086, 50057),
     )
-    if collection._connection._weaviate_version < _ServerVersion(1, 23, 1):
+    if collection._connection._weaviate_version.is_lower_than(1, 23, 1):
         pytest.skip("Reranking requires Weaviate 1.23.1 or higher")
 
     insert = collection.data.insert_many(