Skip to content

Commit 3ea8c42

Browse files
committed
Rename Algorithm to PowerManagerAlgorithm
This makes it easier to expose publicly. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 9787568 commit 3ea8c42

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

src/frequenz/sdk/microgrid/_data_pipeline.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020
from frequenz.client.common.microgrid.components import ComponentId
2121
from frequenz.client.microgrid.component import Battery, EvCharger, SolarInverter
2222

23-
from frequenz.sdk.microgrid._power_managing._base_classes import Algorithm, DefaultPower
24-
2523
from .._internal._channels import ChannelRegistry
2624
from ..actor._actor import Actor
2725
from ..timeseries import ResamplerConfig
2826
from ..timeseries._voltage_streamer import VoltageStreamer
2927
from ._data_sourcing import ComponentMetricRequest, DataSourcingActor
28+
from ._power_managing._base_classes import DefaultPower, PowerManagerAlgorithm
3029
from ._power_wrapper import PowerWrapper
3130

3231
# A number of imports had to be done inside functions where they are used, to break
@@ -104,21 +103,21 @@ def __init__(
104103
self._battery_power_wrapper = PowerWrapper(
105104
self._channel_registry,
106105
api_power_request_timeout=api_power_request_timeout,
107-
power_manager_algorithm=Algorithm.SHIFTING_MATRYOSHKA,
106+
power_manager_algorithm=PowerManagerAlgorithm.SHIFTING_MATRYOSHKA,
108107
default_power=DefaultPower.ZERO,
109108
component_class=Battery,
110109
)
111110
self._ev_power_wrapper = PowerWrapper(
112111
self._channel_registry,
113112
api_power_request_timeout=api_power_request_timeout,
114-
power_manager_algorithm=Algorithm.MATRYOSHKA,
113+
power_manager_algorithm=PowerManagerAlgorithm.MATRYOSHKA,
115114
default_power=DefaultPower.MAX,
116115
component_class=EvCharger,
117116
)
118117
self._pv_power_wrapper = PowerWrapper(
119118
self._channel_registry,
120119
api_power_request_timeout=api_power_request_timeout,
121-
power_manager_algorithm=Algorithm.MATRYOSHKA,
120+
power_manager_algorithm=PowerManagerAlgorithm.MATRYOSHKA,
122121
default_power=DefaultPower.MIN,
123122
# Using SolarInverter might be too specific, maybe we need to also pass
124123
# HybridInverter, see

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
"""A power manager implementation."""
55

6-
from ._base_classes import Algorithm, Proposal, ReportRequest, _Report
6+
from ._base_classes import PowerManagerAlgorithm, Proposal, ReportRequest, _Report
77
from ._power_managing_actor import PowerManagingActor
88

99
__all__ = [
10-
"Algorithm",
10+
"PowerManagerAlgorithm",
1111
"PowerManagingActor",
1212
"Proposal",
1313
"_Report",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class DefaultPower(enum.Enum):
213213
"""The default power is the maximum power of the component."""
214214

215215

216-
class Algorithm(enum.Enum):
216+
class PowerManagerAlgorithm(enum.Enum):
217217
"""The available algorithms for the power manager."""
218218

219219
MATRYOSHKA = "matryoshka"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
from ...timeseries._base_types import SystemBounds
2424
from .. import _data_pipeline, _power_distributing
2525
from ._base_classes import (
26-
Algorithm,
2726
BaseAlgorithm,
2827
DefaultPower,
28+
PowerManagerAlgorithm,
2929
Proposal,
3030
ReportRequest,
3131
_Report,
@@ -47,7 +47,7 @@ def __init__( # pylint: disable=too-many-arguments
4747
power_distributing_requests_sender: Sender[_power_distributing.Request],
4848
power_distributing_results_receiver: Receiver[_power_distributing.Result],
4949
channel_registry: ChannelRegistry,
50-
algorithm: Algorithm,
50+
algorithm: PowerManagerAlgorithm,
5151
default_power: DefaultPower,
5252
component_class: type[Battery | EvCharger | SolarInverter],
5353
):
@@ -80,12 +80,12 @@ def __init__( # pylint: disable=too-many-arguments
8080
] = {}
8181

8282
match algorithm:
83-
case Algorithm.MATRYOSHKA:
83+
case PowerManagerAlgorithm.MATRYOSHKA:
8484
self._algorithm: BaseAlgorithm = Matryoshka(
8585
max_proposal_age=timedelta(seconds=60.0),
8686
default_power=default_power,
8787
)
88-
case Algorithm.SHIFTING_MATRYOSHKA:
88+
case PowerManagerAlgorithm.SHIFTING_MATRYOSHKA:
8989
self._algorithm = ShiftingMatryoshka(
9090
max_proposal_age=timedelta(seconds=60.0),
9191
default_power=default_power,

src/frequenz/sdk/microgrid/_power_wrapper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Request,
2626
Result,
2727
)
28-
from ._power_managing._base_classes import Algorithm, DefaultPower
28+
from ._power_managing._base_classes import DefaultPower, PowerManagerAlgorithm
2929

3030
_logger = logging.getLogger(__name__)
3131

@@ -38,7 +38,7 @@ def __init__( # pylint: disable=too-many-arguments
3838
channel_registry: ChannelRegistry,
3939
*,
4040
api_power_request_timeout: timedelta,
41-
power_manager_algorithm: Algorithm,
41+
power_manager_algorithm: PowerManagerAlgorithm,
4242
default_power: DefaultPower,
4343
component_class: type[Battery | EvCharger | SolarInverter],
4444
):

0 commit comments

Comments
 (0)