Rename MockDataPipeline to MockResampler

This class has always been used as a way to mock the resampler, and
additional functionality is not foreseen.  Renaming also makes it more
distinct when used together with the newly added raw component data
methods.

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

Author: shsms

tests/timeseries/_battery_pool/test_battery_pool.py

@@ -447,17 +447,17 @@ async def test_battery_pool_power(mocker: MockerFixture) -> None:
     consumption_receiver = battery_pool.consumption_power.new_receiver()
     production_receiver = battery_pool.production_power.new_receiver()
 
-    await mockgrid.mock_data.send_bat_inverter_power([2.0, 3.0])
+    await mockgrid.mock_resampler.send_bat_inverter_power([2.0, 3.0])
     assert (await power_receiver.receive()).value == Power.from_watts(5.0)
     assert (await consumption_receiver.receive()).value == Power.from_watts(5.0)
     assert (await production_receiver.receive()).value == Power.from_watts(0.0)
 
-    await mockgrid.mock_data.send_bat_inverter_power([-2.0, -5.0])
+    await mockgrid.mock_resampler.send_bat_inverter_power([-2.0, -5.0])
     assert (await power_receiver.receive()).value == Power.from_watts(-7.0)
     assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
     assert (await production_receiver.receive()).value == Power.from_watts(7.0)
 
-    await mockgrid.mock_data.send_bat_inverter_power([2.0, -5.0])
+    await mockgrid.mock_resampler.send_bat_inverter_power([2.0, -5.0])
     assert (await power_receiver.receive()).value == Power.from_watts(-3.0)
     assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
     assert (await production_receiver.receive()).value == Power.from_watts(3.0)

tests/timeseries/_formula_engine/test_formula_composition.py

@@ -44,8 +44,8 @@ async def test_formula_composition(  # pylint: disable=too-many-locals
         engine = (logical_meter.pv_power + battery_pool.power).build("inv_power")
         inv_calc_recv = engine.new_receiver()
 
-        await mockgrid.mock_data.send_bat_inverter_power([10.0, 12.0, 14.0])
-        await mockgrid.mock_data.send_meter_power(
+        await mockgrid.mock_resampler.send_bat_inverter_power([10.0, 12.0, 14.0])
+        await mockgrid.mock_resampler.send_meter_power(
             [100.0, 10.0, 12.0, 14.0, -100.0, -200.0]
         )
 
@@ -110,10 +110,10 @@ async def test_formula_composition_missing_pv(self, mocker: MockerFixture) -> No
 
         count = 0
         for _ in range(10):
-            await mockgrid.mock_data.send_bat_inverter_power(
+            await mockgrid.mock_resampler.send_bat_inverter_power(
                 [10.0 + count, 12.0 + count, 14.0 + count]
             )
-            await mockgrid.mock_data.send_non_existing_component_value()
+            await mockgrid.mock_resampler.send_non_existing_component_value()
 
             bat_pow = await battery_power_recv.receive()
             pv_pow = await pv_power_recv.receive()
@@ -148,10 +148,10 @@ async def test_formula_composition_missing_bat(self, mocker: MockerFixture) -> N
 
         count = 0
         for _ in range(10):
-            await mockgrid.mock_data.send_meter_power(
+            await mockgrid.mock_resampler.send_meter_power(
                 [10.0 + count, 12.0 + count, 14.0 + count]
             )
-            await mockgrid.mock_data.send_non_existing_component_value()
+            await mockgrid.mock_resampler.send_non_existing_component_value()
             bat_pow = await battery_power_recv.receive()
             pv_pow = await pv_power_recv.receive()
             inv_pow = await inv_calc_recv.receive()
@@ -190,15 +190,15 @@ async def test_3_phase_formulas(self, mocker: MockerFixture) -> None:
         count = 0
 
         for _ in range(10):
-            await mockgrid.mock_data.send_meter_current(
+            await mockgrid.mock_resampler.send_meter_current(
                 [
                     [10.0, 12.0, 14.0],
                     [10.0, 12.0, 14.0],
                     [10.0, 12.0, 14.0],
                     [10.0, 12.0, 14.0],
                 ]
             )
-            await mockgrid.mock_data.send_evc_current(
+            await mockgrid.mock_resampler.send_evc_current(
                 [[10.0 + count, 12.0 + count, 14.0 + count]]
             )
 

tests/timeseries/mock_microgrid.py

@@ -33,7 +33,7 @@
     InverterDataWrapper,
     MeterDataWrapper,
 )
-from .mock_datapipeline import MockDataPipeline
+from .mock_resampler import MockResampler
 
 
 class MockMicrogrid:  # pylint: disable=too-many-instance-attributes
@@ -49,7 +49,7 @@ class MockMicrogrid:  # pylint: disable=too-many-instance-attributes
     battery_id_suffix = 9
 
     _microgrid: MockMicrogridClient
-    mock_data: MockDataPipeline
+    mock_resampler: MockResampler
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
@@ -108,7 +108,7 @@ def __init__(  # pylint: disable=too-many-arguments
     async def start_mock_datapipeline(self, mocker: MockerFixture) -> None:
         """Start the MockDataPipeline."""
         self.init_mock_client(lambda mock_client: mock_client.initialize(mocker))
-        self.mock_data = MockDataPipeline(
+        self.mock_resampler = MockResampler(
             mocker,
             ResamplerConfig(timedelta(seconds=self._sample_rate_s)),
             bat_inverter_ids=self.battery_inverter_ids,

tests/timeseries/mock_datapipeline.py tests/timeseries/mock_resampler.pytests/timeseries/mock_datapipeline.py renamed to tests/timeseries/mock_resampler.py

@@ -23,8 +23,8 @@
 # pylint: disable=too-many-instance-attributes
 
 
-class MockDataPipeline:
-    """Mock data_pipeline."""
+class MockResampler:
+    """Mock resampler."""
 
     def __init__(  # pylint: disable=too-many-arguments
         self,

tests/timeseries/test_ev_charger_pool.py

@@ -86,12 +86,12 @@ async def test_ev_power(  # pylint: disable=too-many-locals
         production_receiver = ev_pool.production_power.new_receiver()
         consumption_receiver = ev_pool.consumption_power.new_receiver()
 
-        await mockgrid.mock_data.send_evc_power([2.0, 4.0, 10.0])
+        await mockgrid.mock_resampler.send_evc_power([2.0, 4.0, 10.0])
         assert (await power_receiver.receive()).value == Power.from_watts(16.0)
         assert (await production_receiver.receive()).value == Power.from_watts(0.0)
         assert (await consumption_receiver.receive()).value == Power.from_watts(16.0)
 
-        await mockgrid.mock_data.send_evc_power([2.0, 4.0, -10.0])
+        await mockgrid.mock_resampler.send_evc_power([2.0, 4.0, -10.0])
         assert (await power_receiver.receive()).value == Power.from_watts(-4.0)
         assert (await production_receiver.receive()).value == Power.from_watts(4.0)
         assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
@@ -118,7 +118,7 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             [0.0]  # only the status gets used from this.
         )
         await asyncio.sleep(0.05)
-        await mockgrid.mock_data.send_evc_current([[2, 3, 5]])
+        await mockgrid.mock_resampler.send_evc_current([[2, 3, 5]])
         status = await recv.receive()
         assert (
             status.current.value_p1,
@@ -135,7 +135,7 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             [0.0]  # only the status gets used from this.
         )
         await asyncio.sleep(0.05)
-        await mockgrid.mock_data.send_evc_current([[2, 3, None]])
+        await mockgrid.mock_resampler.send_evc_current([[2, 3, None]])
         status = await recv.receive()
         assert (
             status.current.value_p1,
@@ -152,7 +152,7 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             [0.0]  # only the status gets used from this.
         )
         await asyncio.sleep(0.05)
-        await mockgrid.mock_data.send_evc_current([[None, None, None]])
+        await mockgrid.mock_resampler.send_evc_current([[None, None, None]])
         status = await recv.receive()
         assert (
             status.current.value_p1,
@@ -170,7 +170,7 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             [0.0]  # only the status gets used from this.
         )
         await asyncio.sleep(0.05)
-        await mockgrid.mock_data.send_evc_current([[None, None, None]])
+        await mockgrid.mock_resampler.send_evc_current([[None, None, None]])
         status = await recv.receive()
         assert (
             status.current.value_p1,
@@ -187,7 +187,7 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             [0.0]  # only the status gets used from this.
         )
         await asyncio.sleep(0.05)
-        await mockgrid.mock_data.send_evc_current([[4, None, None]])
+        await mockgrid.mock_resampler.send_evc_current([[4, None, None]])
         status = await recv.receive()
         assert (
             status.current.value_p1,

tests/timeseries/test_logical_meter.py

@@ -40,7 +40,9 @@ async def test_grid_power_1(self, mocker: MockerFixture) -> None:
         results = []
         main_meter_data = []
         for count in range(10):
-            await mockgrid.mock_data.send_meter_power([20.0 + count, 12.0, -13.0, -5.0])
+            await mockgrid.mock_resampler.send_meter_power(
+                [20.0 + count, 12.0, -13.0, -5.0]
+            )
             val = await main_meter_recv.receive()
             assert (
                 val is not None
@@ -81,7 +83,9 @@ async def test_grid_power_2(
         results: list[Quantity] = []
         meter_sums: list[Quantity] = []
         for count in range(10):
-            await mockgrid.mock_data.send_meter_power([20.0 + count, 12.0, -13.0, -5.0])
+            await mockgrid.mock_resampler.send_meter_power(
+                [20.0 + count, 12.0, -13.0, -5.0]
+            )
             meter_sum = 0.0
             for recv in meter_receivers:
                 val = await recv.receive()
@@ -117,12 +121,12 @@ async def test_grid_production_consumption_power(
         grid_production_recv = logical_meter.grid_production_power.new_receiver()
         grid_consumption_recv = logical_meter.grid_consumption_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([1.0, 2.0, 3.0, 4.0])
+        await mockgrid.mock_resampler.send_meter_power([1.0, 2.0, 3.0, 4.0])
         assert (await grid_recv.receive()).value == Power.from_watts(10.0)
         assert (await grid_production_recv.receive()).value == Power.from_watts(0.0)
         assert (await grid_consumption_recv.receive()).value == Power.from_watts(10.0)
 
-        await mockgrid.mock_data.send_meter_power([1.0, 2.0, -3.0, -4.0])
+        await mockgrid.mock_resampler.send_meter_power([1.0, 2.0, -3.0, -4.0])
         assert (await grid_recv.receive()).value == Power.from_watts(-4.0)
         assert (await grid_production_recv.receive()).value == Power.from_watts(4.0)
         assert (await grid_consumption_recv.receive()).value == Power.from_watts(0.0)
@@ -143,7 +147,7 @@ async def test_chp_power(self, mocker: MockerFixture) -> None:
             logical_meter.chp_consumption_power.new_receiver()
         )
 
-        await mockgrid.mock_data.send_meter_power([1.0, 2.0, 3.0, 4.0])
+        await mockgrid.mock_resampler.send_meter_power([1.0, 2.0, 3.0, 4.0])
         assert (await chp_power_receiver.receive()).value == Power.from_watts(2.0)
         assert (
             await chp_production_power_receiver.receive()
@@ -152,7 +156,7 @@ async def test_chp_power(self, mocker: MockerFixture) -> None:
             await chp_consumption_power_receiver.receive()
         ).value == Power.from_watts(2.0)
 
-        await mockgrid.mock_data.send_meter_power([-4.0, -12.0, None, 10.2])
+        await mockgrid.mock_resampler.send_meter_power([-4.0, -12.0, None, 10.2])
         assert (await chp_power_receiver.receive()).value == Power.from_watts(-12.0)
         assert (
             await chp_production_power_receiver.receive()
@@ -174,7 +178,7 @@ async def test_pv_power(self, mocker: MockerFixture) -> None:
             logical_meter.pv_consumption_power.new_receiver()
         )
 
-        await mockgrid.mock_data.send_meter_power([10.0, -1.0, -2.0])
+        await mockgrid.mock_resampler.send_meter_power([10.0, -1.0, -2.0])
         assert (await pv_power_receiver.receive()).value == Power.from_watts(-3.0)
         assert (await pv_production_power_receiver.receive()).value == Power.from_watts(
             3.0
@@ -193,7 +197,7 @@ async def test_consumer_power_grid_meter(self, mocker: MockerFixture) -> None:
         logical_meter = microgrid.logical_meter()
         consumer_power_receiver = logical_meter.consumer_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
+        await mockgrid.mock_resampler.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
         assert (await consumer_power_receiver.receive()).value == Power.from_watts(6.0)
 
     async def test_consumer_power_no_grid_meter(self, mocker: MockerFixture) -> None:
@@ -206,7 +210,7 @@ async def test_consumer_power_no_grid_meter(self, mocker: MockerFixture) -> None
         logical_meter = microgrid.logical_meter()
         consumer_power_receiver = logical_meter.consumer_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
+        await mockgrid.mock_resampler.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
         assert (await consumer_power_receiver.receive()).value == Power.from_watts(20.0)
 
     async def test_producer_power(self, mocker: MockerFixture) -> None:
@@ -219,7 +223,7 @@ async def test_producer_power(self, mocker: MockerFixture) -> None:
         logical_meter = microgrid.logical_meter()
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
+        await mockgrid.mock_resampler.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
         assert (await producer_power_receiver.receive()).value == Power.from_watts(14.0)
 
     async def test_producer_power_no_chp(self, mocker: MockerFixture) -> None:
@@ -231,7 +235,7 @@ async def test_producer_power_no_chp(self, mocker: MockerFixture) -> None:
         logical_meter = microgrid.logical_meter()
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0])
+        await mockgrid.mock_resampler.send_meter_power([20.0, 2.0, 3.0])
         assert (await producer_power_receiver.receive()).value == Power.from_watts(5.0)
 
     async def test_producer_power_no_pv(self, mocker: MockerFixture) -> None:
@@ -243,7 +247,7 @@ async def test_producer_power_no_pv(self, mocker: MockerFixture) -> None:
         logical_meter = microgrid.logical_meter()
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
-        await mockgrid.mock_data.send_meter_power([20.0, 2.0])
+        await mockgrid.mock_resampler.send_meter_power([20.0, 2.0])
         assert (await producer_power_receiver.receive()).value == Power.from_watts(2.0)
 
     async def test_no_producer_power(self, mocker: MockerFixture) -> None:
@@ -254,5 +258,5 @@ async def test_no_producer_power(self, mocker: MockerFixture) -> None:
         logical_meter = microgrid.logical_meter()
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
-        await mockgrid.mock_data.send_non_existing_component_value()
+        await mockgrid.mock_resampler.send_non_existing_component_value()
         assert (await producer_power_receiver.receive()).value == Power.from_watts(0.0)