Skip to content

Commit 6f1be06

Browse files
committed
Specify name as a kw argument when creating channels and receivers
This parameter has become a keyword argument with channel v1.0.0-rc1. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 54650fe commit 6f1be06

25 files changed

+199
-148
lines changed

benchmarks/power_distribution/power_distributor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ async def run_test( # pylint: disable=too-many-locals
111111
"""
112112
start = timeit.default_timer()
113113

114-
power_request_channel = Broadcast[Request]("power-request")
115-
battery_status_channel = Broadcast[ComponentPoolStatus]("battery-status")
116-
power_result_channel = Broadcast[Result]("power-result")
114+
power_request_channel = Broadcast[Request](name="power-request")
115+
battery_status_channel = Broadcast[ComponentPoolStatus](name="battery-status")
116+
power_result_channel = Broadcast[Result](name="power-result")
117117
async with PowerDistributingActor(
118118
requests_receiver=power_request_channel.new_receiver(),
119119
results_sender=power_result_channel.new_sender(),

benchmarks/timeseries/benchmark_datasourcing.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ async def benchmark_data_sourcing(
7777
mock_grid.start_mock_client(enable_mock_client)
7878

7979
request_channel = Broadcast[ComponentMetricRequest](
80-
"DataSourcingActor Request Channel"
80+
name="DataSourcingActor Request Channel"
8181
)
8282

8383
channel_registry = ChannelRegistry(name="Microgrid Channel Registry")
8484
request_receiver = request_channel.new_receiver(
85-
"datasourcing-benchmark", maxsize=(num_ev_chargers * len(COMPONENT_METRIC_IDS))
85+
name="datasourcing-benchmark",
86+
maxsize=(num_ev_chargers * len(COMPONENT_METRIC_IDS)),
8687
)
8788
request_sender = request_channel.new_sender()
8889

benchmarks/timeseries/periodic_feature_extractor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def init_feature_extractor(
3333
) -> collections.abc.AsyncIterator[PeriodicFeatureExtractor]:
3434
"""Initialize the PeriodicFeatureExtractor class."""
3535
# We only need the moving window to initialize the PeriodicFeatureExtractor class.
36-
lm_chan = Broadcast[Sample[Quantity]]("lm_net_power")
36+
lm_chan = Broadcast[Sample[Quantity]](name="lm_net_power")
3737
async with MovingWindow(
3838
timedelta(seconds=1), lm_chan.new_receiver(), timedelta(seconds=1)
3939
) as moving_window:

src/frequenz/sdk/actor/_channel_registry.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ def get_or_create(self, message_type: type[_T], key: str) -> Broadcast[_T]:
9898
message_type,
9999
"".join(traceback.format_stack(limit=10)[:9]),
100100
)
101-
self._channels[key] = _Entry(message_type, Broadcast(f"{self._name}-{key}"))
101+
self._channels[key] = _Entry(
102+
message_type, Broadcast(name=f"{self._name}-{key}")
103+
)
102104

103105
entry = self._channels[key]
104106
if entry.message_type is not message_type:

src/frequenz/sdk/actor/power_distributing/_component_pool_status_tracker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def __init__( # pylint: disable=too-many-arguments
6565

6666
# Channel for sending results of requests to the components.
6767
self._set_power_result_channel = Broadcast[SetPowerResult](
68-
"component_request_status"
68+
name="component_request_status"
6969
)
7070
self._set_power_result_sender = self._set_power_result_channel.new_sender()
7171
self._component_status_trackers: list[ComponentStatusTracker] = []
@@ -92,7 +92,7 @@ def _make_merged_status_receiver(
9292

9393
for component_id in self._component_ids:
9494
channel: Broadcast[ComponentStatus] = Broadcast(
95-
f"component_{component_id}_status"
95+
name=f"component_{component_id}_status"
9696
)
9797
tracker = self._component_status_tracker_type(
9898
component_id=component_id,

src/frequenz/sdk/microgrid/_data_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ def _data_sourcing_request_sender(self) -> Sender[ComponentMetricRequest]:
259259

260260
if self._data_sourcing_actor is None:
261261
channel: Broadcast[ComponentMetricRequest] = Broadcast(
262-
"Data Pipeline: Data Sourcing Actor Request Channel"
262+
name="Data Pipeline: Data Sourcing Actor Request Channel"
263263
)
264264
actor = DataSourcingActor(
265265
request_receiver=channel.new_receiver(
@@ -283,7 +283,7 @@ def _resampling_request_sender(self) -> Sender[ComponentMetricRequest]:
283283

284284
if self._resampling_actor is None:
285285
channel: Broadcast[ComponentMetricRequest] = Broadcast(
286-
"Data Pipeline: Component Metric Resampling Actor Request Channel"
286+
name="Data Pipeline: Component Metric Resampling Actor Request Channel"
287287
)
288288
actor = ComponentMetricsResamplingActor(
289289
channel_registry=self._channel_registry,

src/frequenz/sdk/microgrid/_power_wrapper.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ def __init__(self, channel_registry: ChannelRegistry):
4343
self._channel_registry = channel_registry
4444

4545
self.status_channel: Broadcast[ComponentPoolStatus] = Broadcast(
46-
"Component Status Channel", resend_latest=True
46+
name="Component Status Channel", resend_latest=True
4747
)
4848
self._power_distribution_requests_channel: Broadcast[Request] = Broadcast(
49-
"Power Distributing Actor, Requests Broadcast Channel"
49+
name="Power Distributing Actor, Requests Broadcast Channel"
5050
)
5151
self._power_distribution_results_channel: Broadcast[Result] = Broadcast(
52-
"Power Distributing Actor, Results Broadcast Channel"
52+
name="Power Distributing Actor, Results Broadcast Channel"
5353
)
5454

5555
self.proposal_channel: Broadcast[_power_managing.Proposal] = Broadcast(
56-
"Power Managing Actor, Requests Broadcast Channel"
56+
name="Power Managing Actor, Requests Broadcast Channel"
5757
)
5858
self.bounds_subscription_channel: Broadcast[_power_managing.ReportRequest] = (
59-
Broadcast("Power Managing Actor, Bounds Subscription Channel")
59+
Broadcast(name="Power Managing Actor, Bounds Subscription Channel")
6060
)
6161

6262
self._power_distributing_actor: PowerDistributingActor | None = None

src/frequenz/sdk/timeseries/_moving_window.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async def send_mock_data(sender: Sender[Sample]) -> None:
6565
await asyncio.sleep(1.0)
6666
6767
async def run() -> None:
68-
resampled_data_channel = Broadcast[Sample]("sample-data")
68+
resampled_data_channel = Broadcast[Sample](name="sample-data")
6969
resampled_data_receiver = resampled_data_channel.new_receiver()
7070
resampled_data_sender = resampled_data_channel.new_sender()
7171
@@ -102,7 +102,7 @@ async def send_mock_data(sender: Sender[Sample]) -> None:
102102
await asyncio.sleep(1.0)
103103
104104
async def run() -> None:
105-
resampled_data_channel = Broadcast[Sample]("sample-data")
105+
resampled_data_channel = Broadcast[Sample](name="sample-data")
106106
resampled_data_receiver = resampled_data_channel.new_receiver()
107107
resampled_data_sender = resampled_data_channel.new_sender()
108108
@@ -345,7 +345,7 @@ async def sink_buffer(sample: Sample[Quantity]) -> None:
345345
if sample.value is not None:
346346
self._buffer.update(sample)
347347

348-
resampler_channel = Broadcast[Sample[Quantity]]("average")
348+
resampler_channel = Broadcast[Sample[Quantity]](name="average")
349349
self._resampler_sender = resampler_channel.new_sender()
350350
self._resampler.add_timeseries(
351351
"avg", resampler_channel.new_receiver(), sink_buffer

src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def component_data(self, component_id: int) -> Receiver[EVChargerData]:
202202
_logger.warning("Restarting component_status for id: %s", component_id)
203203
else:
204204
output_chan = Broadcast[EVChargerData](
205-
f"evpool-component_status-{component_id}"
205+
name=f"evpool-component_status-{component_id}"
206206
)
207207

208208
task = asyncio.create_task(

src/frequenz/sdk/timeseries/ev_charger_pool/_set_current_bounds.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ def __init__(self, repeat_interval: timedelta) -> None:
5050
self._repeat_interval = repeat_interval
5151

5252
self._task: asyncio.Task[None] = asyncio.create_task(self._run())
53-
self._bounds_chan: Broadcast[ComponentCurrentLimit] = Broadcast("BoundsSetter")
53+
self._bounds_chan: Broadcast[ComponentCurrentLimit] = Broadcast(
54+
name="BoundsSetter"
55+
)
5456
self._bounds_rx = self._bounds_chan.new_receiver()
5557
self._bounds_tx = self._bounds_chan.new_sender()
5658

0 commit comments

Comments
 (0)