CLI: Support delivery time filter on gridpool trade stream

Replaces the delivery period filter to support full delivery period
start intervals. Using to/from arguments to avoid ambiguity with
delivery start.

Signed-off-by: cwasicki <126617870+cwasicki@users.noreply.github.com>

Author: cwasicki

src/frequenz/client/electricity_trading/cli/__main__.py

@@ -105,18 +105,21 @@ def receive_public_orders(  # pylint: disable=too-many-arguments
     )
 
 
+# pylint: disable=too-many-arguments
 @cli.command()
 @click.option("--url", required=True, type=str)
 @click.option("--auth_key", required=True, type=str)
 @click.option("--gid", required=True, type=int)
-@click.option("--start", default=None, type=iso)
+@click.option("--delivery-from", default=None, type=iso)
+@click.option("--delivery-to", default=None, type=iso)
 @click.option("--sign_secret", default=None, type=str)
 def receive_gridpool_trades(
     url: str,
     auth_key: str,
     gid: int,
     *,
-    start: datetime,
+    delivery_from: datetime | None,
+    delivery_to: datetime | None,
     sign_secret: str | None = None,
 ) -> None:
     """List and/or stream gridpool trades."""
@@ -125,7 +128,8 @@ def receive_gridpool_trades(
             url=url,
             auth_key=auth_key,
             gid=gid,
-            delivery_start=start,
+            delivery_from=delivery_from,
+            delivery_to=delivery_to,
             sign_secret=sign_secret,
         )
     )

src/frequenz/client/electricity_trading/cli/etrading.py

@@ -125,51 +125,47 @@ async def receive_public_orders(  # pylint: disable=too-many-arguments
             print_public_order(order)
 
 
+# pylint: disable=too-many-arguments
 async def list_gridpool_trades(
     url: str,
     auth_key: str,
     gid: int,
     *,
-    delivery_start: datetime,
+    delivery_from: datetime | None,
+    delivery_to: datetime | None,
     sign_secret: str | None = None,
 ) -> None:
     """List gridpool trades and stream new gridpool trades.
 
-    Optionally a delivery_start can be provided to filter the trades by delivery period.
+    Optionally trades can be filtered by delivery period.
 
     Args:
         url: URL of the trading API.
         auth_key: API key.
         gid: Gridpool ID.
-        delivery_start: Start of the delivery period or None.
+        delivery_from: Start of the delivery period or None.
+        delivery_to: End of the delivery period or None.
         sign_secret: The cryptographic secret to use for HMAC generation.
     """
     client = Client(server_url=url, auth_key=auth_key, sign_secret=sign_secret)
 
     print_trade_header()
 
-    delivery_time_filter = None
-    # If delivery period is selected, list historical trades also
-    if delivery_start is not None:
-        check_delivery_start(delivery_start)
-        delivery_time_filter = DeliveryTimeFilter(
-            time_interval=Interval(
-                start_time=delivery_start,
-                end_time=delivery_start + timedelta(minutes=15),
-            ),
-            duration_filters=[],
-        )
-    lst = client.list_gridpool_trades(gid, delivery_time_filter=delivery_time_filter)
+    delivery_time_filter = DeliveryTimeFilter(Interval(delivery_from, delivery_to))
+    lst = client.list_gridpool_trades(
+        gid,
+        delivery_time_filter=delivery_time_filter,
+    )
+
+    # Initialize the stream before printing to minimize the gap between the two
+    stream = client.gridpool_trades_stream(
+        gid,
+        delivery_time_filter=delivery_time_filter,
+    ).new_receiver()
 
     async for trade in lst:
         print_trade(trade, gid)
 
-    if delivery_start and delivery_start <= datetime.now(timezone.utc):
-        return
-
-    stream = client.gridpool_trades_stream(
-        gid, delivery_time_filter=delivery_time_filter
-    ).new_receiver()
     async for trade in stream:
         print_trade(trade, gid)