Update BatteryPool's control methods to accept/require Power objects

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

Author: shsms

benchmarks/power_distribution/power_distributor.py

@@ -26,6 +26,7 @@
 )
 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"
 PORT = 61060
@@ -49,7 +50,7 @@ async def send_requests(batteries: Set[int], request_num: int) -> List[Result]:
     results_rx = battery_pool.power_distribution_results()
     result: List[Result] = []
     for _ in range(request_num):
-        await battery_pool.set_power(float(random.randrange(100000, 1000000)))
+        await battery_pool.set_power(Power(float(random.randrange(100000, 1000000))))
         try:
             output = await asyncio.wait_for(results_rx.receive(), timeout=3)
             if output is None:

examples/power_distribution.py

@@ -62,13 +62,13 @@ async def run(self) -> None:
 
             avg_power = sum(request) / len(request)
             _logger.debug("Avg power %d", avg_power)
-            power_to_set: float
+            power_to_set: Power
             if avg_power > 30000:
                 # Charge
-                power_to_set = 10000.0
+                power_to_set = Power(10000.0)
             else:
                 # Discharge
-                power_to_set = -10000.0
+                power_to_set = Power(-10000.0)
 
             await battery_pool.set_power(power_to_set)
             try:

src/frequenz/sdk/timeseries/battery_pool/battery_pool.py

@@ -105,7 +105,7 @@ def __init__(  # pylint: disable=too-many-arguments
 
     async def set_power(
         self,
-        power: float,
+        power: Power,
         *,
         adjust_power: bool = True,
         request_timeout: timedelta = timedelta(seconds=5.0),
@@ -134,7 +134,7 @@ async def set_power(
         await self._power_distributing_sender.send(
             Request(
                 namespace=self._power_distributing_namespace,
-                power=power,
+                power=power.as_watts(),
                 batteries=self._batteries,
                 adjust_power=adjust_power,
                 request_timeout_sec=request_timeout.total_seconds(),
@@ -144,7 +144,7 @@ async def set_power(
 
     async def charge(
         self,
-        power: float,
+        power: Power,
         *,
         adjust_power: bool = True,
         request_timeout: timedelta = timedelta(seconds=5.0),
@@ -172,18 +172,23 @@ async def charge(
         Raises:
             ValueError: If the given power is negative.
         """
-        if power < 0.0:
+        as_watts = power.as_watts()
+        if as_watts < 0.0:
             raise ValueError("Charge power must be positive.")
-        await self.set_power(
-            power,
-            adjust_power=adjust_power,
-            request_timeout=request_timeout,
-            include_broken_batteries=include_broken_batteries,
+        await self._power_distributing_sender.send(
+            Request(
+                namespace=self._power_distributing_namespace,
+                power=as_watts,
+                batteries=self._batteries,
+                adjust_power=adjust_power,
+                request_timeout_sec=request_timeout.total_seconds(),
+                include_broken_batteries=include_broken_batteries,
+            )
         )
 
     async def discharge(
         self,
-        power: float,
+        power: Power,
         *,
         adjust_power: bool = True,
         request_timeout: timedelta = timedelta(seconds=5.0),
@@ -211,13 +216,18 @@ async def discharge(
         Raises:
             ValueError: If the given power is negative.
         """
-        if power < 0.0:
+        as_watts = power.as_watts()
+        if as_watts < 0.0:
             raise ValueError("Discharge power must be positive.")
-        await self.set_power(
-            -power,
-            adjust_power=adjust_power,
-            request_timeout=request_timeout,
-            include_broken_batteries=include_broken_batteries,
+        await self._power_distributing_sender.send(
+            Request(
+                namespace=self._power_distributing_namespace,
+                power=-as_watts,
+                batteries=self._batteries,
+                adjust_power=adjust_power,
+                request_timeout_sec=request_timeout.total_seconds(),
+                include_broken_batteries=include_broken_batteries,
+            )
         )
 
     def power_distribution_results(self) -> Receiver[Result]: