Skip to content

Commit f6ca3ee

Browse files
committed
Update imports from channels library
Signed-off-by: Simon Völcker <simon.voelcker@frequenz.com>
1 parent 3e65895 commit f6ca3ee

13 files changed

Lines changed: 63 additions & 33 deletions

File tree

‎benchmarks/timeseries/benchmark_datasourcing.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
from time import perf_counter
1717
from typing import Any
1818

19-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, ReceiverStoppedError
20-
from frequenz.channels._broadcast import BroadcastReceiver
19+
from frequenz.channels import (
20+
BroadcastChannel,
21+
BroadcastReceiver,
22+
OneshotChannel,
23+
Receiver,
24+
ReceiverStoppedError,
25+
)
2126
from frequenz.client.microgrid.metrics import Metric
2227
from frequenz.quantities import Quantity
2328

@@ -78,15 +83,10 @@ async def benchmark_data_sourcing( # pylint: disable=too-many-locals
7883
mock_grid.add_ev_chargers(num_ev_chargers)
7984
mock_grid.start_mock_client(enable_mock_client)
8085

81-
request_channel = Broadcast[ComponentMetricRequest](
82-
name="DataSourcingActor Request Channel"
83-
)
84-
85-
request_receiver = request_channel.new_receiver(
86-
name="datasourcing-benchmark",
86+
request_sender, request_receiver = BroadcastChannel[ComponentMetricRequest](
87+
name="DataSourcingActor Request Channel",
8788
limit=(num_ev_chargers * len(COMPONENT_METRIC_IDS)),
8889
)
89-
request_sender = request_channel.new_sender()
9090

9191
consume_tasks = []
9292

‎src/frequenz/sdk/microgrid/_data_sourcing/_component_metric_request.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
from dataclasses import dataclass
77
from datetime import datetime
88

9-
from frequenz.channels._broadcast import BroadcastReceiver
10-
from frequenz.channels._oneshot import OneshotSender
9+
from frequenz.channels import BroadcastReceiver, OneshotSender
1110
from frequenz.client.common.microgrid.components import ComponentId
1211
from frequenz.client.microgrid.metrics import Metric
1312
from frequenz.quantities import Quantity

‎src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
from collections.abc import Callable
99
from typing import Any
1010

11-
from frequenz.channels import Broadcast, Receiver
12-
from frequenz.channels._broadcast import BroadcastSender
11+
from frequenz.channels import Broadcast, BroadcastSender, Receiver
1312
from frequenz.client.common.microgrid.components import ComponentId
1413
from frequenz.client.microgrid.component import ComponentCategory
1514
from frequenz.client.microgrid.metrics import Metric

‎src/frequenz/sdk/microgrid/_power_managing/_base_classes.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import enum
1111
import typing
1212

13-
from frequenz.channels._broadcast import BroadcastReceiver
14-
from frequenz.channels._oneshot import OneshotSender
13+
from frequenz.channels import BroadcastReceiver, OneshotSender
1514
from frequenz.client.common.microgrid.components import ComponentId
1615
from frequenz.quantities import Power
1716

‎src/frequenz/sdk/microgrid/_resampling.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@
77
import asyncio
88
import logging
99

10-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, Sender
11-
from frequenz.channels._broadcast import BroadcastReceiver
10+
from frequenz.channels import (
11+
Broadcast,
12+
BroadcastReceiver,
13+
OneshotChannel,
14+
Receiver,
15+
Sender,
16+
)
1217
from frequenz.quantities import Quantity
1318

1419
from .._internal._asyncio import cancel_and_await

‎src/frequenz/sdk/timeseries/_grid_frequency.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
import asyncio
99
import logging
1010

11-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, Sender
12-
from frequenz.channels._broadcast import BroadcastReceiver
11+
from frequenz.channels import (
12+
Broadcast,
13+
BroadcastReceiver,
14+
OneshotChannel,
15+
Receiver,
16+
Sender,
17+
)
1318
from frequenz.channels.experimental import Pipe
1419
from frequenz.client.microgrid.component import Component, EvCharger, Inverter, Meter
1520
from frequenz.client.microgrid.metrics import Metric

‎src/frequenz/sdk/timeseries/_voltage_streamer.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
import logging
1414
from typing import TYPE_CHECKING
1515

16-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, Sender
17-
from frequenz.channels._broadcast import BroadcastReceiver
16+
from frequenz.channels import (
17+
Broadcast,
18+
BroadcastReceiver,
19+
OneshotChannel,
20+
Receiver,
21+
Sender,
22+
)
1823
from frequenz.client.microgrid.component import Component, EvCharger, Inverter, Meter
1924
from frequenz.client.microgrid.metrics import Metric
2025
from frequenz.quantities import Quantity, Voltage

‎src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
import uuid
1313
from collections import abc
1414

15-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, Sender
16-
from frequenz.channels._broadcast import BroadcastReceiver
15+
from frequenz.channels import (
16+
Broadcast,
17+
BroadcastReceiver,
18+
OneshotChannel,
19+
Receiver,
20+
Sender,
21+
)
1722
from frequenz.channels.experimental import Pipe
1823
from frequenz.client.common.microgrid.components import ComponentId
1924
from frequenz.quantities import Energy, Percentage, Power, Temperature

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
import uuid
99
from collections import abc
1010

11-
from frequenz.channels import Broadcast, OneshotChannel, Receiver, Sender
12-
from frequenz.channels._broadcast import BroadcastReceiver
11+
from frequenz.channels import (
12+
Broadcast,
13+
BroadcastReceiver,
14+
OneshotChannel,
15+
Receiver,
16+
Sender,
17+
)
1318
from frequenz.channels.experimental import Pipe
1419
from frequenz.client.common.microgrid.components import ComponentId
1520
from frequenz.quantities import Current, Power

‎src/frequenz/sdk/timeseries/formulas/_resampled_stream_fetcher.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
"""Fetches telemetry streams for components."""
55

6-
from frequenz.channels import OneshotChannel, Receiver, Sender
7-
from frequenz.channels._broadcast import BroadcastReceiver
6+
from frequenz.channels import BroadcastReceiver, OneshotChannel, Receiver, Sender
87
from frequenz.client.common.microgrid.components import ComponentId
98
from frequenz.quantities import Quantity
109

0 commit comments

Comments
 (0)