diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1fa7afb20..2f68432ba 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -26,9 +26,9 @@ env: WEAVIATE_132: 1.32.23 WEAVIATE_133: 1.33.10 WEAVIATE_134: 1.34.5 - WEAVIATE_135: 1.35.0 - WEAVIATE_136: 1.36.0 - WEAVIATE_137: 1.37.0-dev-29d5c87.amd64 + WEAVIATE_135: 1.35.16-efdedfa + WEAVIATE_136: 1.36.9-d905e6c + WEAVIATE_137: 1.37.0-rc.0-b313954.amd64 jobs: @@ -310,7 +310,7 @@ jobs: $WEAVIATE_133, $WEAVIATE_134, $WEAVIATE_135, - $WEAVIATE_136 + $WEAVIATE_136, $WEAVIATE_137 ] steps: diff --git a/integration/test_backup_v4.py b/integration/test_backup_v4.py index 1204a1269..6da10bc7c 100644 --- a/integration/test_backup_v4.py +++ b/integration/test_backup_v4.py @@ -764,7 +764,7 @@ def test_incremental_backup(client: weaviate.WeaviateClient, request: SubRequest backend=BACKEND, include_collections=["Article"], wait_for_completion=True, - incremental_backup_base_id=base_backup_id, + incremental_base_backup_id=base_backup_id, ) # remove existing class diff --git a/integration/test_client.py b/integration/test_client.py index 23ece9885..b72f53655 100644 --- a/integration/test_client.py +++ b/integration/test_client.py @@ -360,37 +360,6 @@ def test_client_cluster_with_lazy_shard_loading( client.collections.delete(request.node.name) -def test_client_cluster_without_lazy_shard_loading( - client_factory: ClientFactory, request: SubRequest -) -> None: - client = client_factory(8090, 50061) - - try: - collection = client.collections.create( - name=request.node.name, vectorizer_config=Configure.Vectorizer.none() - ) - - nodes = client.cluster.nodes(collection.name, output="verbose") - assert len(nodes) == 1 - 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 [ - "READONLY", - "INDEXING", - "READY", - "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): - assert nodes[0].shards[0].loaded is True - else: - assert nodes[0].shards[0].loaded is False - finally: - client.collections.delete(request.node.name) - - def test_client_cluster_multitenant(client: weaviate.WeaviateClient, request: SubRequest) -> None: try: collection = client.collections.create( diff --git a/integration/test_collection_config.py b/integration/test_collection_config.py index 371405a1d..d634e66cb 100644 --- a/integration/test_collection_config.py +++ b/integration/test_collection_config.py @@ -1585,6 +1585,10 @@ def test_replication_config_without_async_config(collection_factory: CollectionF def test_replication_config_with_async_config(collection_factory: CollectionFactory) -> None: + collection_dummy = collection_factory("dummy") + if collection_dummy._connection._weaviate_version.is_lower_than(1, 34, 18): + pytest.skip("async replication config requires Weaviate >= 1.34.18") + collection = collection_factory( replication_config=Configure.replication( factor=1, @@ -1726,7 +1730,7 @@ def test_replication_config_add_async_config_to_existing_collection( collection.config.update( replication_config=Reconfigure.replication( async_config=Reconfigure.Replication.async_config( - max_workers=12, + max_workers=8, propagation_concurrency=4, ), ), @@ -1734,7 +1738,7 @@ def test_replication_config_add_async_config_to_existing_collection( config = collection.config.get() assert config.replication_config.async_config is not None ac = config.replication_config.async_config - assert ac.max_workers == 12 + assert ac.max_workers == 8 assert ac.propagation_concurrency == 4 diff --git a/weaviate/backup/executor.py b/weaviate/backup/executor.py index e8c52239d..b50515a2f 100644 --- a/weaviate/backup/executor.py +++ b/weaviate/backup/executor.py @@ -92,7 +92,11 @@ def create( "id": backup_id, "include": include_collections, "exclude": exclude_collections, - "incremental_base_backup_id": incremental_base_backup_id, + "incremental_base_backup_id": ( + incremental_base_backup_id.lower() + if incremental_base_backup_id is not None + else None + ), } if config is not None: