Use the new external microgrid API client

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

benchmarks/power_distribution/power_distributor.py

@@ -12,6 +12,7 @@
 from typing import Any
 
 from frequenz.channels import Broadcast
+from frequenz.client.microgrid import Component, ComponentCategory
 
 from frequenz.sdk import microgrid
 from frequenz.sdk.actor import ResamplerConfig
@@ -26,7 +27,6 @@
     Success,
 )
 from frequenz.sdk.microgrid import connection_manager
-from frequenz.sdk.microgrid.component import Component, ComponentCategory
 from frequenz.sdk.timeseries._quantities import Power
 
 HOST = "microgrid.sandbox.api.frequenz.io"

benchmarks/timeseries/benchmark_datasourcing.py

@@ -17,14 +17,14 @@
 from typing import Any
 
 from frequenz.channels import Broadcast, Receiver, ReceiverStoppedError
+from frequenz.client.microgrid import ComponentMetricId
 
 from frequenz.sdk import microgrid
 from frequenz.sdk.actor import (
     ChannelRegistry,
     ComponentMetricRequest,
     DataSourcingActor,
 )
-from frequenz.sdk.microgrid.component import ComponentMetricId
 
 try:
     from tests.timeseries.mock_microgrid import MockMicrogrid

src/frequenz/sdk/actor/_data_sourcing/_component_metric_request.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from ...microgrid.component._component import ComponentMetricId
+from frequenz.client.microgrid import ComponentMetricId
 
 
 @dataclass

src/frequenz/sdk/actor/_data_sourcing/microgrid_api_source.py

@@ -9,16 +9,16 @@
 from typing import Any
 
 from frequenz.channels import Receiver, Sender
-
-from ...microgrid import connection_manager
-from ...microgrid.component import (
+from frequenz.client.microgrid import (
     BatteryData,
     ComponentCategory,
     ComponentMetricId,
     EVChargerData,
     InverterData,
     MeterData,
 )
+
+from ...microgrid import connection_manager
 from ...timeseries import Sample
 from ...timeseries._quantities import Quantity
 from .._channel_registry import ChannelRegistry

src/frequenz/sdk/actor/_power_managing/_power_managing_actor.py

@@ -12,9 +12,9 @@
 
 from frequenz.channels import Receiver, Sender
 from frequenz.channels.util import SkipMissedAndDrift, Timer, select, selected_from
+from frequenz.client.microgrid import ComponentCategory
 from typing_extensions import override
 
-from ...microgrid.component import ComponentCategory
 from ...timeseries._base_types import SystemBounds
 from .._actor import Actor
 from .._channel_registry import ChannelRegistry

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

@@ -12,13 +12,13 @@
 
 import grpc
 from frequenz.channels import Receiver, Sender
+from frequenz.client.microgrid import BatteryData, ComponentCategory, InverterData
 from typing_extensions import override
 
 from .... import microgrid
 from ...._internal._channels import LatestValueCache
 from ...._internal._math import is_close_to_zero
 from ....microgrid import connection_manager
-from ....microgrid.component import BatteryData, ComponentCategory, InverterData
 from ....timeseries._quantities import Power
 from .._component_pool_status_tracker import ComponentPoolStatusTracker
 from .._component_status import BatteryStatusTracker, ComponentPoolStatus

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

@@ -30,15 +30,15 @@
 # pylint: enable=no-name-in-module
 from frequenz.channels import Receiver, Sender
 from frequenz.channels.util import Timer, select, selected_from
-from typing_extensions import override
-
-from ....microgrid import connection_manager
-from ....microgrid.component import (
+from frequenz.client.microgrid import (
     BatteryData,
     ComponentCategory,
     ComponentData,
     InverterData,
 )
+from typing_extensions import override
+
+from ....microgrid import connection_manager
 from ..._background_service import BackgroundService
 from ._blocking_status import BlockingStatus
 from ._component_status import (

src/frequenz/sdk/actor/power_distributing/_distribution_algorithm/_battery_distribution_algorithm.py

@@ -8,8 +8,9 @@
 from dataclasses import dataclass
 from typing import NamedTuple, Sequence
 
+from frequenz.client.microgrid import BatteryData, InverterData
+
 from ...._internal._math import is_close_to_zero
-from ....microgrid.component import BatteryData, InverterData
 from ..result import PowerBounds
 
 _logger = logging.getLogger(__name__)

src/frequenz/sdk/microgrid/_power_wrapper.py

@@ -13,7 +13,7 @@
 # pylint seems to think this is a cyclic import, but it is not.
 #
 # pylint: disable=cyclic-import
-from .component import ComponentCategory
+from frequenz.client.microgrid import ComponentCategory
 
 # A number of imports had to be done inside functions where they are used, to break
 # import cycles.

src/frequenz/sdk/microgrid/component_graph.py

@@ -28,9 +28,13 @@
 from dataclasses import asdict
 
 import networkx as nx
-
-from .client import Connection, MicrogridApiClient
-from .component import Component, ComponentCategory, InverterType
+from frequenz.client.microgrid import (
+    ApiClient,
+    Component,
+    ComponentCategory,
+    Connection,
+    InverterType,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -536,7 +540,7 @@ def refresh_from(
 
     async def refresh_from_api(
         self,
-        api: MicrogridApiClient,
+        api: ApiClient,
         correct_errors: Callable[["_MicrogridComponentGraph"], None] | None = None,
     ) -> None:
         """Refresh the contents of a component graph from the remote API.