refactor: resetting defaults

src/eodm/cli/_globals.py

@@ -1,6 +1,11 @@
+from datetime import datetime
+
 from pystac import Extent, SpatialExtent, TemporalExtent
 
 DEFAULT_EXTENT = Extent(
     spatial=SpatialExtent.from_coordinates([[-180, -90], [180, 90]]),
     temporal=TemporalExtent.from_now(),
 )
+
+DEFAULT_DATETIME_INTERVAL = f"{datetime(1900, 1, 1)}/.."
+DEFAULT_BBOX = "-180.0,-90.0,180.0, 90.0"

src/eodm/cli/_types.py

@@ -14,13 +14,13 @@ def __init__(self, ll_x: float, ll_y: float, ur_x: float, ur_y: float) -> None:
         self.ur_y = ur_y
 
     def __str__(self) -> str:
-        return f"BBox({self.ll_x}, {self.ll_y}, {self.ur_x}, {self.ur_y})"
+        return f"{self.ll_x},{self.ll_y},{self.ur_x},{self.ur_y}"
 
     def __iter__(self) -> Iterator[float]:
         yield from (self.ll_x, self.ll_y, self.ur_x, self.ur_y)
 
 
-def parse_bbox(value: str) -> BBox:
+def bbox(value: str) -> BBox:
     coords = value.split(",")
     if len(coords) != 4:
         raise ValueError(
@@ -40,7 +40,7 @@ def __str__(self) -> str:
         return f"{self.lower.isoformat()}/{self.upper.isoformat()}"
 
 
-def parse_datetime_interval(value: str) -> DatetimeInterval:
+def datetime_interval(value: str) -> DatetimeInterval:
     dts = value.split("/")
     if not (0 < len(dts) < 3):
         raise ValueError("Invalid datetime interval")
@@ -67,12 +67,15 @@ class Output(str, Enum):
 
 
 BBoxType = Annotated[
-    BBox | None, Option(parser=parse_bbox, help="format: ll_x,ll_y,ur_x,ur_y")
+    BBox | str,
+    Option("--bbox", "-b", parser=bbox, help="WGS 84 format:minx,miny,maxx,maxy"),
 ]
 DateTimeIntervalType = Annotated[
-    DatetimeInterval | None,
+    DatetimeInterval | str,
     Option(
-        parser=parse_datetime_interval,
+        "--datetime-interval",
+        "-d",
+        parser=datetime_interval,
         help="ISO format: single, start/end, start/.., ../end for open bounds",
     ),
 ]

src/eodm/cli/extract/apps/stac_api.py

@@ -1,9 +1,15 @@
-from typing import cast
+from typing import Annotated, cast
 
 import typer
 
+from eodm.cli._globals import DEFAULT_BBOX, DEFAULT_DATETIME_INTERVAL
 from eodm.cli._serialization import serialize
-from eodm.cli._types import BBoxType, DateTimeIntervalType, Output, OutputType
+from eodm.cli._types import (
+    BBoxType,
+    DateTimeIntervalType,
+    Output,
+    OutputType,
+)
 from eodm.extract import extract_stac_api_collections, extract_stac_api_items
 
 app = typer.Typer(no_args_is_help=True)
@@ -20,13 +26,22 @@ def main():
 def items(
     url: str,
     collection: str,
-    bbox: BBoxType = None,
-    datetime_interval: DateTimeIntervalType = None,
-    limit: int | None = None,
+    bbox: BBoxType = DEFAULT_BBOX,
+    datetime_interval: DateTimeIntervalType = DEFAULT_DATETIME_INTERVAL,
+    limit: Annotated[
+        int,
+        typer.Option(
+            "--limit",
+            "-l",
+            parser=lambda x: x if x else None,
+            metavar="INT",
+            help="Limit query.",
+        ),
+    ] = 0,
     output: OutputType = Output.default,
 ):
     """
-    Extract items from a STAC API collection
+    Extract items from a collection found in a STAC API
     """
 
     _bbox = None
@@ -50,7 +65,7 @@ def items(
 @app.command(no_args_is_help=True)
 def collections(url: str, output: OutputType = Output.default):
     """
-    Extract collections from STAC API
+    Extract all collections from STAC API
     """
 
     collections = extract_stac_api_collections(url)