Update _get_resampled_receiver to take metric_id as an argument

... instead of from the instance variable.

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

Author: shsms

src/frequenz/sdk/timeseries/logical_meter/_resampled_formula_builder.py

@@ -40,21 +40,19 @@ def __init__(
         self._metric_id = metric_id
         super().__init__()
 
-    async def _get_resampled_receiver(self, component_id: int) -> Receiver[Sample]:
+    async def _get_resampled_receiver(
+        self, component_id: int, metric_id: ComponentMetricId
+    ) -> Receiver[Sample]:
         """Get a receiver with the resampled data for the given component id.
 
-        This receiver would contain data for the `metric_id` specified when creating the
-        `ResampledFormulaBuilder` instance.
-
         Args:
             component_id: The component id for which to get a resampled data receiver.
+            metric_id: A metric ID to fetch for all components in this formula.
 
         Returns:
             A receiver to stream resampled data for the given component id.
         """
-        request = ComponentMetricRequest(
-            self._namespace, component_id, self._metric_id, None
-        )
+        request = ComponentMetricRequest(self._namespace, component_id, metric_id, None)
         await self._resampler_subscription_sender.send(request)
         return self._channel_registry.new_receiver(request.get_channel_name())
 
@@ -68,7 +66,7 @@ async def push_component_metric(
             nones_are_zeros: Whether to treat None values from the stream as 0s.  If
                 False, the returned value will be a None.
         """
-        receiver = await self._get_resampled_receiver(component_id)
+        receiver = await self._get_resampled_receiver(component_id, self._metric_id)
         self.push_metric(f"#{component_id}", receiver, nones_are_zeros)
 
     async def from_string(

tests/timeseries/test_logical_meter.py

@@ -23,12 +23,13 @@
 class TestLogicalMeter:
     """Tests for the logical meter."""
 
-    async def _get_resampled_stream(
+    async def _get_resampled_stream(  # pylint: disable=too-many-arguments
         self,
         logical_meter: LogicalMeter,
         channel_registry: ChannelRegistry,
         request_sender: Sender[ComponentMetricRequest],
         comp_id: int,
+        metric_id: ComponentMetricId,
     ) -> Receiver[Sample]:
         """Return the resampled data stream for the given component."""
         # Create a `FormulaBuilder` instance, just in order to reuse its
@@ -39,9 +40,12 @@ async def _get_resampled_stream(
             logical_meter._namespace,
             channel_registry,
             request_sender,
-            ComponentMetricId.ACTIVE_POWER,
+            metric_id,
+        )
+        return await builder._get_resampled_receiver(
+            comp_id,
+            metric_id,
         )
-        return await builder._get_resampled_receiver(comp_id)
         # pylint: enable=protected-access
 
     async def test_grid_power_1(self, mocker: MockerFixture) -> None:
@@ -63,6 +67,7 @@ async def test_grid_power_1(self, mocker: MockerFixture) -> None:
             channel_registry,
             request_sender,
             mockgrid.main_meter_id,
+            ComponentMetricId.ACTIVE_POWER,
         )
 
         results = []
@@ -102,6 +107,7 @@ async def test_grid_power_2(
                 channel_registry,
                 request_sender,
                 meter_id,
+                ComponentMetricId.ACTIVE_POWER,
             )
             for meter_id in mockgrid.meter_ids
         ]
@@ -149,6 +155,7 @@ async def test_battery_and_pv_power(  # pylint: disable=too-many-locals
                 channel_registry,
                 request_sender,
                 meter_id,
+                ComponentMetricId.ACTIVE_POWER,
             )
             for meter_id in mockgrid.battery_inverter_ids
         ]
@@ -159,6 +166,7 @@ async def test_battery_and_pv_power(  # pylint: disable=too-many-locals
                 channel_registry,
                 request_sender,
                 meter_id,
+                ComponentMetricId.ACTIVE_POWER,
             )
             for meter_id in mockgrid.pv_inverter_ids
         ]