Adapt to latest UX changes.

The bucket argument was removed from the weaviate-python-client,
so the code had to be adapted. The path is also passed as a config
in the get collection-export.

Author: jfrancoa

test/unittests/test_managers/test_export_manager.py

@@ -157,29 +157,27 @@ def test_create_export_passes_none_collections_when_not_specified(
     assert call_kwargs["exclude_collections"] is None
 
 
-def test_create_export_passes_config_with_bucket_and_path(
+def test_create_export_passes_config_with_path(
     export_manager: ExportManager, mock_client_with_export: MagicMock
 ) -> None:
-    """create_export passes ExportConfig when bucket/path are set."""
+    """create_export passes ExportConfig when path is set."""
     export_manager.create_export(
         export_id="my-export",
         backend="s3",
         file_format="parquet",
-        bucket="my-bucket",
         path="/my/path",
     )
 
     call_kwargs = mock_client_with_export.export.create.call_args.kwargs
     config = call_kwargs["config"]
     assert config is not None
-    assert config.bucket == "my-bucket"
     assert config.path == "/my/path"
 
 
-def test_create_export_no_config_when_bucket_and_path_none(
+def test_create_export_no_config_when_path_none(
     export_manager: ExportManager, mock_client_with_export: MagicMock
 ) -> None:
-    """create_export passes config=None when bucket and path are not set."""
+    """create_export passes config=None when path is not set."""
     export_manager.create_export(
         export_id="my-export",
         backend="filesystem",
@@ -242,19 +240,31 @@ def test_get_export_status_json_output(export_manager: ExportManager, capsys) ->
 def test_get_export_status_passes_correct_args(
     export_manager: ExportManager, mock_client_with_export: MagicMock
 ) -> None:
-    """get_export_status passes correct args to client."""
+    """get_export_status passes correct args to client, wrapping path in ExportConfig."""
     export_manager.get_export_status(
         export_id="my-export",
         backend="s3",
-        bucket="my-bucket",
         path="/my/path",
     )
 
     mock_client_with_export.export.get_status.assert_called_once()
     call_kwargs = mock_client_with_export.export.get_status.call_args.kwargs
     assert call_kwargs["export_id"] == "my-export"
-    assert call_kwargs["bucket"] == "my-bucket"
-    assert call_kwargs["path"] == "/my/path"
+    assert call_kwargs["config"] is not None
+    assert call_kwargs["config"].path == "/my/path"
+
+
+def test_get_export_status_no_config_when_path_none(
+    export_manager: ExportManager, mock_client_with_export: MagicMock
+) -> None:
+    """get_export_status passes config=None when path is not set."""
+    export_manager.get_export_status(
+        export_id="my-export",
+        backend="filesystem",
+    )
+
+    call_kwargs = mock_client_with_export.export.get_status.call_args.kwargs
+    assert call_kwargs["config"] is None
 
 
 def test_get_export_status_with_shard_status_json(
@@ -342,19 +352,31 @@ def test_cancel_export_success_json_output(
 def test_cancel_export_passes_correct_args(
     export_manager: ExportManager, mock_client_with_export: MagicMock
 ) -> None:
-    """cancel_export passes correct args to client."""
+    """cancel_export passes correct args to client, wrapping path in ExportConfig."""
     export_manager.cancel_export(
         export_id="my-export",
         backend="gcs",
-        bucket="my-bucket",
         path="/my/path",
     )
 
     mock_client_with_export.export.cancel.assert_called_once()
     call_kwargs = mock_client_with_export.export.cancel.call_args.kwargs
     assert call_kwargs["export_id"] == "my-export"
-    assert call_kwargs["bucket"] == "my-bucket"
-    assert call_kwargs["path"] == "/my/path"
+    assert call_kwargs["config"] is not None
+    assert call_kwargs["config"].path == "/my/path"
+
+
+def test_cancel_export_no_config_when_path_none(
+    export_manager: ExportManager, mock_client_with_export: MagicMock
+) -> None:
+    """cancel_export passes config=None when path is not set."""
+    export_manager.cancel_export(
+        export_id="my-export",
+        backend="filesystem",
+    )
+
+    call_kwargs = mock_client_with_export.export.cancel.call_args.kwargs
+    assert call_kwargs["config"] is None
 
 
 # ---------------------------------------------------------------------------

weaviate_cli/commands/cancel.py

@@ -101,11 +101,6 @@ def cancel_replication_cli(ctx: click.Context, op_id: str, json_output: bool) ->
     type=click.Choice(["filesystem", "s3", "gcs", "azure"]),
     help=f"The backend used for storing the export (default: {CancelExportCollectionDefaults.backend}).",
 )
-@click.option(
-    "--bucket",
-    default=CancelExportCollectionDefaults.bucket,
-    help="Bucket name for cloud storage backends.",
-)
 @click.option(
     "--path",
     default=CancelExportCollectionDefaults.path,
@@ -119,7 +114,6 @@ def cancel_export_collection_cli(
     ctx: click.Context,
     export_id: str,
     backend: str,
-    bucket: Optional[str],
     path: Optional[str],
     json_output: bool,
 ) -> None:
@@ -131,7 +125,6 @@ def cancel_export_collection_cli(
         export_manager.cancel_export(
             export_id=export_id,
             backend=backend,
-            bucket=bucket,
             path=path,
             json_output=json_output,
         )

weaviate_cli/commands/create.py

@@ -922,11 +922,6 @@ def create_replication_cli(
     is_flag=True,
     help="Wait for the export to complete before returning.",
 )
-@click.option(
-    "--bucket",
-    default=CreateExportCollectionDefaults.bucket,
-    help="Bucket name for cloud storage backends.",
-)
 @click.option(
     "--path",
     default=CreateExportCollectionDefaults.path,
@@ -944,7 +939,6 @@ def create_export_collection_cli(
     include: Optional[str],
     exclude: Optional[str],
     wait: bool,
-    bucket: Optional[str],
     path: Optional[str],
     json_output: bool,
 ) -> None:
@@ -960,7 +954,6 @@ def create_export_collection_cli(
             include=include,
             exclude=exclude,
             wait=wait,
-            bucket=bucket,
             path=path,
             json_output=json_output,
         )

weaviate_cli/commands/get.py

@@ -581,11 +581,6 @@ def get_replications_cli(ctx: click.Context, json_output: bool) -> None:
     type=click.Choice(["filesystem", "s3", "gcs", "azure"]),
     help=f"The backend used for storing the export (default: {GetExportCollectionDefaults.backend}).",
 )
-@click.option(
-    "--bucket",
-    default=GetExportCollectionDefaults.bucket,
-    help="Bucket name for cloud storage backends.",
-)
 @click.option(
     "--path",
     default=GetExportCollectionDefaults.path,
@@ -599,7 +594,6 @@ def get_export_collection_cli(
     ctx: click.Context,
     export_id: str,
     backend: str,
-    bucket: Optional[str],
     path: Optional[str],
     json_output: bool,
 ) -> None:
@@ -611,7 +605,6 @@ def get_export_collection_cli(
         export_manager.get_export_status(
             export_id=export_id,
             backend=backend,
-            bucket=bucket,
             path=path,
             json_output=json_output,
         )

weaviate_cli/defaults.py

@@ -321,21 +321,18 @@ class CreateExportCollectionDefaults:
     include: Optional[str] = None
     exclude: Optional[str] = None
     wait: bool = False
-    bucket: Optional[str] = None
     path: Optional[str] = None
 
 
 @dataclass
 class GetExportCollectionDefaults:
     export_id: str = "test-export"
     backend: str = "filesystem"
-    bucket: Optional[str] = None
     path: Optional[str] = None
 
 
 @dataclass
 class CancelExportCollectionDefaults:
     export_id: str = "test-export"
     backend: str = "filesystem"
-    bucket: Optional[str] = None
     path: Optional[str] = None

weaviate_cli/managers/export_manager.py

@@ -39,7 +39,6 @@ def create_export(
         include: Optional[str] = CreateExportCollectionDefaults.include,
         exclude: Optional[str] = CreateExportCollectionDefaults.exclude,
         wait: bool = CreateExportCollectionDefaults.wait,
-        bucket: Optional[str] = CreateExportCollectionDefaults.bucket,
         path: Optional[str] = CreateExportCollectionDefaults.path,
         json_output: bool = False,
     ) -> None:
@@ -51,9 +50,7 @@ def create_export(
         backend_enum = BACKEND_MAP[backend]
         file_format_enum = FILE_FORMAT_MAP[file_format]
 
-        config = None
-        if bucket or path:
-            config = ExportConfig(bucket=bucket, path=path)
+        config = ExportConfig(path=path) if path else None
 
         include_collections = (
             [c.strip() for c in include.split(",") if c.strip()] if include else None
@@ -95,17 +92,16 @@ def get_export_status(
         self,
         export_id: str = GetExportCollectionDefaults.export_id,
         backend: str = GetExportCollectionDefaults.backend,
-        bucket: Optional[str] = GetExportCollectionDefaults.bucket,
         path: Optional[str] = GetExportCollectionDefaults.path,
         json_output: bool = False,
     ) -> None:
         backend_enum = BACKEND_MAP[backend]
 
+        config = ExportConfig(path=path) if path else None
         result = self.client.export.get_status(
             export_id=export_id,
             backend=backend_enum,
-            bucket=bucket,
-            path=path,
+            config=config,
         )
 
         self._print_export_status(result, json_output=json_output)
@@ -114,17 +110,16 @@ def cancel_export(
         self,
         export_id: str = CancelExportCollectionDefaults.export_id,
         backend: str = CancelExportCollectionDefaults.backend,
-        bucket: Optional[str] = CancelExportCollectionDefaults.bucket,
         path: Optional[str] = CancelExportCollectionDefaults.path,
         json_output: bool = False,
     ) -> None:
         backend_enum = BACKEND_MAP[backend]
 
+        config = ExportConfig(path=path) if path else None
         success = self.client.export.cancel(
             export_id=export_id,
             backend=backend_enum,
-            bucket=bucket,
-            path=path,
+            config=config,
         )
 
         if success: