Skip to content

Commit dc9a076

Browse files
committed
Make ComponentPool.system_power_bounds public
Signed-off-by: Simon Völcker <simon.voelcker@frequenz.com>
1 parent fca8106 commit dc9a076

5 files changed

Lines changed: 7 additions & 13 deletions

File tree

examples/battery_pool.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ async def main() -> None:
3030
receivers = [
3131
battery_pool.soc.new_receiver(limit=1),
3232
battery_pool.capacity.new_receiver(limit=1),
33-
# pylint: disable-next=protected-access
34-
battery_pool._system_power_bounds.new_receiver(limit=1),
33+
battery_pool.system_power_bounds.new_receiver(limit=1),
3534
]
3635

3736
async for metric in merge(*receivers):

src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,17 @@ def _add_system_bounds_tracker(self, component_ids: frozenset[ComponentId]) -> N
149149
battery_pool = _data_pipeline.new_battery_pool(
150150
priority=-sys.maxsize - 1, component_ids=component_ids
151151
)
152-
# pylint: disable-next=protected-access
153-
bounds_receiver = battery_pool._system_power_bounds.new_receiver()
152+
bounds_receiver = battery_pool.system_power_bounds.new_receiver()
154153
elif issubclass(self._component_class, EvCharger):
155154
ev_charger_pool = _data_pipeline.new_ev_charger_pool(
156155
priority=-sys.maxsize - 1, component_ids=component_ids
157156
)
158-
# pylint: disable-next=protected-access
159-
bounds_receiver = ev_charger_pool._system_power_bounds.new_receiver()
157+
bounds_receiver = ev_charger_pool.system_power_bounds.new_receiver()
160158
elif issubclass(self._component_class, SolarInverter):
161159
pv_pool = _data_pipeline.new_pv_pool(
162160
priority=-sys.maxsize - 1, component_ids=component_ids
163161
)
164-
# pylint: disable-next=protected-access
165-
bounds_receiver = pv_pool._system_power_bounds.new_receiver()
162+
bounds_receiver = pv_pool.system_power_bounds.new_receiver()
166163
else:
167164
_logger.error(
168165
"PowerManagingActor: Unsupported component class: %s",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ def capacity(self) -> ReceiverFetcher[Sample[Energy]]:
258258

259259
@override
260260
@property
261-
def _system_power_bounds(self) -> ReceiverFetcher[SystemBounds]:
261+
def system_power_bounds(self) -> ReceiverFetcher[SystemBounds]:
262262
"""Get receiver to receive new power bounds when they change.
263263
264264
Power bounds refer to the min and max power that a battery can

src/frequenz/sdk/timeseries/component_pool/_component_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def power_distribution_results(self) -> ReceiverFetcher[_power_distributing.Resu
146146
)
147147

148148
@property
149-
def _system_power_bounds(self) -> ReceiverFetcher[SystemBounds]:
149+
def system_power_bounds(self) -> ReceiverFetcher[SystemBounds]:
150150
"""Return a receiver fetcher for the system power bounds."""
151151
return self._pool_ref_store.bounds_channel
152152

tests/timeseries/_battery_pool/test_battery_pool.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,9 +902,7 @@ async def run_power_bounds_test( # pylint: disable=too-many-locals
902902
sampling_rate=0.1,
903903
)
904904

905-
# pylint: disable=protected-access
906-
receiver = battery_pool._system_power_bounds.new_receiver(limit=50)
907-
# pylint: enable=protected-access
905+
receiver = battery_pool.system_power_bounds.new_receiver(limit=50)
908906

909907
# First metrics delivers slower because of the startup delay in the pool.
910908
msg = await asyncio.wait_for(

0 commit comments

Comments
 (0)