Skip to content

Commit eb5f970

Browse files
committed
Move component status tracking into _component_status sub package
There's going to be status trackers for more component types. Those can now go into the `_component_status` package. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent f52f791 commit eb5f970

File tree

6 files changed

+31
-12
lines changed

6 files changed

+31
-12
lines changed

src/frequenz/sdk/actor/power_distributing/_component_managers/_battery_manager.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
from ....microgrid import connection_manager
2020
from ....microgrid.component import BatteryData, ComponentCategory, InverterData
2121
from ....timeseries._quantities import Power
22-
from .._battery_status_tracker import BatteryStatusTracker
2322
from .._component_pool_status_tracker import ComponentPoolStatusTracker
24-
from .._component_status import ComponentPoolStatus
23+
from .._component_status import BatteryStatusTracker, ComponentPoolStatus
2524
from .._distribution_algorithm import (
2625
AggregatedBatteryData,
2726
BatteryDistributionAlgorithm,
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# License: MIT
2+
# Copyright © 2024 Frequenz Energy-as-a-Service GmbH
3+
4+
"""Status tracking for components."""
5+
6+
from ._battery_status_tracker import BatteryStatusTracker
7+
from ._component_status import (
8+
ComponentPoolStatus,
9+
ComponentStatus,
10+
ComponentStatusEnum,
11+
ComponentStatusTracker,
12+
SetPowerResult,
13+
)
14+
15+
__all__ = [
16+
"BatteryStatusTracker",
17+
"ComponentPoolStatus",
18+
"ComponentStatus",
19+
"ComponentStatusEnum",
20+
"ComponentStatusTracker",
21+
"SetPowerResult",
22+
]

src/frequenz/sdk/actor/power_distributing/_battery_status_tracker.py renamed to src/frequenz/sdk/actor/power_distributing/_component_status/_battery_status_tracker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
from frequenz.channels.util import Timer, select, selected_from
2121
from typing_extensions import override
2222

23-
from ..._internal._asyncio import cancel_and_await
24-
from ...microgrid import connection_manager
25-
from ...microgrid.component import (
23+
from ...._internal._asyncio import cancel_and_await
24+
from ....microgrid import connection_manager
25+
from ....microgrid.component import (
2626
BatteryData,
2727
ComponentCategory,
2828
ComponentData,

src/frequenz/sdk/actor/power_distributing/_component_status.py renamed to src/frequenz/sdk/actor/power_distributing/_component_status/_component_status.py

File renamed without changes.

tests/actor/test_battery_pool_status.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
from frequenz.channels import Broadcast
88
from pytest_mock import MockerFixture
99

10-
from frequenz.sdk.actor.power_distributing._battery_status_tracker import (
11-
BatteryStatusTracker,
12-
)
1310
from frequenz.sdk.actor.power_distributing._component_pool_status_tracker import (
1411
ComponentPoolStatusTracker,
1512
)
16-
from frequenz.sdk.actor.power_distributing._component_status import ComponentPoolStatus
13+
from frequenz.sdk.actor.power_distributing._component_status import (
14+
BatteryStatusTracker,
15+
ComponentPoolStatus,
16+
)
1717
from frequenz.sdk.microgrid.component import ComponentCategory
1818
from tests.timeseries.mock_microgrid import MockMicrogrid
1919

tests/actor/test_battery_status.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
from pytest_mock import MockerFixture
3030
from time_machine import TimeMachineFixture
3131

32-
from frequenz.sdk.actor.power_distributing._battery_status_tracker import (
33-
BatteryStatusTracker,
34-
)
3532
from frequenz.sdk.actor.power_distributing._component_status import (
33+
BatteryStatusTracker,
3634
ComponentStatus,
3735
ComponentStatusEnum,
3836
SetPowerResult,

0 commit comments

Comments
 (0)