Update MicrogridGrpcClient and tests to use latest grpc methods

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

src/frequenz/sdk/microgrid/client/_client.py

@@ -5,7 +5,6 @@
 
 import asyncio
 import logging
-import math
 from abc import ABC, abstractmethod
 from typing import (
     Any,
@@ -20,12 +19,11 @@
 )
 
 import grpc
-from frequenz.api.microgrid import common_pb2 as common_pb
 from frequenz.api.common import components_pb2 as components_pb
+from frequenz.api.common import metrics_pb2 as metrics_pb
 from frequenz.api.microgrid import microgrid_pb2 as microgrid_pb
 from frequenz.api.microgrid.microgrid_pb2_grpc import MicrogridStub
 from frequenz.channels import Broadcast, Receiver, Sender
-from google.protobuf.empty_pb2 import Empty  # pylint: disable=no-name-in-module
 
 from ..._internal._constants import RECEIVER_MAX_SIZE
 from ..component import (
@@ -341,7 +339,7 @@ async def _component_data_task(
                 "Making call to `GetComponentData`, for component_id=%d", component_id
             )
             try:
-                call = self.api.GetComponentData(
+                call = self.api.StreamComponentData(
                     microgrid_pb.ComponentIdParam(id=component_id),
                 )
                 # grpc.aio is missing types and mypy thinks this is not
@@ -579,25 +577,12 @@ async def set_power(self, component_id: int, power_w: float) -> None:
                 when the api call exceeded timeout
         """
         try:
-            if power_w >= 0:
-                # grpc.aio is missing types and mypy thinks this is not
-                # async iterable, but it is
-                await self.api.Charge(
-                    microgrid_pb.PowerLevelParam(
-                        component_id=component_id, power_w=math.floor(power_w)
-                    ),
-                    timeout=DEFAULT_GRPC_CALL_TIMEOUT,  # type: ignore[arg-type]
-                )  # type: ignore[misc]
-            else:
-                # grpc.aio is missing types and mypy thinks this is not
-                # async iterable, but it is
-                power_w *= -1
-                await self.api.Discharge(
-                    microgrid_pb.PowerLevelParam(
-                        component_id=component_id, power_w=math.floor(power_w)
-                    ),
-                    timeout=DEFAULT_GRPC_CALL_TIMEOUT,  # type: ignore[arg-type]
-                )  # type: ignore[misc]
+            await self.api.SetPowerActive(
+                microgrid_pb.SetPowerActiveParam(
+                    component_id=component_id, power=power_w
+                ),
+                timeout=DEFAULT_GRPC_CALL_TIMEOUT,  # type: ignore[arg-type]
+            )  # type: ignore[misc]
         except grpc.aio.AioRpcError as err:
             msg = f"Failed to set power. Microgrid API: {self.target}. Err: {err.details()}"
             raise grpc.aio.AioRpcError(
@@ -633,20 +618,13 @@ async def set_bounds(
         if lower > 0:
             raise ValueError(f"Lower bound {upper} must be less than or equal to 0.")
 
-        # grpc.aio is missing types and mypy thinks request_iterator is
-        # a required argument, but it is not
-        set_bounds_call = self.api.SetBounds(
-            timeout=DEFAULT_GRPC_CALL_TIMEOUT,
-        )  # type: ignore[call-arg]
         try:
-            # grpc.aio is missing types and mypy thinks set_bounds_call can be Empty
-            assert not isinstance(set_bounds_call, Empty)
-            await set_bounds_call.write(
+            self.api.AddInclusionBounds(
                 microgrid_pb.SetBoundsParam(
                     component_id=component_id,
                     # pylint: disable=no-member,line-too-long
                     target_metric=microgrid_pb.SetBoundsParam.TargetMetric.TARGET_METRIC_POWER_ACTIVE,
-                    bounds=common_pb.Bounds(lower=lower, upper=upper),
+                    bounds=metrics_pb.Bounds(lower=lower, upper=upper),
                 ),
             )
         except grpc.aio.AioRpcError as err:

tests/microgrid/test_timeout.py

@@ -98,8 +98,7 @@ def mock_set_power(
         time.sleep(GRPC_SERVER_DELAY)
         return Empty()
 
-    mocker.patch.object(servicer, "Charge", mock_set_power)
-    mocker.patch.object(servicer, "Discharge", mock_set_power)
+    mocker.patch.object(servicer, "SetPowerActive", mock_set_power)
     server = MockGrpcServer(servicer, port=57809)
     await server.start()