Skip to content

Commit 81446f9

Browse files
committed
Fix dispatch-cli stream trying to print event as dispatch
Signed-off-by: Mathias L. Baumann <[email protected]>
1 parent 9b6c949 commit 81446f9

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

RELEASE_NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
## Bug Fixes
44

55
* Fix that duration=0 was sent & received as None.
6+
* Fix that `dispatch-cli stream` would try to print an event as dispatch, causing an exception.

src/frequenz/client/dispatch/__main__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import asyncclick as click
1313
import grpc
14+
from frequenz.channels import Receiver
1415
from prompt_toolkit import PromptSession
1516
from prompt_toolkit.completion import NestedCompleter
1617
from prompt_toolkit.history import FileHistory
@@ -26,7 +27,7 @@
2627
)
2728
from ._client import Client
2829
from .recurrence import EndCriteria, Frequency, RecurrenceRule, Weekday
29-
from .types import Dispatch
30+
from .types import Dispatch, DispatchEvent
3031

3132
DEFAULT_DISPATCH_API_URL = "grpc://fz-0004.frequenz.io:50051"
3233

@@ -249,11 +250,15 @@ async def list_(ctx: click.Context, /, **filters: Any) -> None:
249250
@click.argument("microgrid-id", required=True, type=int)
250251
async def stream(ctx: click.Context, microgrid_id: int) -> None:
251252
"""Stream dispatches."""
252-
async for message in ctx.obj["client"].stream(microgrid_id=microgrid_id):
253+
event_stream: Receiver[DispatchEvent] = ctx.obj["client"].stream(
254+
microgrid_id=microgrid_id
255+
)
256+
async for message in event_stream:
253257
if ctx.obj["raw"]:
254258
click.echo(pformat(message, compact=True))
255259
else:
256-
print_dispatch(message)
260+
print(f"Dispatch {message.event.name.lower()}")
261+
print_dispatch(message.dispatch)
257262

258263

259264
def parse_recurrence(kwargs: dict[str, Any]) -> RecurrenceRule | None:

0 commit comments

Comments
 (0)