From c1026c529dcbb74169e935e9427408bd91904686 Mon Sep 17 00:00:00 2001 From: "Mathias L. Baumann" Date: Thu, 26 Jun 2025 11:38:00 +0200 Subject: [PATCH] Use ComponentCategory from common repo Signed-off-by: Mathias L. Baumann --- RELEASE_NOTES.md | 1 + benchmarks/power_distribution/power_distributor.py | 4 ++-- src/frequenz/sdk/microgrid/_data_pipeline.py | 4 ++-- .../microgrid/_data_sourcing/microgrid_api_source.py | 3 +-- .../_component_managers/_battery_manager.py | 3 +-- .../_ev_charger_manager/_ev_charger_manager.py | 9 ++------- .../_pv_inverter_manager/_pv_inverter_manager.py | 9 ++------- .../_component_status/_battery_status_tracker.py | 3 +-- .../_power_distributing/power_distributing.py | 4 ++-- .../microgrid/_power_managing/_power_managing_actor.py | 4 ++-- src/frequenz/sdk/microgrid/_power_wrapper.py | 3 ++- src/frequenz/sdk/microgrid/component_graph.py | 3 +-- src/frequenz/sdk/timeseries/_grid_frequency.py | 4 ++-- src/frequenz/sdk/timeseries/_voltage_streamer.py | 3 ++- .../battery_pool/_battery_pool_reference_store.py | 3 +-- .../battery_pool/_component_metric_fetcher.py | 3 +-- .../_ev_charger_pool_reference_store.py | 3 +-- .../_formula_generators/_battery_power_formula.py | 3 ++- .../_formula_generators/_chp_power_formula.py | 4 ++-- .../_formula_generators/_consumer_power_formula.py | 3 ++- .../_formula_generators/_formula_generator.py | 4 ++-- .../_formula_generators/_grid_current_formula.py | 3 ++- .../_formula_generators/_grid_power_3_phase_formula.py | 3 ++- .../_formula_generators/_grid_power_formula_base.py | 3 ++- .../_formula_generators/_producer_power_formula.py | 3 ++- .../_formula_generators/_pv_power_formula.py | 3 ++- .../_formula_generators/_simple_formula.py | 3 ++- .../sdk/timeseries/pv_pool/_pv_pool_reference_store.py | 4 ++-- tests/microgrid/fixtures.py | 2 +- .../_component_status/test_battery_pool_status.py | 3 +-- .../power_distributing/test_power_distributing.py | 3 +-- tests/microgrid/test_data_sourcing.py | 3 +-- tests/microgrid/test_datapipeline.py | 9 ++------- tests/microgrid/test_graph.py | 3 +-- tests/microgrid/test_grid.py | 3 +-- tests/microgrid/test_microgrid_api.py | 10 ++-------- tests/timeseries/_battery_pool/test_battery_pool.py | 3 +-- tests/timeseries/mock_microgrid.py | 3 +-- tests/utils/component_graph_utils.py | 9 ++------- tests/utils/graph_generator.py | 3 +-- tests/utils/mock_microgrid_client.py | 3 +-- 41 files changed, 64 insertions(+), 95 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 459c16acb..c792dde04 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,7 @@ ## Upgrading * The microgrid client dependency has been updated to version 0.9.0 +* The `ComponentCategory` is now based on the frequenz.client.common package ## New Features diff --git a/benchmarks/power_distribution/power_distributor.py b/benchmarks/power_distribution/power_distributor.py index fd15466a6..f470fba95 100644 --- a/benchmarks/power_distribution/power_distributor.py +++ b/benchmarks/power_distribution/power_distributor.py @@ -12,8 +12,8 @@ from typing import Any from frequenz.channels import Broadcast -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import Component, ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component from frequenz.quantities import Power from frequenz.sdk import microgrid diff --git a/src/frequenz/sdk/microgrid/_data_pipeline.py b/src/frequenz/sdk/microgrid/_data_pipeline.py index be7e2f738..3d9c8775d 100644 --- a/src/frequenz/sdk/microgrid/_data_pipeline.py +++ b/src/frequenz/sdk/microgrid/_data_pipeline.py @@ -17,8 +17,8 @@ from datetime import timedelta from frequenz.channels import Broadcast, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory, InverterType +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import InverterType from frequenz.sdk.microgrid._power_managing._base_classes import Algorithm, DefaultPower diff --git a/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py b/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py index d73dbe1eb..e20d465ba 100644 --- a/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py +++ b/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py @@ -9,10 +9,9 @@ from typing import Any from frequenz.channels import Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( BatteryData, - ComponentCategory, ComponentMetricId, EVChargerData, InverterData, diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py index 7f29fab6a..61dfc9320 100644 --- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py +++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py @@ -11,11 +11,10 @@ from datetime import timedelta from frequenz.channels import LatestValueCache, Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( ApiClientError, BatteryData, - ComponentCategory, InverterData, OperationOutOfRange, ) diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py index 477c242b8..9bfc50325 100644 --- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py +++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py @@ -16,13 +16,8 @@ select, selected_from, ) -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ( - ApiClientError, - ComponentCategory, - EVChargerData, - MicrogridApiClient, -) +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import ApiClientError, EVChargerData, MicrogridApiClient from frequenz.quantities import Power, Voltage from typing_extensions import override diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py index 38c2c75be..e27123e01 100644 --- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py +++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py @@ -9,13 +9,8 @@ from datetime import timedelta from frequenz.channels import LatestValueCache, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ( - ApiClientError, - ComponentCategory, - InverterData, - InverterType, -) +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import ApiClientError, InverterData, InverterType from frequenz.quantities import Power from typing_extensions import override diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py index ec3d4b992..72abef39f 100644 --- a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py +++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py @@ -23,12 +23,11 @@ from frequenz.channels import Receiver, Sender, select, selected_from from frequenz.channels.timer import SkipMissedAndDrift, Timer -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( BatteryComponentState, BatteryData, BatteryRelayState, - ComponentCategory, ComponentData, ErrorLevel, InverterComponentState, diff --git a/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py b/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py index 6653e2fec..3aa42f79d 100644 --- a/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py +++ b/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py @@ -15,8 +15,8 @@ from datetime import timedelta from frequenz.channels import Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory, ComponentType, InverterType +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import ComponentType, InverterType from typing_extensions import override from ...actor._actor import Actor diff --git a/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py b/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py index 05a9d4e42..8e2fe7a75 100644 --- a/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py +++ b/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py @@ -13,8 +13,8 @@ from frequenz.channels import Receiver, Sender, select, selected_from from frequenz.channels.timer import SkipMissedAndDrift, Timer -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory, ComponentType, InverterType +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import ComponentType, InverterType from typing_extensions import override from ..._internal._asyncio import run_forever diff --git a/src/frequenz/sdk/microgrid/_power_wrapper.py b/src/frequenz/sdk/microgrid/_power_wrapper.py index be9a97d4b..40f0fe900 100644 --- a/src/frequenz/sdk/microgrid/_power_wrapper.py +++ b/src/frequenz/sdk/microgrid/_power_wrapper.py @@ -9,11 +9,12 @@ from datetime import timedelta from frequenz.channels import Broadcast +from frequenz.client.common.microgrid.components import ComponentCategory # pylint seems to think this is a cyclic import, but it is not. # # pylint: disable=cyclic-import -from frequenz.client.microgrid import ComponentCategory, ComponentType +from frequenz.client.microgrid import ComponentType from .._internal._channels import ChannelRegistry, ReceiverFetcher from . import _power_managing, connection_manager diff --git a/src/frequenz/sdk/microgrid/component_graph.py b/src/frequenz/sdk/microgrid/component_graph.py index e9d17acf8..198a8509d 100644 --- a/src/frequenz/sdk/microgrid/component_graph.py +++ b/src/frequenz/sdk/microgrid/component_graph.py @@ -27,10 +27,9 @@ from collections.abc import Callable, Iterable import networkx as nx -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( Component, - ComponentCategory, Connection, InverterType, MicrogridApiClient, diff --git a/src/frequenz/sdk/timeseries/_grid_frequency.py b/src/frequenz/sdk/timeseries/_grid_frequency.py index a1499b068..39c74dacc 100644 --- a/src/frequenz/sdk/timeseries/_grid_frequency.py +++ b/src/frequenz/sdk/timeseries/_grid_frequency.py @@ -9,8 +9,8 @@ import logging from frequenz.channels import Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Frequency, Quantity from .._internal._channels import ChannelRegistry diff --git a/src/frequenz/sdk/timeseries/_voltage_streamer.py b/src/frequenz/sdk/timeseries/_voltage_streamer.py index 457ea03f9..74eb9645c 100644 --- a/src/frequenz/sdk/timeseries/_voltage_streamer.py +++ b/src/frequenz/sdk/timeseries/_voltage_streamer.py @@ -14,7 +14,8 @@ from typing import TYPE_CHECKING from frequenz.channels import Receiver, Sender -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Quantity, Voltage from .._internal._channels import ChannelRegistry diff --git a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py index f3194d3b2..91d0e1731 100644 --- a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py +++ b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py @@ -11,8 +11,7 @@ from typing import Any from frequenz.channels import Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from ..._internal._asyncio import cancel_and_await from ..._internal._channels import ChannelRegistry, ReceiverFetcher diff --git a/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py b/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py index 676838f46..e6220d249 100644 --- a/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py +++ b/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py @@ -14,10 +14,9 @@ from typing import Any, Generic, Self, TypeVar from frequenz.channels import ChannelClosedError, Receiver -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( BatteryData, - ComponentCategory, ComponentData, ComponentMetricId, InverterData, diff --git a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py index 6fa8a0ec7..6e687b839 100644 --- a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py +++ b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py @@ -8,8 +8,7 @@ from collections import abc from frequenz.channels import Broadcast, Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from ..._internal._channels import ChannelRegistry, ReceiverFetcher from ...microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_battery_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_battery_power_formula.py index 055750824..51a7ff8ef 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_battery_power_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_battery_power_formula.py @@ -6,7 +6,8 @@ import itertools import logging -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Power from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py index 2ad32379b..0d3c8a99e 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py @@ -7,8 +7,8 @@ import logging from collections import abc -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import ComponentMetricId from frequenz.quantities import Power from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_consumer_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_consumer_power_formula.py index 8e302ece2..81a1d3219 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_consumer_power_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_consumer_power_formula.py @@ -5,7 +5,8 @@ import logging -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Power from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py index eeef83f93..e1f859bff 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py @@ -13,8 +13,8 @@ from typing import Generic from frequenz.channels import Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component, ComponentMetricId from ...._internal._channels import ChannelRegistry from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_current_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_current_formula.py index 420e5151c..b85486bea 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_current_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_current_formula.py @@ -3,7 +3,8 @@ """Formula generator from component graph for 3-phase Grid Current.""" -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Current from .._formula_engine import FormulaEngine, FormulaEngine3Phase diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_3_phase_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_3_phase_formula.py index 4f298d921..08624ba04 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_3_phase_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_3_phase_formula.py @@ -3,7 +3,8 @@ """Formula generator from component graph for 3-phase Grid Power.""" -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Power from .._formula_engine import FormulaEngine, FormulaEngine3Phase diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_formula_base.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_formula_base.py index d0344913e..692a67e36 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_formula_base.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_grid_power_formula_base.py @@ -5,7 +5,8 @@ from abc import ABC, abstractmethod -from frequenz.client.microgrid import Component, ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component from ..._base_types import QuantityT from .._formula_engine import FormulaEngine diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_producer_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_producer_power_formula.py index 240cf9efa..cc2a7afa5 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_producer_power_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_producer_power_formula.py @@ -6,7 +6,8 @@ import logging from typing import Callable -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Power from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_pv_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_pv_power_formula.py index ea65e4738..2bd4a9df7 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_pv_power_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_pv_power_formula.py @@ -5,7 +5,8 @@ import logging -from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import Component, ComponentMetricId from frequenz.quantities import Power from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_simple_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_simple_formula.py index 86fd7b60b..afbd82ba0 100644 --- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_simple_formula.py +++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_simple_formula.py @@ -3,7 +3,8 @@ """Formula generator from component graph.""" -from frequenz.client.microgrid import ComponentCategory, ComponentMetricId +from frequenz.client.common.microgrid.components import ComponentCategory +from frequenz.client.microgrid import ComponentMetricId from frequenz.quantities import Power, ReactivePower from ....microgrid import connection_manager diff --git a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py index 2c0da5e72..aac625d33 100644 --- a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py +++ b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py @@ -9,8 +9,8 @@ from collections import abc from frequenz.channels import Broadcast, Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory, InverterType +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import InverterType from ..._internal._channels import ChannelRegistry, ReceiverFetcher from ...microgrid import connection_manager diff --git a/tests/microgrid/fixtures.py b/tests/microgrid/fixtures.py index 4985a8f7a..fe7c6b3a9 100644 --- a/tests/microgrid/fixtures.py +++ b/tests/microgrid/fixtures.py @@ -12,7 +12,7 @@ from typing import AsyncIterator from frequenz.channels import Sender -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory from pytest_mock import MockerFixture from frequenz.sdk import microgrid diff --git a/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py b/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py index 744510042..cb6c07a48 100644 --- a/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py +++ b/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py @@ -7,8 +7,7 @@ from datetime import timedelta from frequenz.channels import Broadcast -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from pytest_mock import MockerFixture from frequenz.sdk.microgrid._power_distributing._component_pool_status_tracker import ( diff --git a/tests/microgrid/power_distributing/test_power_distributing.py b/tests/microgrid/power_distributing/test_power_distributing.py index 3ee490631..19390d666 100644 --- a/tests/microgrid/power_distributing/test_power_distributing.py +++ b/tests/microgrid/power_distributing/test_power_distributing.py @@ -12,8 +12,7 @@ from unittest.mock import MagicMock from frequenz.channels import Broadcast -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.quantities import Power from pytest_mock import MockerFixture diff --git a/tests/microgrid/test_data_sourcing.py b/tests/microgrid/test_data_sourcing.py index 02f94fcbe..bd6a031fa 100644 --- a/tests/microgrid/test_data_sourcing.py +++ b/tests/microgrid/test_data_sourcing.py @@ -12,13 +12,12 @@ import pytest import pytest_mock from frequenz.channels import Broadcast -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( BatteryComponentState, BatteryData, BatteryRelayState, Component, - ComponentCategory, ComponentData, ComponentMetricId, EVChargerCableState, diff --git a/tests/microgrid/test_datapipeline.py b/tests/microgrid/test_datapipeline.py index e9e688571..54bdd3e65 100644 --- a/tests/microgrid/test_datapipeline.py +++ b/tests/microgrid/test_datapipeline.py @@ -9,13 +9,8 @@ import async_solipsism import pytest import time_machine -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ( - Component, - ComponentCategory, - Connection, - InverterType, -) +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component, Connection, InverterType from pytest_mock import MockerFixture from frequenz.sdk.microgrid._data_pipeline import _DataPipeline diff --git a/tests/microgrid/test_graph.py b/tests/microgrid/test_graph.py index b25432803..2344226ed 100644 --- a/tests/microgrid/test_graph.py +++ b/tests/microgrid/test_graph.py @@ -10,10 +10,9 @@ from unittest import mock import pytest -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( Component, - ComponentCategory, ComponentMetadata, Connection, Fuse, diff --git a/tests/microgrid/test_grid.py b/tests/microgrid/test_grid.py index c72029c3b..efaeeab62 100644 --- a/tests/microgrid/test_grid.py +++ b/tests/microgrid/test_grid.py @@ -6,8 +6,7 @@ from contextlib import AsyncExitStack import frequenz.client.microgrid as client -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.quantities import Current, Power, Quantity, ReactivePower from pytest_mock import MockerFixture diff --git a/tests/microgrid/test_microgrid_api.py b/tests/microgrid/test_microgrid_api.py index 51a10e811..90b876852 100644 --- a/tests/microgrid/test_microgrid_api.py +++ b/tests/microgrid/test_microgrid_api.py @@ -11,14 +11,8 @@ import pytest from frequenz.client.common.microgrid import MicrogridId -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ( - Component, - ComponentCategory, - Connection, - Location, - Metadata, -) +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component, Connection, Location, Metadata from frequenz.sdk.microgrid import connection_manager diff --git a/tests/timeseries/_battery_pool/test_battery_pool.py b/tests/timeseries/_battery_pool/test_battery_pool.py index 2da4f0585..aa967a2dc 100644 --- a/tests/timeseries/_battery_pool/test_battery_pool.py +++ b/tests/timeseries/_battery_pool/test_battery_pool.py @@ -20,8 +20,7 @@ import pytest import time_machine from frequenz.channels import Receiver, Sender -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ComponentCategory +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.quantities import Energy, Percentage, Power, Temperature from pytest_mock import MockerFixture diff --git a/tests/timeseries/mock_microgrid.py b/tests/timeseries/mock_microgrid.py index 3f6674b1b..66602baa0 100644 --- a/tests/timeseries/mock_microgrid.py +++ b/tests/timeseries/mock_microgrid.py @@ -11,10 +11,9 @@ from types import TracebackType from typing import Coroutine -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( Component, - ComponentCategory, ComponentData, Connection, EVChargerCableState, diff --git a/tests/utils/component_graph_utils.py b/tests/utils/component_graph_utils.py index e4aab76c6..639995f41 100644 --- a/tests/utils/component_graph_utils.py +++ b/tests/utils/component_graph_utils.py @@ -6,13 +6,8 @@ from dataclasses import dataclass -from frequenz.client.common.microgrid.components import ComponentId -from frequenz.client.microgrid import ( - Component, - ComponentCategory, - Connection, - InverterType, -) +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId +from frequenz.client.microgrid import Component, Connection, InverterType @dataclass diff --git a/tests/utils/graph_generator.py b/tests/utils/graph_generator.py index 0d7d5b59c..5d8da8bf2 100644 --- a/tests/utils/graph_generator.py +++ b/tests/utils/graph_generator.py @@ -6,10 +6,9 @@ from dataclasses import replace from typing import Any, overload -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( Component, - ComponentCategory, ComponentType, Connection, GridMetadata, diff --git a/tests/utils/mock_microgrid_client.py b/tests/utils/mock_microgrid_client.py index 6715380ef..a2c5b47d7 100644 --- a/tests/utils/mock_microgrid_client.py +++ b/tests/utils/mock_microgrid_client.py @@ -8,11 +8,10 @@ from frequenz.channels import Broadcast, Receiver from frequenz.client.common.microgrid import MicrogridId -from frequenz.client.common.microgrid.components import ComponentId +from frequenz.client.common.microgrid.components import ComponentCategory, ComponentId from frequenz.client.microgrid import ( BatteryData, Component, - ComponentCategory, ComponentData, Connection, EVChargerData,