Don't guess missing power bounds from adjacent components

While the API allows those values to be unset, in practice this won't
ever happen.
The backend will mark any components with missing power bounds as broken
and will not use them, so it makes no sense for us to guess those bounds
as the component won't be accepted by the backend anyway.

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

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

@@ -573,55 +573,29 @@ def _get_battery_inverter_data(
             )
             return None
 
-        not_replaceable_metrics = [
+        crucial_metrics_bat = [
             battery_data.soc,
             battery_data.soc_lower_bound,
             battery_data.soc_upper_bound,
-            # We could replace capacity with 0, but it won't change distribution.
-            # This battery will be ignored in distribution anyway.
             battery_data.capacity,
+            battery_data.power_inclusion_lower_bound,
+            battery_data.power_inclusion_upper_bound,
         ]
-        if any(map(isnan, not_replaceable_metrics)):
+        if any(map(isnan, crucial_metrics_bat)):
             _logger.debug("Some metrics for battery %d are NaN", battery_id)
             return None
 
-        replaceable_metrics = [
-            battery_data.power_inclusion_lower_bound,
-            battery_data.power_inclusion_upper_bound,
+        crucial_metrics_inv = [
             inverter_data.active_power_inclusion_lower_bound,
             inverter_data.active_power_inclusion_upper_bound,
         ]
 
         # If all values are ok then return them.
-        if not any(map(isnan, replaceable_metrics)):
-            inv_bat_pair = InvBatPair(battery_data, inverter_data)
-            self._cached_metrics[battery_id] = _CacheEntry.from_ttl(inv_bat_pair)
-            return inv_bat_pair
-
-        # Replace NaN with the corresponding value in the adjacent component.
-        # If both metrics are None, return None to ignore this battery.
-        replaceable_pairs = [
-            ("power_inclusion_lower_bound", "active_power_inclusion_lower_bound"),
-            ("power_inclusion_upper_bound", "active_power_inclusion_upper_bound"),
-        ]
+        if any(map(isnan, crucial_metrics_inv)):
+            _logger.debug("Some metrics for inverter %d are NaN", inverter_id)
+            return None
 
-        battery_new_metrics = {}
-        inverter_new_metrics = {}
-        for bat_attr, inv_attr in replaceable_pairs:
-            bat_bound = getattr(battery_data, bat_attr)
-            inv_bound = getattr(inverter_data, inv_attr)
-            if isnan(bat_bound) and isnan(inv_bound):
-                _logger.debug("Some metrics for battery %d are NaN", battery_id)
-                return None
-            if isnan(bat_bound):
-                battery_new_metrics[bat_attr] = inv_bound
-            elif isnan(inv_bound):
-                inverter_new_metrics[inv_attr] = bat_bound
-
-        inv_bat_pair = InvBatPair(
-            replace(battery_data, **battery_new_metrics),
-            replace(inverter_data, **inverter_new_metrics),
-        )
+        inv_bat_pair = InvBatPair(battery_data, inverter_data)
         self._cached_metrics[battery_id] = _CacheEntry.from_ttl(inv_bat_pair)
         return inv_bat_pair
 

tests/actor/power_distributing/test_power_distributing.py

@@ -366,11 +366,10 @@ async def test_battery_power_bounds_nan(self, mocker: MockerFixture) -> None:
         await mockgrid.start(mocker)
         await self.init_component_data(mockgrid)
 
-        # Battery 19 should work even if his inverter sends NaN
         await mockgrid.mock_client.send(
             inverter_msg(
                 18,
-                power=PowerBounds(math.nan, 0, 0, math.nan),
+                power=PowerBounds(-1000, 0, 0, 1000),
             )
         )