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

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

@@ -1,24 +1,27 @@
 Metadata-Version: 2.4
 Name: earthscope-cli
-Version: 1.1.1
+Version: 1.2.0
 Summary: A CLI for the EarthScope API
 Author-email: EarthScope <data-help@earthscope.org>
 License-Expression: Apache-2.0
-Project-URL: Homepage, https://gitlab.com/earthscope/public/earthscope-cli
+Project-URL: Homepage, https://docs.earthscope.org/projects/CLI
+Project-URL: Repository, https://gitlab.com/earthscope/public/earthscope-cli
+Project-URL: Changelog, https://docs.earthscope.org/projects/CLI/page/changelog.html
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 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.4.0
 Requires-Dist: rich>=13.8.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: bumpver; extra == "dev"
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pip>=22.0; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: twine>=6.0.1; extra == "dev"
@@ -36,7 +39,7 @@ A CLI for interacting with EarthScope's APIs
 To use the CLI you must have:
 
 - Registered an account with Earthscope ([sign up now](https://earthscope.org/user/login)). See [here](https://www.earthscope.org/data/authentication) for more information
-- Python >= 3.9
+- Python >= 3.10
 
 ### Installation
 

{earthscope_cli-1.1.1 → earthscope_cli-1.2.0}/README.md

@@ -9,7 +9,7 @@ A CLI for interacting with EarthScope's APIs
 To use the CLI you must have:
 
 - Registered an account with Earthscope ([sign up now](https://earthscope.org/user/login)). See [here](https://www.earthscope.org/data/authentication) for more information
-- Python >= 3.9
+- Python >= 3.10
 
 ### Installation
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "earthscope-cli"
-version = "1.1.1"
+version = "1.2.0"
 description = "A CLI for the EarthScope API"
 readme = "README.md"
 authors = [{ name = "EarthScope", email = "data-help@earthscope.org" }]
@@ -18,18 +18,19 @@ 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.4.0",
     "rich>=13.8.0",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 dev = [
     "black",
     "bumpver",
     "build",
+    "pip>=22.0",
     "pre-commit",
     "pytest",
     "twine>=6.0.1",
@@ -37,13 +38,15 @@ dev = [
 ]
 
 [project.urls]
-Homepage = "https://gitlab.com/earthscope/public/earthscope-cli"
+Homepage = "https://docs.earthscope.org/projects/CLI"
+Repository = "https://gitlab.com/earthscope/public/earthscope-cli"
+Changelog = "https://docs.earthscope.org/projects/CLI/page/changelog.html"
 
 [project.scripts]
 es = "earthscope_cli.main:app"
 
 [tool.bumpver]
-current_version = "1.1.1"
+current_version = "1.2.0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "chore: bump version {old_version} -> {new_version}"
 commit = true

earthscope_cli-1.2.0/src/earthscope_cli/__init__.py

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

{earthscope_cli-1.1.1 → earthscope_cli-1.2.0}/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.2.0}/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.2.0}/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
@@ -45,12 +45,25 @@ def _colorize_status(status: str) -> Text:
     return Text(f"{status or '-'}", style="dim")
 
 
+def _format_details(details: List[str], is_truncated: bool) -> Text:
+    """Format structured_messages (with truncation indicator) or fall back to status_message."""
+    if details:
+        content = "\n".join(details)
+        result = Text(content)
+        if is_truncated:
+            result.append("\n(truncated)", style="dim")
+        return result
+
+    return Text("-", style="dim")
+
+
 def print_dropoff_objects_table(
     objects: List[DropoffObject],
     *,
     title: str,
     has_next: bool,
     next_offset: int,
+    show_details: bool = False,
 ):
     if has_next:
         caption = f"Use --offset {next_offset} to view more results."
@@ -69,15 +82,52 @@ def print_dropoff_objects_table(
     table.add_column("Last Modified", justify="right")
     table.add_column("Status", justify="center")
     table.add_column("Message")
+    if show_details:
+        table.add_column("Details")
+        for o in objects:
+            table.add_row(
+                safe_str(o.path),
+                filesize.decimal(o.size),
+                safe_str(o.received_at),
+                _colorize_status(o.status),
+                safe_str(o.status_message),
+                _format_details(
+                    o.structured_messages, o.structured_messages_were_truncated
+                ),
+            )
+    else:
+        for o in objects:
+            table.add_row(
+                safe_str(o.path),
+                filesize.decimal(o.size),
+                safe_str(o.received_at),
+                _colorize_status(o.status),
+                safe_str(o.status_message),
+            )
+    print()
+    print(table)
+    print()
 
-    for o in objects:
-        table.add_row(
-            safe_str(o.path),
-            filesize.decimal(o.size),
-            safe_str(o.received_at),
-            _colorize_status(o.status),
-            safe_str(o.status_message),
-        )
+
+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)
@@ -181,6 +231,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.
@@ -194,10 +261,10 @@ class ConcurrentUploadProgressDisplay:
     hidden to keep the display clean and focused on active uploads.
 
     Usage:
-        display = ConcurrentUploadProgressDisplay(num_files=10)
+        display = ConcurrentUploadProgressDisplay(num_collected=10)
         with display:
-            sdk.dropoff.put_dropoff_files(
-                files=file_list,
+            sdk.dropoff.put_objects(
+                objects=validated_files_generator(),
                 category="miniseed",
                 progress_cb=display.callback,
             )
@@ -205,7 +272,7 @@ class ConcurrentUploadProgressDisplay:
 
     def __init__(
         self,
-        num_files: int,
+        num_collected: int,
         hide_completed_threshold: int = 10,
         hide_delay_seconds: float = 1.5,
     ):
@@ -213,17 +280,29 @@ class ConcurrentUploadProgressDisplay:
         Initialize the progress display.
 
         Args:
-            num_files: Total number of files to upload
+            num_collected: Total number of files collected (to be validated then uploaded)
             hide_completed_threshold: Threshold for hiding completed progress bars
             hide_delay_seconds: Delay in seconds before hiding completed progress bars
         """
         self.hide_completed_threshold = hide_completed_threshold
         self.hide_delay_seconds = hide_delay_seconds
-        self.num_files = num_files
+        self.num_collected = num_collected
+        self.num_valid = 0
+        self.num_invalid = 0
+        self.validation_complete = False
         self.files_completed = 0
         self.upload_started = False  # Track if we've received any bytes yet
 
-        # Overall progress (files completed, plus aggregate throughput)
+        # Validation progress
+        self.validation_progress = Progress(
+            TextColumn("[bold blue]{task.description}"),
+            BarColumn(),
+            MofNCompleteColumn(),
+            TextColumn("•"),
+            TimeElapsedColumn(),
+        )
+
+        # Overall upload progress (files completed, plus aggregate throughput)
         self.overall_progress = Progress(
             TextColumn("[bold blue]{task.description}"),
             BarColumn(),
@@ -249,6 +328,7 @@ class ConcurrentUploadProgressDisplay:
         self.file_tasks: Dict[str, TaskID] = {}
         self.file_bytes_done: Dict[str, int] = {}  # Track current bytes_done per file
         self.file_bytes_resumed: Dict[str, int] = {}  # Track bytes resumed per file
+        self.validation_task: Optional[TaskID] = None
         self.overall_task: Optional[TaskID] = None
         self.completed_files: set[str] = set()
         self.live: Optional[Live] = None
@@ -256,12 +336,17 @@ class ConcurrentUploadProgressDisplay:
 
     def __enter__(self):
         """Start the live progress display."""
-        # Create overall progress task tracking files completed
-        # (visual_bytes shows total progress, throughput_bytes for speed calculation)
-        # Don't start the timer yet - wait for first byte update
+        # Validation progress task
+        self.validation_task = self.validation_progress.add_task(
+            "[bold]Validating...",
+            total=self.num_collected,
+        )
+
+        # Upload progress task — total starts at num_collected, decremented as files fail validation
+        # Don't start the timer yet — wait for first byte update
         self.overall_task = self.overall_progress.add_task(
-            f"[bold]Uploading {self.num_files} files...",
-            total=self.num_files,
+            "[bold]Uploading...",
+            total=self.num_collected,
             visual_bytes=0,
             throughput_bytes=0,
             start=False,
@@ -269,6 +354,7 @@ class ConcurrentUploadProgressDisplay:
 
         # Create progress group
         progress_group = Group(
+            self.validation_progress,
             self.overall_progress,
             self.file_progress,
         )
@@ -287,10 +373,10 @@ class ConcurrentUploadProgressDisplay:
 
         if self.live:
             # Update final status
-            if exc_type is None and self.overall_task is not None:
+            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_files} uploads",
+                    description=f"[bold green]✓ Completed {self.num_valid} uploads",
                 )
 
                 # Hide all individual file progress bars when complete
@@ -301,6 +387,62 @@ class ConcurrentUploadProgressDisplay:
             self.live.__exit__(exc_type, exc_val, exc_tb)
         return False
 
+    def validation_passed(self):
+        """Called when a file passes validation and will be uploaded."""
+        self.num_valid += 1
+        if self.validation_task is not None:
+            self.validation_progress.advance(self.validation_task, 1)
+
+    def validation_failed(self):
+        """Called when a file fails validation and will not be uploaded."""
+        self.num_invalid += 1
+        if self.validation_task is not None:
+            self.validation_progress.advance(self.validation_task, 1)
+            self.validation_progress.update(
+                self.validation_task,
+                description=f"[bold blue]Validating... [dim]({self.num_invalid} failed)",
+            )
+        # Decrement upload total since this file won't be uploaded
+        if self.overall_task is not None:
+            self.overall_progress.update(
+                self.overall_task,
+                total=self.num_collected - self.num_invalid,
+            )
+
+    def finalize_validation(self):
+        """Called when all validation is complete."""
+        self.validation_complete = True
+        if self.validation_task is not None:
+            self.validation_progress.stop_task(self.validation_task)
+            if self.num_invalid == 0:
+                self.validation_progress.update(
+                    self.validation_task,
+                    description=f"[bold green]✓ Validated {self.num_valid} files",
+                )
+            elif self.num_valid > 0:
+                self.validation_progress.update(
+                    self.validation_task,
+                    description=f"[bold yellow]✓ Validated {self.num_valid}/{self.num_collected} files ({self.num_invalid} failed)",
+                )
+            else:
+                self.validation_progress.update(
+                    self.validation_task,
+                    description=f"[bold red]✗ Validation failed for all {self.num_invalid} files",
+                )
+        # Update upload description with final count
+        if self.overall_task is not None and self.num_valid > 0:
+            self.overall_progress.update(
+                self.overall_task,
+                description=f"[bold]Uploading {self.num_valid} files...",
+            )
+        # Check if all uploads already completed
+        if (
+            self.overall_task is not None
+            and self.num_valid > 0
+            and len(self.completed_files) == self.num_valid
+        ):
+            self.overall_progress.stop_task(self.overall_task)
+
     def _hide_completed_task(self, task_id: TaskID, key: str):
         """
         Hide a completed task from the display.
@@ -384,11 +526,11 @@ class ConcurrentUploadProgressDisplay:
                 self.overall_progress.advance(self.overall_task, 1)
 
                 # If all files are complete, stop the timer to freeze throughput
-                if len(self.completed_files) == self.num_files:
+                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
-            if self.num_files > self.hide_completed_threshold:
+            if self.num_collected > self.hide_completed_threshold:
                 # Schedule hiding the task after a delay
                 timer = threading.Timer(
                     self.hide_delay_seconds,