Use ComponentCategory from common repo

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
 

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

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
 

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,

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,
 )

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
 

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
 

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,

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

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

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

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,

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

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

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

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,

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

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

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

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

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

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

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

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

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

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

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

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

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

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 (

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
 

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,

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

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,

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