Stop leaking protobuf types outside of MicogridGrpcClient

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

Author: shsms

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

@@ -25,7 +25,6 @@
 
 import grpc
 from frequenz.channels import Peekable, Receiver, Sender
-from google.protobuf.empty_pb2 import Empty  # pylint: disable=no-name-in-module
 
 from ...actor import ChannelRegistry
 from ...actor._decorator import actor
@@ -674,8 +673,7 @@ async def _create_channels(self) -> None:
 
     def _parse_result(
         self,
-        # type comment to quiet pylint and mypy `unused-import` error
-        tasks,  # type: Dict[int, asyncio.Task[Empty]]
+        tasks: Dict[int, asyncio.Task[None]],
         distribution: Dict[int, float],
         request_timeout_sec: float,
     ) -> Tuple[float, Set[int]]:

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

@@ -169,7 +169,7 @@ async def ev_charger_data(
         """
 
     @abstractmethod
-    async def set_power(self, component_id: int, power_w: float) -> Empty:
+    async def set_power(self, component_id: int, power_w: float) -> None:
         """Send request to the Microgrid to set power for component.
 
         If power > 0, then component will be charged with this power.
@@ -180,9 +180,6 @@ async def set_power(self, component_id: int, power_w: float) -> Empty:
         Args:
             component_id: id of the component to set power.
             power_w: power to set for the component.
-
-        Returns:
-            Empty response.
         """
 
     @abstractmethod
@@ -567,7 +564,7 @@ async def ev_charger_data(
             EVChargerData.from_proto,
         ).new_receiver(maxsize=maxsize)
 
-    async def set_power(self, component_id: int, power_w: float) -> Empty:
+    async def set_power(self, component_id: int, power_w: float) -> None:
         """Send request to the Microgrid to set power for component.
 
         If power > 0, then component will be charged with this power.
@@ -579,9 +576,6 @@ async def set_power(self, component_id: int, power_w: float) -> Empty:
             component_id: id of the component to set power.
             power_w: power to set for the component.
 
-        Returns:
-            Empty response.
-
         Raises:
             AioRpcError: if connection to Microgrid API cannot be established or
                 when the api call exceeded timeout
@@ -590,7 +584,7 @@ async def set_power(self, component_id: int, power_w: float) -> Empty:
             if power_w >= 0:
                 # grpc.aio is missing types and mypy thinks this is not
                 # async iterable, but it is
-                result: Empty = await self.api.Charge(
+                await self.api.Charge(
                     microgrid_pb.PowerLevelParam(
                         component_id=component_id, power_w=math.floor(power_w)
                     ),
@@ -600,7 +594,7 @@ async def set_power(self, component_id: int, power_w: float) -> Empty:
                 # grpc.aio is missing types and mypy thinks this is not
                 # async iterable, but it is
                 power_w *= -1
-                result = await self.api.Discharge(
+                await self.api.Discharge(
                     microgrid_pb.PowerLevelParam(
                         component_id=component_id, power_w=math.floor(power_w)
                     ),
@@ -615,7 +609,6 @@ async def set_power(self, component_id: int, power_w: float) -> Empty:
                 details=msg,
                 debug_error_string=err.debug_error_string(),
             )
-        return result
 
     async def set_bounds(
         self,

tests/microgrid/test_timeout.py

@@ -110,7 +110,7 @@ def mock_set_power(
     power_values = [-100, 100]
     for power_w in power_values:
         with pytest.raises(grpc.aio.AioRpcError) as err_ctx:
-            _ = await client.set_power(component_id=1, power_w=power_w)
+            await client.set_power(component_id=1, power_w=power_w)
         assert err_ctx.value.code() == grpc.StatusCode.DEADLINE_EXCEEDED
 
     assert await server.graceful_shutdown()