Allow None values in PowerManager reporting streams

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

Author: shsms

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

@@ -55,10 +55,10 @@ class Bounds:
 class Report:
     """Current PowerManager report for a set of batteries."""
 
-    target_power: Power
+    target_power: Power | None
     """The currently set power for the batteries."""
 
-    inclusion_bounds: Bounds
+    inclusion_bounds: Bounds | None
     """The available inclusion bounds for the batteries, for the actor's priority.
 
     These bounds are adjusted to any restrictions placed by actors with higher

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

@@ -152,16 +152,13 @@ def get_status(
             The target power and the available bounds for the given batteries, for
                 the given priority.
         """
-        lower_bound = (
-            system_bounds.inclusion_bounds.lower
-            if system_bounds.inclusion_bounds
-            else Power.zero()  # in the absence of system bounds, block all requests.
-        )
-        upper_bound = (
-            system_bounds.inclusion_bounds.upper
-            if system_bounds.inclusion_bounds
-            else Power.zero()
-        )
+        target_power = self._target_power.get(battery_ids)
+        if system_bounds.inclusion_bounds is None:
+            return Report(target_power, None)
+
+        lower_bound = system_bounds.inclusion_bounds.lower
+        upper_bound = system_bounds.inclusion_bounds.upper
+
         for next_proposal in reversed(self._battery_buckets.get(battery_ids, [])):
             if next_proposal.priority <= priority:
                 break
@@ -175,6 +172,6 @@ def get_status(
                     break
 
         return Report(
-            target_power=self._target_power.get(battery_ids, Power.zero()),
+            target_power,
             inclusion_bounds=Bounds(lower=lower_bound, upper=upper_bound),
         )

tests/actor/_power_managing/test_matryoshka.py

@@ -54,6 +54,7 @@ def test_bounds(
         priority: int, expected_power: float, expected_bounds: tuple[float, float]
     ) -> None:
         report = algorithm.get_status(batteries, priority, system_bounds)
+        assert report.target_power is not None and report.inclusion_bounds is not None
         assert report.target_power.as_watts() == expected_power
         assert report.inclusion_bounds.lower.as_watts() == expected_bounds[0]
         assert report.inclusion_bounds.upper.as_watts() == expected_bounds[1]

tests/timeseries/_battery_pool/test_battery_pool_control_methods.py

@@ -137,10 +137,10 @@ async def _init_data_for_inverters(self, mocks: Mocks) -> None:
             )
 
     def _make_report(
-        self, *, power: float, lower: float, upper: float
+        self, *, power: float | None, lower: float, upper: float
     ) -> _power_managing.Report:
         return _power_managing.Report(
-            target_power=Power.from_watts(power),
+            target_power=Power.from_watts(power) if power is not None else None,
             inclusion_bounds=_power_managing.Bounds(
                 lower=Power.from_watts(lower),
                 upper=Power.from_watts(upper),
@@ -175,7 +175,7 @@ async def test_case_1(
         bounds_rx = battery_pool.power_bounds().new_receiver()
 
         assert await bounds_rx.receive() == self._make_report(
-            power=0.0, lower=-4000.0, upper=4000.0
+            power=None, lower=-4000.0, upper=4000.0
         )
 
         await battery_pool.set_power(Power.from_watts(1000.0))
@@ -210,10 +210,10 @@ async def test_case_2(self, mocks: Mocks, mocker: MockerFixture) -> None:
         bounds_2_rx = battery_pool_2.power_bounds().new_receiver()
 
         assert await bounds_1_rx.receive() == self._make_report(
-            power=0.0, lower=-2000.0, upper=2000.0
+            power=None, lower=-2000.0, upper=2000.0
         )
         assert await bounds_2_rx.receive() == self._make_report(
-            power=0.0, lower=-2000.0, upper=2000.0
+            power=None, lower=-2000.0, upper=2000.0
         )
         await battery_pool_1.set_power(Power.from_watts(1000.0))
         assert await bounds_1_rx.receive() == self._make_report(
@@ -256,10 +256,10 @@ async def test_case_3(self, mocks: Mocks, mocker: MockerFixture) -> None:
         bounds_2_rx = battery_pool_2.power_bounds(1).new_receiver()
 
         assert await bounds_1_rx.receive() == self._make_report(
-            power=0.0, lower=-4000.0, upper=4000.0
+            power=None, lower=-4000.0, upper=4000.0
         )
         assert await bounds_2_rx.receive() == self._make_report(
-            power=0.0, lower=-4000.0, upper=4000.0
+            power=None, lower=-4000.0, upper=4000.0
         )
         await battery_pool_1.set_power(
             Power.from_watts(-1000.0),