Skip to content

Commit 8e910ed

Browse files
committed
Rename microgrid.ev_charger_poolmicrogrid.new_ev_charger_pool
Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 4b4f391 commit 8e910ed

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def _add_system_bounds_tracker(self, component_ids: frozenset[int]) -> None:
176176
)
177177
bounds_receiver = battery_pool._system_power_bounds.new_receiver()
178178
elif self._component_category is ComponentCategory.EV_CHARGER:
179-
ev_charger_pool = microgrid.ev_charger_pool(
179+
ev_charger_pool = microgrid.new_ev_charger_pool(
180180
priority=-sys.maxsize - 1, component_ids=component_ids
181181
)
182182
bounds_receiver = ev_charger_pool._system_power_bounds.new_receiver()

src/frequenz/sdk/microgrid/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
124124
## EV Chargers
125125
126-
The [`ev_charger_pool`][frequenz.sdk.microgrid.ev_charger_pool] offers a
126+
The [`ev_charger_pool`][frequenz.sdk.microgrid.new_ev_charger_pool] offers a
127127
[`power`][frequenz.sdk.timeseries.ev_charger_pool.EVChargerPool.power] method that
128128
streams the total power measured for all the {{glossary("ev-charger", "EV Chargers")}}
129129
at a site.
@@ -143,9 +143,9 @@
143143
The SDK provides a unified interface for interacting with sets of Batteries, EV
144144
chargers and PV arrays, through their corresponding `Pool`s.
145145
146-
* [EV charger pool][frequenz.sdk.microgrid.ev_charger_pool]
147146
* [PV pool][frequenz.sdk.microgrid.pv_pool]
148147
* [Battery pool][frequenz.sdk.microgrid.new_battery_pool]
148+
* [EV charger pool][frequenz.sdk.microgrid.new_ev_charger_pool]
149149
150150
All of them provide support for streaming aggregated data and for setting the
151151
power values of the components.
@@ -227,11 +227,11 @@
227227
from . import _data_pipeline, connection_manager
228228
from ._data_pipeline import (
229229
consumer,
230-
ev_charger_pool,
231230
frequency,
232231
grid,
233232
logical_meter,
234233
new_battery_pool,
234+
new_ev_charger_pool,
235235
producer,
236236
pv_pool,
237237
voltage,
@@ -256,11 +256,11 @@ async def initialize(server_url: str, resampler_config: ResamplerConfig) -> None
256256
__all__ = [
257257
"initialize",
258258
"consumer",
259-
"ev_charger_pool",
260259
"grid",
261260
"frequency",
262261
"logical_meter",
263262
"new_battery_pool",
263+
"new_ev_charger_pool",
264264
"producer",
265265
"pv_pool",
266266
"voltage",

src/frequenz/sdk/microgrid/_data_pipeline.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def grid(self) -> Grid:
193193

194194
return self._grid
195195

196-
def ev_charger_pool(
196+
def new_ev_charger_pool(
197197
self,
198198
*,
199199
priority: int,
@@ -526,7 +526,7 @@ def producer() -> Producer:
526526
return _get().producer()
527527

528528

529-
def ev_charger_pool(
529+
def new_ev_charger_pool(
530530
*,
531531
priority: int,
532532
component_ids: abc.Set[int] | None = None,
@@ -563,7 +563,7 @@ def ev_charger_pool(
563563
Returns:
564564
An `EVChargerPool` instance.
565565
"""
566-
return _get().ev_charger_pool(
566+
return _get().new_ev_charger_pool(
567567
priority=priority,
568568
component_ids=component_ids,
569569
name=name,

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ def __init__( # pylint: disable=too-many-arguments
5050
"""Create an `EVChargerPool` instance.
5151
5252
!!! note
53+
5354
`EVChargerPool` instances are not meant to be created directly by users. Use
54-
the [`microgrid.ev_charger_pool`][frequenz.sdk.microgrid.ev_charger_pool]
55+
the
56+
[`microgrid.new_ev_charger_pool`][frequenz.sdk.microgrid.new_ev_charger_pool]
5557
method for creating `EVChargerPool` instances.
5658
5759
Args:

src/frequenz/sdk/timeseries/formula_engine/_formula_engine.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ class FormulaEngine(
266266
267267
For example, if you're interested in a particular composite metric that can be
268268
calculated by subtracting
269-
[`battery_pool().power`][frequenz.sdk.timeseries.battery_pool.BatteryPool.power] and
270-
[`ev_charger_pool().power`][frequenz.sdk.timeseries.ev_charger_pool.EVChargerPool]
269+
[`new_battery_pool().power`][frequenz.sdk.timeseries.battery_pool.BatteryPool.power] and
270+
[`new_ev_charger_pool().power`][frequenz.sdk.timeseries.ev_charger_pool.EVChargerPool]
271271
from the
272272
[`grid().power`][frequenz.sdk.timeseries.grid.Grid.power],
273273
we can build a `FormulaEngine` that provides a stream of this calculated metric as
@@ -277,8 +277,8 @@ class FormulaEngine(
277277
from frequenz.sdk import microgrid
278278
279279
logical_meter = microgrid.logical_meter()
280-
ev_charger_pool = microgrid.ev_charger_pool(priority=5)
281280
battery_pool = microgrid.new_battery_pool(priority=5)
281+
ev_charger_pool = microgrid.new_ev_charger_pool(priority=5)
282282
grid = microgrid.grid()
283283
284284
# apply operations on formula engines to create a formula engine that would
@@ -459,7 +459,7 @@ class FormulaEngine3Phase(
459459
```python
460460
from frequenz.sdk import microgrid
461461
462-
ev_charger_pool = microgrid.ev_charger_pool(priority=5)
462+
ev_charger_pool = microgrid.new_ev_charger_pool(priority=5)
463463
464464
async for sample in ev_charger_pool.current.new_receiver():
465465
print(f"Current: {sample}")
@@ -474,7 +474,7 @@ class FormulaEngine3Phase(
474474
from frequenz.sdk import microgrid
475475
476476
logical_meter = microgrid.logical_meter()
477-
ev_charger_pool = microgrid.ev_charger_pool(priority=5)
477+
ev_charger_pool = microgrid.new_ev_charger_pool(priority=5)
478478
grid = microgrid.grid()
479479
480480
# Calculate grid consumption current that's not used by the EV chargers

tests/timeseries/_ev_charger_pool/test_ev_charger_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async def test_ev_power( # pylint: disable=too-many-locals
2323
mockgrid.add_ev_chargers(3)
2424

2525
async with mockgrid:
26-
ev_pool = microgrid.ev_charger_pool(priority=5)
26+
ev_pool = microgrid.new_ev_charger_pool(priority=5)
2727
power_receiver = ev_pool.power.new_receiver()
2828

2929
await mockgrid.mock_resampler.send_evc_power([2.0, 4.0, 10.0])

tests/timeseries/_ev_charger_pool/test_ev_charger_pool_control_methods.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ async def test_setting_power(
206206
)
207207

208208
await self._init_ev_chargers(mocks)
209-
ev_charger_pool = microgrid.ev_charger_pool(priority=5)
209+
ev_charger_pool = microgrid.new_ev_charger_pool(priority=5)
210210
await self._patch_ev_pool_status(mocks, mocker)
211211
await self._patch_power_distributing_actor(mocker)
212212

tests/timeseries/_formula_engine/test_formula_composition.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ async def test_3_phase_formulas(self, mocker: MockerFixture) -> None:
395395
logical_meter = microgrid.logical_meter()
396396
stack.push_async_callback(logical_meter.stop)
397397

398-
ev_pool = microgrid.ev_charger_pool(priority=5)
398+
ev_pool = microgrid.new_ev_charger_pool(priority=5)
399399
stack.push_async_callback(ev_pool.stop)
400400

401401
grid = microgrid.grid()

0 commit comments

Comments
 (0)