CLI: Support delivery time filter on gridpool order stream

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

Author: cwasicki

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

@@ -135,17 +135,20 @@ def receive_gridpool_trades(
     )
 
 
+# pylint: disable=too-many-arguments
 @cli.command()
 @click.option("--url", required=True, type=str)
 @click.option("--auth_key", required=True, type=str)
-@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("--gid", required=True, type=int)
 @click.option("--sign_secret", default=None, type=str)
 def receive_gridpool_orders(
     url: str,
     auth_key: str,
     *,
-    start: datetime,
+    delivery_from: datetime | None,
+    delivery_to: datetime | None,
     gid: int,
     sign_secret: str | None = None,
 ) -> None:
@@ -154,7 +157,8 @@ def receive_gridpool_orders(
         run_list_gridpool_orders(
             url=url,
             auth_key=auth_key,
-            delivery_start=start,
+            delivery_from=delivery_from,
+            delivery_to=delivery_to,
             gid=gid,
             sign_secret=sign_secret,
         )

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

@@ -4,7 +4,7 @@
 """CLI tool to interact with the trading API."""
 
 from collections import deque
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from decimal import Decimal
 from enum import Enum
 from typing import AsyncIterator
@@ -172,56 +172,52 @@ async def list_gridpool_trades(
         print_trade(trade, gid)
 
 
+# pylint: disable=too-many-arguments
 async def list_gridpool_orders(
     url: str,
     auth_key: str,
     *,
-    delivery_start: datetime,
+    delivery_from: datetime | None,
+    delivery_to: datetime | None,
     gid: int,
     sign_secret: str | None = None,
 ) -> None:
     """List orders and stream new gridpool orders.
 
-    If delivery_start is provided, list historical orders and stream new orders
-    for the 15 minute delivery period starting at delivery_start.
-    If no delivery_start is provided, stream new orders for any delivery period.
+    Optionally trades can be filtered by delivery period.
 
     Note that retrieved sort order for listed orders (starting from the newest)
     is reversed in chunks trying to bring more recent orders to the bottom.
 
     Args:
         url: URL of the trading API.
         auth_key: API key.
-        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.
         gid: Gridpool ID.
         sign_secret: The cryptographic secret to use for HMAC generation.
     """
     client = Client(server_url=url, auth_key=auth_key, sign_secret=sign_secret)
 
     print_order_header()
 
-    delivery_time_filter = None
-    # If delivery period is selected, list historical orders 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_orders(gid, delivery_time_filter=delivery_time_filter)
+    delivery_time_filter = DeliveryTimeFilter(Interval(delivery_from, delivery_to))
+
+    lst = client.list_gridpool_orders(
+        gid,
+        delivery_time_filter=delivery_time_filter,
+    )
+
+    stream = client.gridpool_orders_stream(
+        gid,
+        delivery_time_filter=delivery_time_filter,
+    ).new_receiver()
 
     async for order in reverse_iterator(lst):
         print_order(order, gid)
 
-    if delivery_start and delivery_start <= datetime.now(timezone.utc):
-        return
+    print("---- Start streaming -----")
 
-    stream = client.gridpool_orders_stream(
-        gid, delivery_time_filter=delivery_time_filter
-    ).new_receiver()
     async for order in stream:
         print_order(order, gid)