earthscope-cli 1.1.1__tar.gz → 1.1.2__tar.gz

{earthscope_cli-1.1.1/src/earthscope_cli.egg-info → earthscope_cli-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthscope-cli
-Version: 1.1.1
+Version: 1.1.2
 Summary: A CLI for the EarthScope API
 Author-email: EarthScope <data-help@earthscope.org>
 License-Expression: Apache-2.0
@@ -11,9 +11,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typer-slim<0.24.0,>=0.17.3
+Requires-Dist: typer<0.24.0
 Requires-Dist: typer-di>=0.1.3
-Requires-Dist: earthscope-sdk>=1.3.0
+Requires-Dist: earthscope-sdk>=1.3.1
 Requires-Dist: rich>=13.8.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "earthscope-cli"
-version = "1.1.1"
+version = "1.1.2"
 description = "A CLI for the EarthScope API"
 readme = "README.md"
 authors = [{ name = "EarthScope", email = "data-help@earthscope.org" }]
@@ -18,9 +18,9 @@ classifiers = [
 
 #Suggestion not to pin dependencies since the package should work in many different python environments
 dependencies = [
-    "typer-slim>=0.17.3,<0.24.0",
+    "typer<0.24.0",
     "typer-di>=0.1.3",
-    "earthscope-sdk>=1.3.0",
+    "earthscope-sdk>=1.3.1",
     "rich>=13.8.0",
 ]
 requires-python = ">=3.9"
@@ -43,7 +43,7 @@ Homepage = "https://gitlab.com/earthscope/public/earthscope-cli"
 es = "earthscope_cli.main:app"
 
 [tool.bumpver]
-current_version = "1.1.1"
+current_version = "1.1.2"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "chore: bump version {old_version} -> {new_version}"
 commit = true

earthscope_cli-1.1.2/src/earthscope_cli/__init__.py

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

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/common.py

@@ -1,12 +1,9 @@
-from contextlib import suppress
 from typing import Annotated, Optional
 
 import typer
+from rich import print
 from typer_di import Depends
 
-with suppress(ModuleNotFoundError):
-    from rich import print
-
 GLOBAL_HELP_PANEL = "Global Options"
 
 

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/debug.py

@@ -1,13 +1,9 @@
-from contextlib import suppress
-
 import typer
+from rich import print
 from typer_di import Depends, TyperDI
 
 from earthscope_cli.common import get_sdk
 
-with suppress(ModuleNotFoundError):
-    from rich import print
-
 app = TyperDI()
 
 

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/dropoff/render.py

@@ -2,7 +2,7 @@ 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
+from earthscope_sdk.client.dropoff.models import DropoffObject, DropoffSummary
 from rich import print
 from rich.console import Group
 from rich.live import Live
@@ -84,6 +84,31 @@ def print_dropoff_objects_table(
     print()
 
 
+def print_dropoff_summary(summary: DropoffSummary, *, prefix: Optional[str] = None):
+    if not summary.status_counts:
+        print(f"[yellow]No objects found in prefix '{prefix}'")
+        return
+
+    title = "Dropoff Summary"
+    if prefix:
+        title += f" for {prefix}"
+
+    table = Table(
+        title=title,
+        show_header=True,
+        title_style="bold magenta",
+        header_style="bold magenta",
+    )
+    table.add_column("Status")
+    table.add_column("Count")
+    for status in summary.status_counts:
+        table.add_row(status.status, str(status.count))
+
+    print()
+    print(table)
+    print()
+
+
 class AggregateBytesColumn(ProgressColumn):
     """
     Custom column that shows aggregate bytes across all uploads.
@@ -181,6 +206,23 @@ class CompositeProgressBarColumn(ProgressColumn):
         return result
 
 
+class UploadSummary:
+    def __init__(self, total: int, succeeded: int):
+        self.total = total
+        self.succeeded = succeeded
+        self.failed = total - succeeded
+
+    def print(self):
+        color = (
+            "green"
+            if self.failed == 0
+            else ("red" if self.succeeded == 0 else "yellow")
+        )
+        print(
+            f"[{color}]Summary: {self.succeeded}/{self.total} files succeeded, {self.failed} failed"
+        )
+
+
 class ConcurrentUploadProgressDisplay:
     """
     Rich progress display for concurrent file uploads.

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/dropoff/typer.py

@@ -12,13 +12,17 @@ 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,
 )
 
 app = TyperDI()
@@ -67,10 +71,38 @@ def get_object_history(
     print(f"[yellow]No history found for category '{cat_str}' with key '{key}'")
 
 
+@app.command(name="get-summary")
+def get_summary(
+    sdk: Annotated[EarthScopeClient, Depends(get_sdk_refreshed)],
+    options: Annotated[DropoffOptions, Depends(get_dropoff_options)],
+    filters: Annotated[FilterOptions, Depends(get_filter_options)],
+    prefix: Annotated[
+        str,
+        typer.Option(help="The prefix of the objects to get the summary for"),
+    ],
+):
+    """
+    Get a summary of a dropoff prefix.
+
+    es dropoff get-summary -c <type> --prefix <prefix>
+    es dropoff get-summary -c miniseed --prefix demo/
+    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
+    """
+    result = sdk.dropoff.get_summary(
+        category=options.category.value,
+        prefix=prefix,
+        submitted_after=filters.submitted_after,
+        submitted_before=filters.submitted_before,
+    )
+    print_dropoff_summary(result, prefix=prefix)
+
+
 @app.command(name="list-objects")
 def list_objects(
     sdk: Annotated[EarthScopeClient, Depends(get_sdk_refreshed)],
     options: Annotated[DropoffOptions, Depends(get_dropoff_options)],
+    filters: Annotated[FilterOptions, Depends(get_filter_options)],
     prefix: Annotated[
         str,
         typer.Option(help="Filter by object prefix"),
@@ -83,12 +115,18 @@ def list_objects(
     es dropoff list-objects -c miniseed
     es dropoff list-objects -c miniseed --prefix demo/
     es dropoff list-objects -c miniseed --offset 100 --limit 100
+    es dropoff list-objects -c miniseed --status FAILED
+    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
     """
     result = sdk.dropoff.list_objects(
         category=options.category.value,
         prefix=prefix,
         offset=options.offset,
         limit=options.limit,
+        submitted_after=filters.submitted_after,
+        submitted_before=filters.submitted_before,
+        status=filters.status,
     )
 
     suffix = ""
@@ -104,7 +142,9 @@ def list_objects(
             next_offset=result.offset + result.limit,
         )
 
-    print(f"[yellow]No objects found for category '{cat_str}'{suffix}")
+    print(
+        f"[yellow]No objects matched specified criteria: category='{cat_str}', prefix='{prefix}', offset={options.offset}, limit={options.limit}', submitted_after={filters.submitted_after}, submitted_before={filters.submitted_before}, status={filters.status}'"
+    )
 
 
 @app.command(name="upload")
@@ -176,22 +216,27 @@ def upload(
     don't overwrite each other and maintains meaningful organization in S3.
     """
     # Parse the input path to get a list of files
+    total_collected = 0
+    succeeded = 0
     files: list[tuple[Path, str]] = []
     for p, k in collect_files(paths):
+        total_collected += 1
         try:
             Validator(p, category=category).validate_all()
         except Exception as e:
             print(f"[red]{e}")
-            raise typer.Exit(code=1)
         else:
             files.append((p, k))
 
     if not files:
-        print(f"[red]No files found in paths: {paths}")
+        paths_str = ", ".join(str(p) for p in paths)
+        print(f"[red]No valid {category.value} files found in paths: {paths_str}")
+        UploadSummary(total=total_collected, succeeded=succeeded).print()
         raise typer.Exit(code=1)
 
+    display = ConcurrentUploadProgressDisplay(len(files))
     try:
-        with ConcurrentUploadProgressDisplay(len(files)) as display:
+        with display:
             sdk.dropoff.put_objects(
                 objects=files,
                 category=category,
@@ -203,3 +248,6 @@ def upload(
     except KeyboardInterrupt:
         print()
         print("[yellow]Upload interrupted. Use the same command to resume the upload.")
+    finally:
+        succeeded = len(display.completed_files)
+        UploadSummary(total=total_collected, succeeded=succeeded).print()

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/dropoff/util.py

@@ -18,6 +18,13 @@ class PaginationOptions:
     limit: int
 
 
+@dataclass
+class FilterOptions:
+    submitted_before: Optional[datetime] = None
+    submitted_after: Optional[datetime] = None
+    status: Optional[str] = None
+
+
 @dataclass
 class DropoffOptions(PaginationOptions):
     category: DropoffCategory
@@ -86,6 +93,48 @@ def get_category(
     return DropoffCategory(cat_str)
 
 
+def get_filter_options(
+    submitted_after: Annotated[
+        Optional[datetime],
+        typer.Option(
+            "--submitted-after",
+            help="Filter results submitted after this datetime (ISO 8601)",
+            formats=[
+                "%Y-%m-%dT%H:%M:%S%z",
+                "%Y-%m-%dT%H:%M:%SZ",
+                "%Y-%m-%d%z",
+                "%Y-%m-%dZ",
+            ],
+        ),
+    ] = None,
+    submitted_before: Annotated[
+        Optional[datetime],
+        typer.Option(
+            "--submitted-before",
+            help="Filter results submitted before this datetime (ISO 8601)",
+            formats=[
+                "%Y-%m-%dT%H:%M:%S%z",
+                "%Y-%m-%dT%H:%M:%SZ",
+                "%Y-%m-%d%z",
+                "%Y-%m-%dZ",
+            ],
+        ),
+    ] = None,
+    status: Annotated[
+        Optional[str],
+        typer.Option(
+            "--status",
+            help="Filter results by status",
+        ),
+    ] = None,
+) -> FilterOptions:
+    return FilterOptions(
+        submitted_before=submitted_before,
+        submitted_after=submitted_after,
+        status=status,
+    )
+
+
 def get_dropoff_options(
     category: Annotated[DropoffCategory, Depends(get_category)],
     offset: Annotated[

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/login.py

@@ -1,15 +1,12 @@
-from contextlib import suppress
 from textwrap import dedent
 from typing import TYPE_CHECKING
 
 import typer
+from rich import print
 from typer_di import Depends, TyperDI
 
 from earthscope_cli.common import get_sdk
 
-with suppress(ModuleNotFoundError):
-    from rich import print
-
 if TYPE_CHECKING:
     from earthscope_sdk import EarthScopeClient
 

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/main.py

@@ -1,4 +1,3 @@
-from contextlib import suppress
 from typing import Annotated
 
 import typer
@@ -10,15 +9,13 @@ from earthscope_sdk.auth.error import (
     NoTokensError,
     UnauthorizedError,
 )
+from rich import print
 
 from earthscope_cli import __version__ as cli_version
 from earthscope_cli import debug, login, user
 from earthscope_cli.dropoff.typer import app as dropoff_app
 from earthscope_cli.util import ErrorHandlingTyper
 
-with suppress(ModuleNotFoundError):
-    from rich import print
-
 app = ErrorHandlingTyper(
     pretty_exceptions_enable=False,
 )

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli/user.py

@@ -1,14 +1,10 @@
-from contextlib import suppress
-
 import typer
+from rich import print
 from typer_di import Depends, TyperDI
 
 from earthscope_cli import login
 from earthscope_cli.common import get_sdk, get_sdk_refreshed
 
-with suppress(ModuleNotFoundError):
-    from rich import print
-
 app = TyperDI()
 
 # Register aliases to login/logout

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2/src/earthscope_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthscope-cli
-Version: 1.1.1
+Version: 1.1.2
 Summary: A CLI for the EarthScope API
 Author-email: EarthScope <data-help@earthscope.org>
 License-Expression: Apache-2.0
@@ -11,9 +11,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typer-slim<0.24.0,>=0.17.3
+Requires-Dist: typer<0.24.0
 Requires-Dist: typer-di>=0.1.3
-Requires-Dist: earthscope-sdk>=1.3.0
+Requires-Dist: earthscope-sdk>=1.3.1
 Requires-Dist: rich>=13.8.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/src/earthscope_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
-typer-slim<0.24.0,>=0.17.3
+typer<0.24.0
 typer-di>=0.1.3
-earthscope-sdk>=1.3.0
+earthscope-sdk>=1.3.1
 rich>=13.8.0
 
 [dev]

{earthscope_cli-1.1.1 → earthscope_cli-1.1.2}/tests/test_dropoff.py

@@ -17,7 +17,10 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock
 
 import pytest
-from earthscope_sdk.client.dropoff.models import DropoffCategory, DropoffObject
+from earthscope_sdk.client.dropoff.models import (
+    DropoffCategory,
+    DropoffObject,
+)
 
 from earthscope_cli.dropoff.typer import app
 from earthscope_cli.dropoff.util import collect_files, key_from_path, safe_str
@@ -288,14 +291,15 @@ class TestUploadCommand:
         mock_sdk = mock_sdk_context_manager(monkeypatch)
 
         # Run command
+        cat = "miniseed"
         result = runner.invoke(
             app,
-            ["upload", "-c", "miniseed", str(empty_dir)],
+            ["upload", "-c", cat, str(empty_dir)],
         )
 
         # Verify exit code indicates error
         assert result.exit_code == 1
-        assert "No files found" in result.stdout
+        assert f"No valid {cat} files found" in result.stdout
 
         # Verify SDK upload was not called
         mock_sdk.dropoff.put_objects.assert_not_called()
@@ -338,6 +342,9 @@ class TestListObjectsCommand:
             prefix="",
             offset=0,
             limit=100,
+            submitted_after=None,
+            submitted_before=None,
+            status=None,
         )
 
         # Verify output contains file name
@@ -368,6 +375,9 @@ class TestListObjectsCommand:
             prefix="demo/",
             offset=0,
             limit=100,
+            submitted_after=None,
+            submitted_before=None,
+            status=None,
         )
 
     def test_list_objects_with_pagination(self, monkeypatch):
@@ -395,6 +405,159 @@ class TestListObjectsCommand:
             prefix="",
             offset=50,
             limit=25,
+            submitted_after=None,
+            submitted_before=None,
+            status=None,
+        )
+
+    @pytest.mark.parametrize(
+        "flag,value,expected_dt",
+        [
+            # --submitted-after formats
+            (
+                "--submitted-after",
+                "2026-01-15T12:30:45Z",
+                datetime(2026, 1, 15, 12, 30, 45, tzinfo=timezone.utc),
+            ),
+            (
+                "--submitted-after",
+                "2026-01-15T12:30:45+00:00",
+                datetime(2026, 1, 15, 12, 30, 45, tzinfo=timezone.utc),
+            ),
+            (
+                "--submitted-after",
+                "2026-02-21Z",
+                datetime(2026, 2, 21, 0, 0, 0, tzinfo=timezone.utc),
+            ),
+            # --submitted-before formats
+            (
+                "--submitted-before",
+                "2026-03-01T06:00:00Z",
+                datetime(2026, 3, 1, 6, 0, 0, tzinfo=timezone.utc),
+            ),
+            (
+                "--submitted-before",
+                "2026-03-01T06:00:00+00:00",
+                datetime(2026, 3, 1, 6, 0, 0, tzinfo=timezone.utc),
+            ),
+            (
+                "--submitted-before",
+                "2026-03-01Z",
+                datetime(2026, 3, 1, 0, 0, 0, tzinfo=timezone.utc),
+            ),
+        ],
+    )
+    def test_list_objects_timestamp_parsing(
+        self, monkeypatch, flag, value, expected_dt
+    ):
+        """Test that timestamp strings are correctly parsed and passed to the SDK."""
+        mock_sdk = mock_sdk_context_manager(monkeypatch)
+        mock_sdk.dropoff.list_objects = Mock(
+            return_value=SimpleNamespace(items=[], has_next=False, offset=0, limit=100)
+        )
+
+        result = runner.invoke(
+            app,
+            ["list-objects", "-c", "miniseed", flag, value],
+        )
+
+        assert result.exit_code == 0, (
+            f"Command failed: {result.stdout}\n{result.exception}"
+        )
+
+        _, kwargs = mock_sdk.dropoff.list_objects.call_args
+        if flag == "--submitted-after":
+            assert kwargs["submitted_after"] == expected_dt
+            assert kwargs["submitted_before"] is None
+        else:
+            assert kwargs["submitted_before"] == expected_dt
+            assert kwargs["submitted_after"] is None
+
+    def test_list_objects_with_both_timestamps(self, monkeypatch):
+        """Test that both --submitted-after and --submitted-before are forwarded together."""
+        mock_sdk = mock_sdk_context_manager(monkeypatch)
+        mock_sdk.dropoff.list_objects = Mock(
+            return_value=SimpleNamespace(items=[], has_next=False, offset=0, limit=100)
+        )
+
+        result = runner.invoke(
+            app,
+            [
+                "list-objects",
+                "-c",
+                "miniseed",
+                "--submitted-after",
+                "2026-01-01T00:00:00Z",
+                "--submitted-before",
+                "2026-02-01T00:00:00Z",
+            ],
+        )
+
+        assert result.exit_code == 0, (
+            f"Command failed: {result.stdout}\n{result.exception}"
+        )
+
+        mock_sdk.dropoff.list_objects.assert_called_once_with(
+            category="miniseed",
+            prefix="",
+            offset=0,
+            limit=100,
+            submitted_after=datetime(2026, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
+            submitted_before=datetime(2026, 2, 1, 0, 0, 0, tzinfo=timezone.utc),
+            status=None,
+        )
+
+    def test_list_objects_invalid_timestamp(self, monkeypatch):
+        """Test that an invalid timestamp string causes a non-zero exit."""
+        mock_sdk = mock_sdk_context_manager(monkeypatch)
+        mock_sdk.dropoff.list_objects = Mock(
+            return_value=SimpleNamespace(items=[], has_next=False, offset=0, limit=100)
+        )
+
+        result = runner.invoke(
+            app,
+            ["list-objects", "-c", "miniseed", "--submitted-after", "not-a-date"],
+        )
+
+        assert result.exit_code != 0
+        mock_sdk.dropoff.list_objects.assert_not_called()
+
+    def test_list_objects_all_filters_combined(self, monkeypatch):
+        """Test that all three new filters can be used together."""
+        mock_sdk = mock_sdk_context_manager(monkeypatch)
+        mock_sdk.dropoff.list_objects = Mock(
+            return_value=SimpleNamespace(items=[], has_next=False, offset=0, limit=100)
+        )
+
+        result = runner.invoke(
+            app,
+            [
+                "list-objects",
+                "-c",
+                "miniseed",
+                "--prefix",
+                "demo/",
+                "--submitted-after",
+                "2026-01-01T00:00:00Z",
+                "--submitted-before",
+                "2026-02-01Z",
+                "--status",
+                "ACCEPTED",
+            ],
+        )
+
+        assert result.exit_code == 0, (
+            f"Command failed: {result.stdout}\n{result.exception}"
+        )
+
+        mock_sdk.dropoff.list_objects.assert_called_once_with(
+            category="miniseed",
+            prefix="demo/",
+            offset=0,
+            limit=100,
+            submitted_after=datetime(2026, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
+            submitted_before=datetime(2026, 2, 1, 0, 0, 0, tzinfo=timezone.utc),
+            status="ACCEPTED",
         )
 
     def test_list_objects_empty_result(self, monkeypatch):
@@ -420,7 +583,7 @@ class TestListObjectsCommand:
         assert result.exit_code == 0
 
         # Verify message about no objects
-        assert "No objects found" in result.stdout
+        assert "No objects matched" in result.stdout
 
     def test_list_objects_has_next_indicator(self, monkeypatch):
         """Test that pagination indicators are shown when has_next is True."""

earthscope_cli-1.1.1/src/earthscope_cli/__init__.py

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