Adapt to path removal from python-client.

The Path is now being passed via environment variables,
therefore the python client got adapted for it.
This commit removes all references to path in the cli
code.

Author: jfrancoa

requirements-dev.txt

@@ -1,4 +1,4 @@
-weaviate-client @ git+https://github.com/weaviate/weaviate-python-client.git@export_collection
+weaviate-client @ git+https://github.com/weaviate/weaviate-python-client.git@dev/1.37
 click==8.1.7
 twine
 pytest

setup.cfg

@@ -37,7 +37,7 @@ classifiers =
 include_package_data = True
 python_requires = >=3.9
 install_requires =
-    weaviate-client @ git+https://github.com/weaviate/weaviate-python-client.git@export_collection
+    weaviate-client @ git+https://github.com/weaviate/weaviate-python-client.git@dev/1.37
     click==8.1.7
     semver>=3.0.2
     numpy>=1.24.0

test/unittests/test_managers/test_export_manager.py

@@ -157,35 +157,19 @@ def test_create_export_passes_none_collections_when_not_specified(
     assert call_kwargs["exclude_collections"] is None
 
 
-def test_create_export_passes_config_with_path(
+def test_create_export_no_extra_kwargs(
     export_manager: ExportManager, mock_client_with_export: MagicMock
 ) -> None:
-    """create_export passes ExportConfig when path is set."""
-    export_manager.create_export(
-        export_id="my-export",
-        backend="s3",
-        file_format="parquet",
-        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.path == "/my/path"
-
-
-def test_create_export_no_config_when_path_none(
-    export_manager: ExportManager, mock_client_with_export: MagicMock
-) -> None:
-    """create_export passes config=None when path is not set."""
+    """create_export does not pass config or path to the client."""
     export_manager.create_export(
         export_id="my-export",
         backend="filesystem",
         file_format="parquet",
     )
 
     call_kwargs = mock_client_with_export.export.create.call_args.kwargs
-    assert call_kwargs["config"] is None
+    assert "config" not in call_kwargs
+    assert "path" not in call_kwargs
 
 
 def test_create_export_with_wait(
@@ -240,31 +224,17 @@ 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, wrapping path in ExportConfig."""
+    """get_export_status passes only export_id and backend to client."""
     export_manager.get_export_status(
         export_id="my-export",
         backend="s3",
-        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["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
+    assert "config" not in call_kwargs
+    assert "path" not in call_kwargs
 
 
 def test_get_export_status_with_shard_status_json(
@@ -352,31 +322,17 @@ 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, wrapping path in ExportConfig."""
+    """cancel_export passes only export_id and backend to client."""
     export_manager.cancel_export(
         export_id="my-export",
         backend="gcs",
-        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["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
+    assert "config" not in call_kwargs
+    assert "path" not in call_kwargs
 
 
 # ---------------------------------------------------------------------------

weaviate_cli/commands/cancel.py

@@ -1,7 +1,6 @@
 import json
 import click
 import sys
-from typing import Optional
 from weaviate_cli.utils import get_client_from_context
 from weaviate_cli.managers.backup_manager import BackupManager
 from weaviate_cli.managers.cluster_manager import ClusterManager
@@ -101,11 +100,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(
-    "--path",
-    default=CancelExportCollectionDefaults.path,
-    help="Path within the storage backend.",
-)
 @click.option(
     "--json", "json_output", is_flag=True, default=False, help="Output in JSON format."
 )
@@ -114,7 +108,6 @@ def cancel_export_collection_cli(
     ctx: click.Context,
     export_id: str,
     backend: str,
-    path: Optional[str],
     json_output: bool,
 ) -> None:
     """Cancel a collection export in Weaviate."""
@@ -125,7 +118,6 @@ def cancel_export_collection_cli(
         export_manager.cancel_export(
             export_id=export_id,
             backend=backend,
-            path=path,
             json_output=json_output,
         )
     except Exception as e:

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(
-    "--path",
-    default=CreateExportCollectionDefaults.path,
-    help="Path within the storage backend.",
-)
 @click.option(
     "--json", "json_output", is_flag=True, default=False, help="Output in JSON format."
 )
@@ -939,7 +934,6 @@ def create_export_collection_cli(
     include: Optional[str],
     exclude: Optional[str],
     wait: bool,
-    path: Optional[str],
     json_output: bool,
 ) -> None:
     """Create a collection export in Weaviate."""
@@ -954,7 +948,6 @@ def create_export_collection_cli(
             include=include,
             exclude=exclude,
             wait=wait,
-            path=path,
             json_output=json_output,
         )
     except Exception as e:

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(
-    "--path",
-    default=GetExportCollectionDefaults.path,
-    help="Path within the storage backend.",
-)
 @click.option(
     "--json", "json_output", is_flag=True, default=False, help="Output in JSON format."
 )
@@ -594,7 +589,6 @@ def get_export_collection_cli(
     ctx: click.Context,
     export_id: str,
     backend: str,
-    path: Optional[str],
     json_output: bool,
 ) -> None:
     """Get the status of a collection export in Weaviate."""
@@ -605,7 +599,6 @@ def get_export_collection_cli(
         export_manager.get_export_status(
             export_id=export_id,
             backend=backend,
-            path=path,
             json_output=json_output,
         )
     except Exception as e:

weaviate_cli/defaults.py

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

weaviate_cli/managers/export_manager.py

@@ -3,7 +3,6 @@
 from typing import Optional
 from weaviate.client import WeaviateClient
 from weaviate.export.export import (
-    ExportConfig,
     ExportFileFormat,
     ExportStorage,
     ExportStatusReturn,
@@ -39,7 +38,6 @@ def create_export(
         include: Optional[str] = CreateExportCollectionDefaults.include,
         exclude: Optional[str] = CreateExportCollectionDefaults.exclude,
         wait: bool = CreateExportCollectionDefaults.wait,
-        path: Optional[str] = CreateExportCollectionDefaults.path,
         json_output: bool = False,
     ) -> None:
         if include and exclude:
@@ -50,8 +48,6 @@ def create_export(
         backend_enum = BACKEND_MAP[backend]
         file_format_enum = FILE_FORMAT_MAP[file_format]
 
-        config = ExportConfig(path=path) if path else None
-
         include_collections = (
             [c.strip() for c in include.split(",") if c.strip()] if include else None
         )
@@ -66,7 +62,6 @@ def create_export(
             include_collections=include_collections,
             exclude_collections=exclude_collections,
             wait_for_completion=wait,
-            config=config,
         )
 
         if json_output:
@@ -92,16 +87,13 @@ def get_export_status(
         self,
         export_id: str = GetExportCollectionDefaults.export_id,
         backend: str = GetExportCollectionDefaults.backend,
-        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,
-            config=config,
         )
 
         self._print_export_status(result, json_output=json_output)
@@ -110,16 +102,13 @@ def cancel_export(
         self,
         export_id: str = CancelExportCollectionDefaults.export_id,
         backend: str = CancelExportCollectionDefaults.backend,
-        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,
-            config=config,
         )
 
         if success: