Skip to content

Commit e7d48f6

Browse files
committed
Move PowerDistributingActor to the microgrid module
Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 7a6385d commit e7d48f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+102
-119
lines changed

benchmarks/power_distribution/power_distributor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
from frequenz.sdk import microgrid
1818
from frequenz.sdk.actor import ResamplerConfig
19-
from frequenz.sdk.actor.power_distributing import (
19+
from frequenz.sdk.microgrid import connection_manager
20+
from frequenz.sdk.microgrid._power_distributing import (
2021
ComponentPoolStatus,
2122
Error,
2223
OutOfBounds,
@@ -26,7 +27,6 @@
2627
Result,
2728
Success,
2829
)
29-
from frequenz.sdk.microgrid import connection_manager
3030
from frequenz.sdk.timeseries._quantities import Power
3131

3232
HOST = "microgrid.sandbox.api.frequenz.io"

src/frequenz/sdk/actor/power_distributing/__init__.py renamed to src/frequenz/sdk/microgrid/_power_distributing/__init__.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/__init__.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/__init__.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/_battery_manager.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
)
2121
from typing_extensions import override
2222

23-
from .... import microgrid
2423
from ...._internal._math import is_close_to_zero
25-
from ....microgrid import connection_manager
2624
from ....timeseries._quantities import Power
25+
from ... import connection_manager
2726
from .._component_pool_status_tracker import ComponentPoolStatusTracker
2827
from .._component_status import BatteryStatusTracker, ComponentPoolStatus
2928
from .._distribution_algorithm import (
@@ -617,7 +616,7 @@ async def _set_distributed_power(
617616
Tuple where first element is total failed power, and the second element
618617
set of batteries that failed.
619618
"""
620-
api = microgrid.connection_manager.get().api_client
619+
api = connection_manager.get().api_client
621620

622621
tasks = {
623622
inverter_id: asyncio.create_task(api.set_power(inverter_id, power))

src/frequenz/sdk/actor/power_distributing/_component_managers/_component_manager.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_component_manager.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/_ev_charger_manager/__init__.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/__init__.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/_ev_charger_manager/_config.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
)
2525
from typing_extensions import override
2626

27-
from frequenz.sdk import microgrid
28-
2927
from ....._internal._math import is_close_to_zero
3028
from .....timeseries import Power, Sample3Phase, Voltage
29+
from .... import _data_pipeline, connection_manager
3130
from ..._component_pool_status_tracker import ComponentPoolStatusTracker
3231
from ..._component_status import ComponentPoolStatus, EVChargerStatusTracker
3332
from ...request import Request
@@ -63,7 +62,7 @@ def __init__(
6362
self._ev_charger_ids = self._get_ev_charger_ids()
6463
self._evc_states = EvcStates()
6564
self._voltage_cache: LatestValueCache[Sample3Phase[Voltage]] = LatestValueCache(
66-
microgrid.voltage_per_phase().new_receiver(),
65+
_data_pipeline.voltage_per_phase().new_receiver(),
6766
unique_id=f"{type(self).__name__}«{hex(id(self))}»:voltage_cache",
6867
)
6968
self._config = EVDistributionConfig(component_ids=self._ev_charger_ids)
@@ -112,7 +111,7 @@ def _get_ev_charger_ids(self) -> collections.abc.Set[int]:
112111
"""Return the IDs of all EV chargers present in the component graph."""
113112
return {
114113
evc.component_id
115-
for evc in microgrid.connection_manager.get().component_graph.components(
114+
for evc in connection_manager.get().component_graph.components(
116115
component_categories={ComponentCategory.EV_CHARGER}
117116
)
118117
}
@@ -229,7 +228,7 @@ async def _run_forever(self) -> None:
229228

230229
async def _run(self) -> None: # pylint: disable=too-many-locals
231230
"""Run the main event loop of the EV charger manager."""
232-
api = microgrid.connection_manager.get().api_client
231+
api = connection_manager.get().api_client
233232
ev_charger_data_rx = merge(
234233
*[await api.ev_charger_data(evc_id) for evc_id in self._ev_charger_ids]
235234
)

src/frequenz/sdk/actor/power_distributing/_component_managers/_ev_charger_manager/_states.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_states.py

File renamed without changes.

src/frequenz/sdk/actor/power_distributing/_component_managers/_pv_inverter_manager/__init__.py renamed to src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)