earthscope-cli 1.2.0__tar.gz → 1.3.0__tar.gz

{earthscope_cli-1.2.0/src/earthscope_cli.egg-info → earthscope_cli-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthscope-cli
-Version: 1.2.0
+Version: 1.3.0
 Summary: A CLI for the EarthScope API
 Author-email: EarthScope <data-help@earthscope.org>
 License-Expression: Apache-2.0
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer<0.24.0
 Requires-Dist: typer-di>=0.1.3
-Requires-Dist: earthscope-sdk>=1.4.0
+Requires-Dist: earthscope-sdk>=1.10.0
 Requires-Dist: rich>=13.8.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "earthscope-cli"
-version = "1.2.0"
+version = "1.3.0"
 description = "A CLI for the EarthScope API"
 readme = "README.md"
 authors = [{ name = "EarthScope", email = "data-help@earthscope.org" }]
@@ -20,7 +20,7 @@ classifiers = [
 dependencies = [
     "typer<0.24.0",
     "typer-di>=0.1.3",
-    "earthscope-sdk>=1.4.0",
+    "earthscope-sdk>=1.10.0",
     "rich>=13.8.0",
 ]
 requires-python = ">=3.10"
@@ -46,7 +46,7 @@ Changelog = "https://docs.earthscope.org/projects/CLI/page/changelog.html"
 es = "earthscope_cli.main:app"
 
 [tool.bumpver]
-current_version = "1.2.0"
+current_version = "1.3.0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "chore: bump version {old_version} -> {new_version}"
 commit = true

earthscope_cli-1.3.0/src/earthscope_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0"

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/src/earthscope_cli/dropoff/render.py

@@ -1,8 +1,11 @@
 import threading
 from typing import Dict, List, Optional
 
-from earthscope_sdk.client.dropoff._multipart_uploader import UploadStatus
-from earthscope_sdk.client.dropoff.models import DropoffObject, DropoffSummary
+from earthscope_sdk.client.dropoff.models import (
+    DropoffObject,
+    DropoffSummary,
+    UploadStatus,
+)
 from rich import print
 from rich.console import Group
 from rich.live import Live
@@ -40,6 +43,10 @@ def _colorize_status(status: str) -> Text:
         return Text("ACCEPTED", style="green")
     if s == "FAILED":
         return Text("FAILED", style="red")
+    if s == "COPYING":
+        return Text("COPYING", style="yellow")
+    if s == "LOADING":
+        return Text("LOADING", style="yellow")
     if s == "INTERNAL_ERROR":
         return Text("INTERNAL_ERROR", style="red")
     return Text(f"{status or '-'}", style="dim")
@@ -373,7 +380,11 @@ class ConcurrentUploadProgressDisplay:
 
         if self.live:
             # Update final status
-            if exc_type is None and self.overall_task is not None and self.num_valid > 0:
+            if (
+                exc_type is None
+                and self.overall_task is not None
+                and self.num_valid > 0
+            ):
                 self.overall_progress.update(
                     self.overall_task,
                     description=f"[bold green]✓ Completed {self.num_valid} uploads",
@@ -526,7 +537,10 @@ class ConcurrentUploadProgressDisplay:
                 self.overall_progress.advance(self.overall_task, 1)
 
                 # If all files are complete, stop the timer to freeze throughput
-                if self.validation_complete and len(self.completed_files) == self.num_valid:
+                if (
+                    self.validation_complete
+                    and len(self.completed_files) == self.num_valid
+                ):
                     self.overall_progress.stop_task(self.overall_task)
 
             # For large uploads, hide completed progress bars after a delay

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/src/earthscope_cli/dropoff/typer.py

@@ -4,22 +4,14 @@ from typing import Annotated, Iterable
 
 import typer
 from earthscope_sdk import EarthScopeClient
-from earthscope_sdk.client.dropoff.models import DropoffCategory
-from earthscope_sdk.client.dropoff.validation import Validator
+from earthscope_sdk.client.dropoff.enums import DropoffCategory
 from rich import print
 from typer_di import Depends, TyperDI
 
 from earthscope_cli.common import get_sdk_refreshed
-from earthscope_cli.dropoff.render import (
-    ConcurrentUploadProgressDisplay,
-    UploadSummary,
-    print_dropoff_objects_table,
-    print_dropoff_summary,
-)
 from earthscope_cli.dropoff.util import (
     DropoffOptions,
     FilterOptions,
-    collect_files,
     get_category,
     get_dropoff_options,
     get_filter_options,
@@ -52,6 +44,9 @@ def get_object_history(
     es dropoff get-object-history -c miniseed -k demo/SAML.IU.2025.303
     es dropoff get-object-history -c miniseed -k demo/SAML.IU.2025.303 --offset 100 --limit 100
     """
+    # lazy import
+    from earthscope_cli.dropoff.render import print_dropoff_objects_table
+
     result = sdk.dropoff.get_object_history(
         category=options.category.value,
         key=key,
@@ -90,6 +85,9 @@ def get_summary(
     es dropoff get-summary -c miniseed --prefix demo/ --submitted-after 2025-01-01T00:00:00Z
     es dropoff get-summary -c miniseed --prefix demo/ --submitted-before 2025-12-31T23:59:59Z
     """
+    # lazy import
+    from earthscope_cli.dropoff.render import print_dropoff_summary
+
     result = sdk.dropoff.get_summary(
         category=options.category.value,
         prefix=prefix,
@@ -120,6 +118,9 @@ def list_objects(
     es dropoff list-objects -c miniseed --submitted-after 2025-01-01T00:00:00Z
     es dropoff list-objects -c miniseed --submitted-before 2025-12-31T23:59:59Z
     """
+    # lazy import
+    from earthscope_cli.dropoff.render import print_dropoff_objects_table
+
     result = sdk.dropoff.list_objects(
         category=options.category.value,
         prefix=prefix,
@@ -249,6 +250,18 @@ def upload(
         Multiple files:
             es dropoff upload -c miniseed -d dest/prefix/ -s file1.mseed -s file2.mseed
     """
+    # lazy import
+    from earthscope_sdk.client.dropoff.files import (
+        UploadCandidate,
+        collect_files,
+        validate_files,
+    )
+
+    from earthscope_cli.dropoff.render import (
+        ConcurrentUploadProgressDisplay,
+        UploadSummary,
+    )
+
     is_prefix = destination.endswith("/")
 
     if not is_prefix and (len(source) > 1 or any(s.is_dir() for s in source)):
@@ -272,20 +285,20 @@ def upload(
     # via asyncio.to_thread, so validation runs off the event loop and uploads
     # can proceed concurrently with validation of remaining files.
     validation_errors: list[str] = []
-
-    def _validated_files() -> Iterable[tuple[Path, str]]:
-        for p, k in collected:
-            try:
-                Validator(p, category=category).validate_all()
-                display.validation_passed()
-                yield (p, k)
-            except Exception as e:
-                validation_errors.append(str(e))
-                display.validation_failed()
-        display.finalize_validation()
-
     display = ConcurrentUploadProgressDisplay(num_collected=total_collected)
 
+    def _validated_files() -> Iterable[UploadCandidate]:
+        try:
+            for item in validate_files(collected, category):
+                if item.ok:
+                    display.validation_passed()
+                    yield item
+                else:
+                    validation_errors.append(str(item.error))
+                    display.validation_failed()
+        finally:
+            display.finalize_validation()
+
     try:
         with display:
             sdk.dropoff.put_objects(

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/src/earthscope_cli/dropoff/util.py

@@ -1,13 +1,11 @@
 import enum
 from dataclasses import dataclass
 from datetime import datetime
-from pathlib import Path
-from typing import Annotated, Iterable, Optional
+from typing import Annotated, Optional
 
 import click
 import typer
-from earthscope_sdk.client.dropoff.models import DropoffCategory
-from rich import print
+from earthscope_sdk.client.dropoff.enums import DropoffCategory
 from typer_di import Depends
 
 from earthscope_cli.common import get_sdk
@@ -31,72 +29,6 @@ class DropoffOptions(PaginationOptions):
     category: DropoffCategory
 
 
-def build_key(file_path: Path, source: Path, destination: str) -> str:
-    """
-    Build the S3 object key based on source/destination semantics.
-
-    - destination ends with '/': it's a prefix, append relative filename
-    - destination does not end with '/': it's the exact key name
-    """
-    if destination.endswith("/"):
-        if source.is_dir():
-            rel = file_path.relative_to(source)
-            return destination + rel.as_posix()
-        else:
-            return destination + file_path.name
-    else:
-        return destination
-
-
-def collect_files(
-    sources: list[Path],
-    destination: str,
-    recursive: bool = False,
-) -> Iterable[tuple[Path, str]]:
-    """
-    Collect all files and their keys from a list of source paths.
-
-    Args:
-        sources: List of local file or directory paths to collect files from.
-        destination: Remote object key or prefix. Trailing '/' indicates a prefix.
-        recursive: If True, recursively traverse source directories.
-
-    Returns:
-        Iterable of tuples containing (file, key) pairs. When two distinct files
-        would be uploaded to the same destination key, the later one is skipped
-        with a warning.
-    """
-
-    def _gen():
-        for src in sources:
-            if src.is_file():
-                yield (src, src, build_key(src, src, destination))
-
-            elif src.is_dir():
-                it = src.rglob("*") if recursive else src.iterdir()
-                yield from (
-                    (src, f, build_key(f, src, destination))
-                    for f in it
-                    if f.is_file()
-                )
-
-    seen: dict[str, tuple[Path, Path]] = {}
-    for src, file_path, key in _gen():
-        existing = seen.get(key)
-        if existing is None:
-            seen[key] = (src, file_path)
-            yield (file_path, key)
-        elif existing[1] == file_path:
-            continue
-        else:
-            existing_src, existing_file = existing
-            print(
-                f"[yellow]Skipping '{file_path}' from source '{src}': destination "
-                f"'{key}' already produced by source '{existing_src}' "
-                f"(from '{existing_file}')."
-            )
-
-
 def get_category(
     sdk=Depends(get_sdk),
     category: Annotated[

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0/src/earthscope_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthscope-cli
-Version: 1.2.0
+Version: 1.3.0
 Summary: A CLI for the EarthScope API
 Author-email: EarthScope <data-help@earthscope.org>
 License-Expression: Apache-2.0
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer<0.24.0
 Requires-Dist: typer-di>=0.1.3
-Requires-Dist: earthscope-sdk>=1.4.0
+Requires-Dist: earthscope-sdk>=1.10.0
 Requires-Dist: rich>=13.8.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/src/earthscope_cli.egg-info/SOURCES.txt

@@ -21,4 +21,5 @@ src/earthscope_cli/dropoff/util.py
 tests/test_cli.py
 tests/test_dropoff.py
 tests/test_login.py
+tests/test_startup_imports.py
 tests/test_user.py

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/src/earthscope_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 typer<0.24.0
 typer-di>=0.1.3
-earthscope-sdk>=1.4.0
+earthscope-sdk>=1.10.0
 rich>=13.8.0
 
 [dev]

{earthscope_cli-1.2.0 → earthscope_cli-1.3.0}/tests/test_dropoff.py

@@ -7,7 +7,6 @@ verifying that arguments are correctly passed to the SDK.
 The bulk of the upload logic is tested in the SDK tests, so these tests
 focus on:
 - CLI argument parsing and validation
-- File collection and key generation
 - Progress display and rendering
 - Error handling and user feedback
 """
@@ -24,11 +23,7 @@ from earthscope_sdk.client.dropoff.models import (
 )
 
 from earthscope_cli.dropoff.typer import app
-from earthscope_cli.dropoff.util import (
-    build_key,
-    collect_files,
-    safe_str,
-)
+from earthscope_cli.dropoff.util import safe_str
 from tests.conftest import runner
 
 
@@ -87,7 +82,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -112,9 +107,10 @@ class TestUploadCommand:
 
         # Verify files were collected correctly
         assert len(captured_objects) == 1
-        file_path, key = captured_objects[0]
-        assert file_path == test_file
-        assert key == "dest/prefix/test.mseed"
+        item = captured_objects[0]
+        assert item.path == test_file
+        assert item.key == "dest/prefix/test.mseed"
+        assert item.ok
 
     def test_upload_single_file_exact_key(self, tmp_path, monkeypatch):
         """Test uploading a single file with exact key destination (no trailing /)."""
@@ -128,7 +124,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -142,8 +138,8 @@ class TestUploadCommand:
         _, kwargs = mock_sdk.dropoff.put_objects.call_args
         files = list(kwargs["objects"])
         assert len(files) == 1
-        _, key = files[0]
-        assert key == "exact/keyname"
+        assert files[0].key == "exact/keyname"
+        assert files[0].ok
 
     def test_upload_directory_recursively(self, tmp_path, monkeypatch):
         """Test uploading a directory recursively with -r flag."""
@@ -169,7 +165,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -189,7 +185,7 @@ class TestUploadCommand:
         assert len(captured_objects) == 3
 
         # Verify keys include directory structure
-        keys = {k for _, k in captured_objects}
+        keys = {item.key for item in captured_objects}
         assert keys == {
             "dest/file1.mseed",
             "dest/file2.mseed",
@@ -211,7 +207,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -227,7 +223,7 @@ class TestUploadCommand:
         files = list(kwargs["objects"])
         # Only top-level file, not the one in subdir
         assert len(files) == 1
-        keys = {k for _, k in files}
+        keys = {item.key for item in files}
         assert keys == {"dest/file1.mseed"}
 
     def test_upload_multiple_sources_to_prefix(self, tmp_path, monkeypatch):
@@ -254,7 +250,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -281,7 +277,7 @@ class TestUploadCommand:
         assert len(captured_objects) == 2
 
         # Verify keys include directory structure
-        keys = {k for _, k in captured_objects}
+        keys = {item.key for item in captured_objects}
         assert keys == {
             "dest/test1.mseed",
             "dest/test2.mseed",
@@ -351,7 +347,7 @@ class TestUploadCommand:
         mock_validator = MagicMock()
         mock_validator.validate_all = Mock()
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -406,7 +402,7 @@ class TestUploadCommand:
             side_effect=ValueError("Invalid file format")
         )
         monkeypatch.setattr(
-            "earthscope_cli.dropoff.typer.Validator",
+            "earthscope_sdk.client.dropoff.files.Validator",
             Mock(return_value=mock_validator),
         )
 
@@ -980,248 +976,6 @@ class TestGetObjectHistoryCommand:
         assert "legacy error" in normalized
 
 
-class TestCollectFiles:
-    """Test the collect_files utility function."""
-
-    @pytest.mark.parametrize(
-        "description,paths_to_create,sources_to_collect,destination,recursive,expected_file_count,expected_keys",
-        [
-            # Single file + prefix destination
-            (
-                "single file to prefix destination",
-                ["demo/test.mseed"],
-                ["demo/test.mseed"],
-                "dest/",
-                False,
-                1,
-                ["dest/test.mseed"],
-            ),
-            # Single file + exact key destination
-            (
-                "single file to exact key destination",
-                ["demo/test.mseed"],
-                ["demo/test.mseed"],
-                "exact/keyname",
-                False,
-                1,
-                ["exact/keyname"],
-            ),
-            # Multiple files + prefix destination
-            (
-                "multiple files to prefix destination",
-                ["project1/a.mseed", "project2/b.mseed"],
-                ["project1/a.mseed", "project2/b.mseed"],
-                "dest/",
-                False,
-                2,
-                ["dest/a.mseed", "dest/b.mseed"],
-            ),
-            # Directory + prefix + recursive
-            (
-                "directory recursive to prefix destination",
-                [
-                    "demo/file1.mseed",
-                    "demo/sub1/file2.mseed",
-                    "demo/sub1/sub2/file3.mseed",
-                ],
-                ["demo"],
-                "dest/",
-                True,
-                3,
-                [
-                    "dest/file1.mseed",
-                    "dest/sub1/file2.mseed",
-                    "dest/sub1/sub2/file3.mseed",
-                ],
-            ),
-            # Directory + prefix + non-recursive
-            (
-                "directory non-recursive to prefix destination",
-                [
-                    "demo/file1.mseed",
-                    "demo/sub1/file2.mseed",
-                ],
-                ["demo"],
-                "dest/",
-                False,
-                1,
-                ["dest/file1.mseed"],
-            ),
-            # Flat directory + prefix
-            (
-                "flat directory to prefix destination",
-                ["demo/file1.mseed", "demo/file2.mseed"],
-                ["demo"],
-                "output/",
-                False,
-                2,
-                ["output/file1.mseed", "output/file2.mseed"],
-            ),
-        ],
-    )
-    def test_collect_files_scenarios(
-        self,
-        tmp_path,
-        description,
-        paths_to_create,
-        sources_to_collect,
-        destination,
-        recursive,
-        expected_file_count,
-        expected_keys,
-    ):
-        """Test file collection for various source/destination scenarios."""
-        # Create all files
-        for path in paths_to_create:
-            full_path = tmp_path / path
-            full_path.parent.mkdir(parents=True, exist_ok=True)
-            full_path.write_bytes(b"test data")
-
-        # Build the source paths (resolve to full paths)
-        sources = [tmp_path / p for p in sources_to_collect]
-
-        # Collect files
-        collected = list(collect_files(sources, destination, recursive))
-
-        # Verify count
-        assert len(collected) == expected_file_count, (
-            f"\n{description}\n"
-            f"Expected {expected_file_count} files, got {len(collected)}"
-        )
-
-        # Verify keys match expected patterns
-        collected_keys = {key for _, key in collected}
-        expected_keys_set = set(expected_keys)
-        assert collected_keys == expected_keys_set, (
-            f"\n{description}\n"
-            f"Expected keys: {expected_keys_set}\n"
-            f"Got keys: {collected_keys}"
-        )
-
-    def test_collect_deduplicates_files(self, tmp_path):
-        """Test that duplicate files are not collected twice."""
-        test_file = tmp_path / "demo" / "test.mseed"
-        test_file.parent.mkdir()
-        test_file.write_bytes(b"test data")
-
-        files = list(collect_files([test_file, test_file], "dest/"))
-
-        assert len(files) == 1
-        assert files[0][0] == test_file
-
-    def test_collect_empty_directory(self, tmp_path):
-        """Test collecting from an empty directory returns no files."""
-        empty_dir = tmp_path / "empty"
-        empty_dir.mkdir()
-
-        files = list(collect_files([empty_dir], "dest/"))
-        assert len(files) == 0
-
-    def test_collect_mixed_files_and_directory(self, tmp_path):
-        """Test uploading individual files and a directory to a prefix."""
-        project1 = tmp_path / "project1"
-        project1.mkdir()
-        (project1 / "one.mseed").write_bytes(b"project1 data")
-
-        project2 = tmp_path / "project2"
-        project2.mkdir()
-        (project2 / "two.mseed").write_bytes(b"project2 data")
-        (project2 / "extra.mseed").write_bytes(b"extra data")
-
-        sources = [
-            project1 / "one.mseed",
-            project2,
-        ]
-
-        collected = list(collect_files(sources, "upload/", recursive=False))
-
-        assert len(collected) == 3
-
-        keys = {key for _, key in collected}
-        assert keys == {
-            "upload/one.mseed",
-            "upload/two.mseed",
-            "upload/extra.mseed",
-        }
-
-    def test_collect_skips_duplicate_destination_between_files(self, tmp_path, capsys):
-        """Two distinct files producing the same key: keep the first, skip the rest."""
-        p1 = tmp_path / "project1" / "data.mseed"
-        p1.parent.mkdir()
-        p1.write_bytes(b"a")
-
-        p2 = tmp_path / "project2" / "data.mseed"
-        p2.parent.mkdir()
-        p2.write_bytes(b"b")
-
-        collected = list(collect_files([p1, p2], "dest/"))
-
-        assert collected == [(p1, "dest/data.mseed")]
-        out = capsys.readouterr().out
-        assert "Skipping" in out
-        assert "dest/data.mseed" in out
-
-    def test_collect_skips_duplicate_destination_between_file_and_dir(
-        self, tmp_path, capsys
-    ):
-        """File + directory collision: skip the colliding directory entry but
-        still include sibling directory entries."""
-        lone = tmp_path / "lone" / "results.mseed"
-        lone.parent.mkdir()
-        lone.write_bytes(b"a")
-
-        other = tmp_path / "other"
-        other.mkdir()
-        (other / "results.mseed").write_bytes(b"b")
-        (other / "extra.mseed").write_bytes(b"c")
-
-        collected = list(collect_files([lone, other], "upload/"))
-
-        kept = {k: p for p, k in collected}
-        assert set(kept) == {"upload/results.mseed", "upload/extra.mseed"}
-        assert kept["upload/results.mseed"] == lone
-
-        out = capsys.readouterr().out
-        assert "Skipping" in out
-        assert "upload/results.mseed" in out
-
-
-class TestBuildKey:
-    """Test the build_key utility function."""
-
-    def test_file_with_exact_destination(self, tmp_path):
-        """Test: file source + exact key destination."""
-        f = tmp_path / "data.mseed"
-
-        key = build_key(f, f, "destination/keyname")
-        assert key == "destination/keyname"
-
-    def test_file_with_prefix_destination(self, tmp_path):
-        """Test: file source + prefix destination (trailing /)."""
-        f = tmp_path / "data.mseed"
-
-        key = build_key(f, f, "destination/prefix/")
-        assert key == "destination/prefix/data.mseed"
-
-    def test_dir_file_with_prefix_destination(self, tmp_path):
-        """Test: file from directory source + prefix destination."""
-        d = tmp_path / "mydir"
-        f = d / "data.mseed"
-
-        key = build_key(f, d, "destination/prefix/")
-        assert key == "destination/prefix/data.mseed"
-
-    def test_nested_dir_file_with_prefix_destination(self, tmp_path):
-        """Test: deeply nested file from directory source + prefix destination."""
-        d = tmp_path / "mydir"
-        nested = d / "sub1" / "sub2"
-        nested.mkdir(parents=True)
-        f = nested / "data.mseed"
-
-        key = build_key(f, d, "destination/prefix/")
-        assert key == "destination/prefix/sub1/sub2/data.mseed"
-
-
 class TestSafeStr:
     """Test the safe_str utility function."""
 

earthscope_cli-1.3.0/tests/test_startup_imports.py

@@ -0,0 +1,88 @@
+"""
+Guards on what `es` loads before it does anything.
+
+Startup cost is dominated by the import graph, and it regresses quietly: a
+convenience re-export imported from the wrong module drags a whole dependency
+tree in behind it.
+
+This runs in a fresh interpreter -- under pytest most of this is already
+imported, so an in-process check would pass regardless.
+
+The SDK guards its own eager import path in its suite; this covers what the
+CLI adds on top.
+"""
+
+import subprocess
+import sys
+
+import pytest
+
+# Pulled in only by paths that actually talk to S3, parse data, run the event
+# loop, or draw an upload display -- never merely by importing the CLI.
+#
+# rich's progress machinery is the subtle one: `--help` loads rich.console and
+# rich.table when it renders, so the win here is on every *other* invocation.
+DEFERRED = frozenset(
+    {
+        "aioboto3",
+        "aiobotocore",
+        "aiohttp",
+        "asyncio",
+        "boto3",
+        "botocore",
+        "httpx",
+        "lxml",
+        "pydantic",
+        "pymseed",
+        "rich.live",
+        "rich.progress",
+        "rich.table",
+        "ssl",
+    }
+)
+
+
+def _modules_after(statement: str) -> set:
+    """
+    Module names present in a fresh, isolated interpreter after `statement`.
+
+    `-I` ignores PYTHONPATH and user site-packages, keeping whatever the
+    surrounding environment injects out of the measurement. Running the suite
+    under VS Code's debugger is the case that matters: it attaches to
+    subprocesses by default, and the debugger imports `ssl`.
+    """
+    result = subprocess.run(
+        [
+            sys.executable,
+            "-I",
+            "-c",
+            f"{statement}\nimport sys\nprint('\\n'.join(sys.modules))",
+        ],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return set(result.stdout.split())
+
+
+def _leaked_by(statement: str) -> list:
+    """Which deferred modules `statement` pulls into a bare interpreter"""
+    preloaded = sorted(DEFERRED & _modules_after(""))
+    if preloaded:
+        pytest.skip(
+            f"this environment preloads {preloaded} into a bare interpreter, so "
+            "the guard cannot attribute imports to the CLI. Run the suite "
+            "without a debugger attached."
+        )
+
+    return sorted(DEFERRED & _modules_after(statement))
+
+
+def test_cli_startup_stays_cheap():
+    leaked = _leaked_by("import earthscope_cli.main")
+
+    assert not leaked, (
+        f"importing the CLI now pulls in {leaked}, which it did not before. "
+        "Something on the startup path imports one of these at module scope -- "
+        "often a symbol imported from a heavy module that also re-exports it."
+    )

earthscope_cli-1.2.0/src/earthscope_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.2.0"