Fix frequency() sending Quantities instead of Frequency

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

Author: Marenz

RELEASE_NOTES.md

@@ -57,3 +57,4 @@
 ## Bug Fixes
 
 - 0W power requests are now not adjusted to exclusion bounds by the `PowerManager` and `PowerDistributor`, and are sent over to the microgrid API directly.
+- Fixed that `microgrid.frequency()` was sending `Quantity` objects instead of `Frequency`.

src/frequenz/sdk/timeseries/_grid_frequency.py

@@ -93,7 +93,11 @@ def new_receiver(self) -> Receiver[Sample[Frequency]]:
                 "Grid frequency request already sent: %s", self._source_component
             )
 
-        return receiver
+        return receiver.map(
+            lambda sample: Sample(
+                sample.timestamp, Frequency.from_hertz(sample.value.base_value)
+            )
+        )
 
     async def _send_request(self) -> None:
         """Send the request for grid frequency."""

tests/timeseries/test_frequency_streaming.py

@@ -48,6 +48,7 @@ async def test_grid_frequency_1(mocker: MockerFixture) -> None:
         grid_meter_data.append(Frequency.from_hertz(freq))
         val = await grid_freq_recv.receive()
         assert val is not None and val.value is not None
+        assert val.value.as_hertz() == freq
         results.append(val.value)
     await mockgrid.cleanup()
     assert equal_float_lists(results, grid_meter_data)
@@ -84,6 +85,7 @@ async def test_grid_frequency_no_grid_meter_no_consumer_meter(
 
         val = await grid_freq_recv.receive()
         assert val is not None and val.value is not None
+        assert val.value.as_hertz() == freq
         results.append(val.value)
     await mockgrid.cleanup()
     assert equal_float_lists(results, meter_data)
@@ -119,6 +121,7 @@ async def test_grid_frequency_no_grid_meter(
 
         val = await grid_freq_recv.receive()
         assert val is not None and val.value is not None
+        assert val.value.as_hertz() == freq
         results.append(val.value)
     await mockgrid.cleanup()
     assert equal_float_lists(results, meter_data)
@@ -156,6 +159,7 @@ async def test_grid_frequency_only_inverter(
         meter_data.append(Frequency.from_hertz(freq))
         val = await grid_freq_recv.receive()
         assert val is not None and val.value is not None
+        assert val.value.as_hertz() == freq
         results.append(val.value)
     await mockgrid.cleanup()
     assert equal_float_lists(results, meter_data)