Use GrpcError instead of grpc.aio.AioRpcError

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

Author: llucax

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

@@ -10,9 +10,14 @@
 import typing
 from datetime import timedelta
 
-import grpc
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import BatteryData, ComponentCategory, InverterData
+from frequenz.client.microgrid import (
+    BatteryData,
+    ClientError,
+    ComponentCategory,
+    InverterData,
+    OperationOutOfRange,
+)
 from typing_extensions import override
 
 from .... import microgrid
@@ -649,21 +654,22 @@ def _parse_result(
             battery_ids = self._inv_bats_map[inverter_id]
             try:
                 aws.result()
-            except grpc.aio.AioRpcError as err:
+            except OperationOutOfRange as err:
+                failed_power += distribution[inverter_id]
+                failed_batteries = failed_batteries.union(battery_ids)
+                _logger.debug(
+                    "Set power for battery %s failed due to out of range error: %s",
+                    battery_ids,
+                    err,
+                )
+            except ClientError as err:
                 failed_power += distribution[inverter_id]
                 failed_batteries = failed_batteries.union(battery_ids)
-                if err.code() == grpc.StatusCode.OUT_OF_RANGE:
-                    _logger.debug(
-                        "Set power for battery %s failed, error %s",
-                        battery_ids,
-                        str(err),
-                    )
-                else:
-                    _logger.warning(
-                        "Set power for battery %s failed, error %s. Mark it as broken.",
-                        battery_ids,
-                        str(err),
-                    )
+                _logger.warning(
+                    "Set power for battery %s failed, mark it as broken. Error: %s",
+                    battery_ids,
+                    err,
+                )
             except asyncio.exceptions.CancelledError:
                 failed_power += distribution[inverter_id]
                 failed_batteries = failed_batteries.union(battery_ids)

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

@@ -8,9 +8,13 @@
 import logging
 from datetime import datetime, timedelta, timezone
 
-import grpc
 from frequenz.channels import Broadcast, Sender, merge, select, selected_from
-from frequenz.client.microgrid import ApiClient, ComponentCategory, EVChargerData
+from frequenz.client.microgrid import (
+    ApiClient,
+    ClientError,
+    ComponentCategory,
+    EVChargerData,
+)
 from typing_extensions import override
 
 from frequenz.sdk import microgrid
@@ -335,9 +339,9 @@ async def _set_api_power(
                     _logger.warning(
                         "Timeout while setting power to EV charger %s", component_id
                     )
-                case grpc.aio.AioRpcError() as err:
+                case ClientError() as err:
                     _logger.warning(
-                        "Error while setting power to EV charger %s: %s",
+                        "Got a client error while setting power to EV charger %s: %s",
                         component_id,
                         err,
                     )

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

@@ -8,9 +8,13 @@
 import logging
 from datetime import timedelta
 
-import grpc
 from frequenz.channels import Broadcast, Sender
-from frequenz.client.microgrid import ComponentCategory, InverterData, InverterType
+from frequenz.client.microgrid import (
+    ClientError,
+    ComponentCategory,
+    InverterData,
+    InverterType,
+)
 from typing_extensions import override
 
 from ....._internal._channels import LatestValueCache
@@ -197,9 +201,9 @@ async def _set_api_power(  # pylint: disable=too-many-locals
                     _logger.warning(
                         "Timeout while setting power to PV inverter %s", component_id
                     )
-                case grpc.aio.AioRpcError() as err:
+                case ClientError() as err:
                     _logger.warning(
-                        "Error while setting power to PV inverter %s: %s",
+                        "Got a client error while setting power to PV inverter %s: %s",
                         component_id,
                         err,
                     )