Better name for base backup id

Author: dirkkul

integration/test_backup_v4.py

@@ -681,6 +681,43 @@ def test_overwrite_alias_true(
     assert literature.collection == "Article", "alias must point to the original collection"
 
 
+def test_incremental_backup(client: weaviate.WeaviateClient, request: SubRequest) -> None:
+    """Create and restore incremental backup."""
+    backup_id = unique_backup_id(request.node.name)
+    base_backup_id = backup_id + "_base"
+
+    # create base backup
+    client.backup.create(
+        backup_id=base_backup_id,
+        backend=BACKEND,
+        include_collections=["Article"],
+        wait_for_completion=True,
+    )
+
+    # create incremental backup
+    client.backup.create(
+        backup_id=backup_id,
+        backend=BACKEND,
+        include_collections=["Article"],
+        wait_for_completion=True,
+        incremental_backup_base_id=base_backup_id,
+    )
+
+    # remove existing class
+    client.collections.delete("Article")
+
+    # restore incremental backup
+    client.backup.restore(
+        backup_id=backup_id,
+        backend=BACKEND,
+        include_collections=["Article"],
+        wait_for_completion=True,
+    )
+
+    # check data exists again
+    assert len(client.collections.use("Article")) == len(ARTICLES_IDS)
+
+
 # This test has been disabled temporarily until the behaviour of this scenario is clarified.
 # It worked in version 1.33.0-rc.1, but broken in version 1.33.0+
 # def test_overwrite_alias_false(

test/collection/test_config_methods.py

@@ -1,7 +1,6 @@
-
-import pytest
 from weaviate.collections.classes.config_methods import _collection_configs_simple_from_json
 
+
 def test_collection_config_simple_from_json_with_none_vectorizer_config() -> None:
     """Test that _collection_configs_simple_from_json handles None vectorizer config."""
     schema = {
@@ -10,9 +9,7 @@ def test_collection_config_simple_from_json_with_none_vectorizer_config() -> Non
                 "class": "TestCollection",
                 "vectorConfig": {
                     "default": {
-                        "vectorizer": {
-                            "text2vec-transformers": None
-                        },
+                        "vectorizer": {"text2vec-transformers": None},
                         "vectorIndexType": "hnsw",
                         "vectorIndexConfig": {
                             "skip": False,
@@ -25,15 +22,15 @@ def test_collection_config_simple_from_json_with_none_vectorizer_config() -> Non
                             "dynamicEfFactor": 8,
                             "vectorCacheMaxObjects": 1000000000000,
                             "flatSearchCutoff": 40000,
-                            "distance": "cosine"
-                        }
+                            "distance": "cosine",
+                        },
                     }
                 },
                 "properties": [],
                 "invertedIndexConfig": {
-                        "bm25": {"b": 0.75, "k1": 1.2},
-                        "cleanupIntervalSeconds": 60,
-                        "stopwords": {"preset": "en", "additions": None, "removals": None}
+                    "bm25": {"b": 0.75, "k1": 1.2},
+                    "cleanupIntervalSeconds": 60,
+                    "stopwords": {"preset": "en", "additions": None, "removals": None},
                 },
                 "replicationConfig": {"factor": 1, "deletionStrategy": "NoAutomatedResolution"},
                 "shardingConfig": {
@@ -44,7 +41,7 @@ def test_collection_config_simple_from_json_with_none_vectorizer_config() -> Non
                     "actualVirtualCount": 128,
                     "key": "_id",
                     "strategy": "hash",
-                    "function": "murmur3"
+                    "function": "murmur3",
                 },
                 "vectorIndexType": "hnsw",
                 "vectorIndexConfig": {
@@ -58,8 +55,8 @@ def test_collection_config_simple_from_json_with_none_vectorizer_config() -> Non
                     "dynamicEfFactor": 8,
                     "vectorCacheMaxObjects": 1000000000000,
                     "flatSearchCutoff": 40000,
-                    "distance": "cosine"
-                }
+                    "distance": "cosine",
+                },
             }
         ]
     }

weaviate/backup/async_.pyi

@@ -20,7 +20,7 @@ class _BackupAsync(_BackupExecutor[ConnectionAsync]):
         backend: BackupStorage,
         include_collections: Union[List[str], str, None] = None,
         exclude_collections: Union[List[str], str, None] = None,
-        base_backup_id: Optional[str] = None,
+        incremental_backup_base_id: Optional[str] = None,
         wait_for_completion: bool = False,
         config: Optional[BackupConfigCreate] = None,
         backup_location: Optional[BackupLocationType] = None,

weaviate/backup/executor.py

@@ -47,7 +47,7 @@ def create(
         backend: BackupStorage,
         include_collections: Union[List[str], str, None] = None,
         exclude_collections: Union[List[str], str, None] = None,
-        base_backup_id: Optional[str] = None,
+        incremental_backup_base_id: Optional[str] = None,
         wait_for_completion: bool = False,
         config: Optional[BackupConfigCreate] = None,
         backup_location: Optional[BackupLocationType] = None,
@@ -61,6 +61,8 @@ def create(
                 collections will be included. Either `include_collections` or `exclude_collections` can be set. By default None.
             exclude_collections: The collection/list of collections to be excluded in the backup.
                 Either `include_collections` or `exclude_collections` can be set. By default None.
+            incremental_backup_base_id: The identifier name of the base backup for an incremental backup. Files that are identical
+                to the base backup will not be included in the incremental backup and restored from the base. By default None.
             wait_for_completion: Whether to wait until the backup is done. By default False.
             config: The configuration of the backup creation. By default None.
             backup_location: The dynamic location of a backup. By default None.
@@ -90,7 +92,7 @@ def create(
             "id": backup_id,
             "include": include_collections,
             "exclude": exclude_collections,
-            "incremental_backup_base_id": base_backup_id,
+            "incremental_backup_base_id": incremental_backup_base_id,
         }
 
         if config is not None:

weaviate/backup/sync.pyi

@@ -20,7 +20,7 @@ class _Backup(_BackupExecutor[ConnectionSync]):
         backend: BackupStorage,
         include_collections: Union[List[str], str, None] = None,
         exclude_collections: Union[List[str], str, None] = None,
-        base_backup_id: Optional[str] = None,
+        incremental_backup_base_id: Optional[str] = None,
         wait_for_completion: bool = False,
         config: Optional[BackupConfigCreate] = None,
         backup_location: Optional[BackupLocationType] = None,