Skip to content

Move component data wrapper to frequenz.sdk.simulate #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mathias-baumann-frequenz wants to merge 1 commit into from
Closed

Move component data wrapper to frequenz.sdk.simulate #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/frequenz/sdk/simulate/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# License: MIT
# Copyright © 2023 Frequenz Energy-as-a-Service GmbH

"""Classes and functions to help simulate running of a microgrid or parts of it."""
4 changes: 4 additions & 0 deletions src/frequenz/sdk/simulate/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# License: MIT
# Copyright © 2023 Frequenz Energy-as-a-Service GmbH

"""Utility classes and functions to help simulate aspects of a microgrid."""
0 tests/utils/component_data_wrapper.py → .../simulate/utils/component_data_wrapper.py
View file
Open in desktop
File renamed without changes.
5 changes: 4 additions & 1 deletion tests/actor/test_battery_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@
ComponentCategory,
InverterData,
)
from frequenz.sdk.simulate.utils.component_data_wrapper import (
BatteryDataWrapper,
InverterDataWrapper,
)

from ..utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
from ..utils.mock_microgrid import MockMicrogridClient


Expand Down
6 changes: 4 additions & 2 deletions tests/power/test_distribution_algorithm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

from frequenz.sdk.microgrid.component import BatteryData, InverterData
from frequenz.sdk.power import DistributionAlgorithm, InvBatPair

from ..utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
from frequenz.sdk.simulate.utils.component_data_wrapper import (
BatteryDataWrapper,
InverterDataWrapper,
)


@dataclass
Expand Down
5 changes: 4 additions & 1 deletion tests/timeseries/_battery_pool/test_battery_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
)
from frequenz.sdk.actor.power_distributing import BatteryStatus
from frequenz.sdk.microgrid.component import ComponentCategory
from frequenz.sdk.simulate.utils.component_data_wrapper import (
BatteryDataWrapper,
InverterDataWrapper,
)
from frequenz.sdk.timeseries.battery_pool import (
BatteryPool,
Bound,
Expand All @@ -34,7 +38,6 @@
)

from ...utils.component_data_streamer import MockComponentDataStreamer
from ...utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
from ...utils.component_graph_utils import (
ComponentGraphConfig,
create_component_graph_structure,
Expand Down
5 changes: 2 additions & 3 deletions tests/timeseries/mock_microgrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@
EVChargerComponentState,
InverterType,
)
from tests.utils.mock_microgrid import MockMicrogridClient

from ..utils.component_data_wrapper import (
from frequenz.sdk.simulate.utils.component_data_wrapper import (
BatteryDataWrapper,
EvChargerDataWrapper,
InverterDataWrapper,
MeterDataWrapper,
)
from tests.utils.mock_microgrid import MockMicrogridClient


class MockMicrogrid: # pylint: disable=too-many-instance-attributes
Expand Down