Skip to content

Commit 03a1932

Browse files
committed
Remove Event suffix from stream events
The suffix doesn't add a lot of extra clarity and make names too long. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent fed6f0c commit 03a1932

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

RELEASE_NOTES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
for msg in recv:
1919
match msg:
20-
case StreamStartedEvent():
20+
case StreamStarted():
2121
print("Stream started")
22-
case StreamStoppedEvent() as event:
22+
case StreamStopped() as event:
2323
print(f"Stream stopped, reason {event.exception}, retry in {event.retry_time}")
2424
case int() as output:
2525
print(f"Received message: {output}")

src/frequenz/client/base/streaming.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828

2929
@dataclass(frozen=True, kw_only=True)
30-
class StreamStartedEvent:
30+
class StreamStarted:
3131
"""Event indicating that the stream has started."""
3232

3333

3434
@dataclass(frozen=True, kw_only=True)
35-
class StreamStoppedEvent:
35+
class StreamStopped:
3636
"""Event indicating that the stream has stopped."""
3737

3838
retry_time: timedelta | None = None
@@ -42,7 +42,7 @@ class StreamStoppedEvent:
4242
"""The exception that caused the stream to stop, if any."""
4343

4444

45-
StreamEvent: TypeAlias = StreamStartedEvent | StreamStoppedEvent
45+
StreamEvent: TypeAlias = StreamStarted | StreamStopped
4646
"""Type alias for the events that can be sent over the stream."""
4747

4848

@@ -79,9 +79,9 @@ def async_range() -> AsyncIterable[int]:
7979
8080
for msg in recv:
8181
match msg:
82-
case StreamStartedEvent():
82+
case StreamStarted():
8383
print("Stream started")
84-
case StreamStoppedEvent() as event:
84+
case StreamStopped() as event:
8585
print(f"Stream stopped, reason {event.exception}, retry in {event.retry_time}")
8686
case int() as output:
8787
print(f"Received message: {output}")
@@ -168,7 +168,7 @@ async def _run(self) -> None:
168168
_logger.info("%s: starting to stream", self._stream_name)
169169
try:
170170
call = self._stream_method()
171-
await sender.send(StreamStartedEvent())
171+
await sender.send(StreamStarted())
172172
async for msg in call:
173173
await sender.send(self._transform(msg))
174174
except grpc.aio.AioRpcError as err:
@@ -177,7 +177,7 @@ async def _run(self) -> None:
177177
interval = self._retry_strategy.next_interval()
178178

179179
await sender.send(
180-
StreamStoppedEvent(
180+
StreamStopped(
181181
retry_time=timedelta(seconds=interval) if interval else None,
182182
exception=error,
183183
)

tests/streaming/test_grpc_stream_broadcaster.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from frequenz.client.base import retry, streaming
1818
from frequenz.client.base.streaming import (
1919
StreamEvent,
20-
StreamStartedEvent,
21-
StreamStoppedEvent,
20+
StreamStarted,
21+
StreamStopped,
2222
)
2323

2424

@@ -95,7 +95,7 @@ async def _split_message(
9595
events: list[StreamEvent] = []
9696
async for item in receiver:
9797
match item:
98-
case StreamStartedEvent() | StreamStoppedEvent() as item:
98+
case StreamStarted() | StreamStopped() as item:
9999
events.append(item)
100100
case str():
101101
items.append(item)
@@ -148,7 +148,7 @@ async def test_streaming_success_retry_on_exhausted(
148148
"transformed_4",
149149
]
150150
assert events == [
151-
StreamStoppedEvent(exception=None, retry_time=None),
151+
StreamStopped(exception=None, retry_time=None),
152152
]
153153

154154
assert caplog.record_tuples == [
@@ -190,7 +190,7 @@ async def test_streaming_success(
190190
"transformed_4",
191191
]
192192
assert events == [
193-
StreamStoppedEvent(exception=None, retry_time=None),
193+
StreamStopped(exception=None, retry_time=None),
194194
]
195195
assert caplog.record_tuples == [
196196
(
@@ -337,11 +337,11 @@ async def test_messages_on_retry(
337337
assert [type(e) for e in events] == [
338338
type(e)
339339
for e in [
340-
StreamStartedEvent(),
341-
StreamStoppedEvent(
340+
StreamStarted(),
341+
StreamStopped(
342342
exception=mock_error(), retry_time=timedelta(seconds=0.01)
343343
),
344-
StreamStartedEvent(),
345-
StreamStoppedEvent(exception=mock_error(), retry_time=None),
344+
StreamStarted(),
345+
StreamStopped(exception=mock_error(), retry_time=None),
346346
]
347347
]

0 commit comments

Comments
 (0)