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

.claude/skills/operating-weaviate-cli/SKILL.md

@@ -226,14 +226,13 @@ See [references/backups.md](references/backups.md).
 weaviate-cli create export-collection --export_id my-export --backend s3 --file_format parquet --wait --json
 weaviate-cli create export-collection --export_id my-export --backend s3 --include "Movies,Books" --json
 weaviate-cli create export-collection --export_id my-export --backend s3 --exclude "TempData" --json
-weaviate-cli create export-collection --export_id my-export --backend s3 --bucket my-bucket --path /exports --json
 weaviate-cli get export-collection --export_id my-export --backend s3 --json
 weaviate-cli cancel export-collection --export_id my-export --backend s3 --json
 ```
 
 Backends: `filesystem`, `s3`, `gcs`, `azure`. File formats: `parquet`.
 
-Options: `--include`, `--exclude` (mutually exclusive), `--wait`, `--bucket`, `--path`
+Options: `--include`, `--exclude` (mutually exclusive), `--wait`
 
 **Prerequisite**: The export backend must be configured on the Weaviate cluster (e.g., `ENABLE_BACKUP=true` for S3 via MinIO in local-k8s).
 

.claude/skills/operating-weaviate-cli/references/exports.md

@@ -7,7 +7,6 @@ Export collections from Weaviate to external storage backends in Parquet format.
 weaviate-cli create export-collection --export_id my-export --backend s3 --file_format parquet --wait --json
 weaviate-cli create export-collection --export_id my-export --backend s3 --include "Movies,Books" --json
 weaviate-cli create export-collection --export_id my-export --backend gcs --exclude "TempData" --json
-weaviate-cli create export-collection --export_id my-export --backend s3 --bucket my-bucket --path /exports --wait --json
 ```
 
 ## Check Export Status
@@ -33,16 +32,12 @@ Only works while the export is in progress. Returns an error if the export has a
 - `--include` -- Comma-separated collections to include
 - `--exclude` -- Comma-separated collections to exclude
 - `--wait` -- Wait for completion
-- `--bucket` -- Bucket name for cloud storage backends
-- `--path` -- Path within the storage backend
 
 **Get Status:**
 - `--export_id`, `--backend` -- Same as create
-- `--bucket`, `--path` -- Optional, for locating the export
 
 **Cancel:**
 - `--export_id`, `--backend` -- Same as create
-- `--bucket`, `--path` -- Optional, for locating the export
 
 ## Prerequisites
 
@@ -56,4 +51,3 @@ Only works while the export is in progress. Returns an error if the export has a
 - Without `--wait`, the command returns immediately with status STARTED
 - Poll progress with `get export-collection` to monitor shard-level status
 - Export uses the same storage backends as backups (S3, GCS, Azure, filesystem)
-- The `--bucket` defaults to the cluster's configured backup bucket if not specified

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/integration/test_export_integration.py

@@ -1,4 +1,5 @@
 import json
+import click
 import pytest
 import weaviate
 from weaviate_cli.managers.collection_manager import CollectionManager
@@ -57,36 +58,31 @@ def test_create_export_and_get_status(
     export_manager: ExportManager, setup_collection, capsys
 ):
     """Test creating an export and getting its status."""
-    try:
-        # Create export with wait
-        export_manager.create_export(
-            export_id="integration-test-export",
-            backend="s3",
-            file_format="parquet",
-            include=EXPORT_COLLECTION,
-            wait=True,
-            json_output=False,
-        )
+    export_manager.create_export(
+        export_id="integration-test-export",
+        backend="s3",
+        file_format="parquet",
+        include=EXPORT_COLLECTION,
+        wait=True,
+        json_output=False,
+    )
 
-        out = capsys.readouterr().out
-        assert "integration-test-export" in out
-        assert "created successfully" in out
+    out = capsys.readouterr().out
+    assert "integration-test-export" in out
+    assert "created successfully" in out
 
-        # Get status
-        export_manager.get_export_status(
-            export_id="integration-test-export",
-            backend="s3",
-            json_output=True,
-        )
+    export_manager.get_export_status(
+        export_id="integration-test-export",
+        backend="s3",
+        json_output=True,
+    )
 
-        out = capsys.readouterr().out
-        data = json.loads(out)
-        assert data["export_id"] == "integration-test-export"
-        assert data["status"] == "SUCCESS"
-        assert EXPORT_COLLECTION in data["collections"]
-        assert "shard_status" in data
-    except Exception:
-        raise
+    out = capsys.readouterr().out
+    data = json.loads(out)
+    assert data["export_id"] == "integration-test-export"
+    assert data["status"] == "SUCCESS"
+    assert EXPORT_COLLECTION in data["collections"]
+    assert "shard_status" in data
 
 
 def test_create_export_json_output(
@@ -131,7 +127,7 @@ def test_create_export_include_and_exclude_raises(
     export_manager: ExportManager, setup_collection
 ):
     """Test that specifying both include and exclude raises an error."""
-    with pytest.raises(Exception) as exc_info:
+    with pytest.raises(click.ClickException) as exc_info:
         export_manager.create_export(
             export_id="should-fail",
             backend="s3",
@@ -154,16 +150,19 @@ def test_cancel_export(export_manager: ExportManager, setup_collection, capsys):
     )
     capsys.readouterr()  # Clear output
 
-    # Try to cancel — may succeed or fail depending on timing
+    # Try to cancel — may succeed or fail depending on timing. Only tolerate
+    # the specific "could not be canceled" path (export already finished);
+    # anything else is a real failure.
     try:
         export_manager.cancel_export(
             export_id="integration-cancel-export",
             backend="s3",
             json_output=True,
         )
-        out = capsys.readouterr().out
-        data = json.loads(out)
-        assert data["status"] == "success"
-    except Exception:
-        # Export may have already finished — that's OK
-        pass
+    except click.ClickException as e:
+        assert "could not be canceled" in str(e)
+        return
+
+    out = capsys.readouterr().out
+    data = json.loads(out)
+    assert data["status"] == "success"

test/unittests/test_managers/test_export_manager.py

@@ -1,7 +1,7 @@
 import json
+import click
 import pytest
 from unittest.mock import MagicMock
-from datetime import datetime
 
 from weaviate_cli.managers.export_manager import ExportManager
 
@@ -55,7 +55,7 @@ def test_create_export_include_and_exclude_raises(
     export_manager: ExportManager,
 ) -> None:
     """create_export raises when both include and exclude are specified."""
-    with pytest.raises(Exception) as exc_info:
+    with pytest.raises(click.ClickException) as exc_info:
         export_manager.create_export(
             export_id="test",
             backend="filesystem",
@@ -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
 
 
 # ---------------------------------------------------------------------------
@@ -390,7 +346,7 @@ def test_cancel_export_failure_raises(
     """cancel_export when client returns False raises an exception."""
     mock_client_with_export.export.cancel.return_value = False
 
-    with pytest.raises(Exception) as exc_info:
+    with pytest.raises(click.ClickException) as exc_info:
         export_manager.cancel_export(
             export_id="my-export",
             backend="filesystem",

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: