Remove prod/cons formulas from battery pool

Signed-off-by: Matthias Wende <[email protected]>

Author: matthias-wende-frequenz

src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py

@@ -261,60 +261,6 @@ def power(self) -> FormulaEngine[Power]:
         assert isinstance(engine, FormulaEngine)
         return engine
 
-    @property
-    def production_power(self) -> FormulaEngine[Power]:
-        """Fetch the total production power of the batteries in the pool.
-
-        This formula produces positive values when producing power and 0 otherwise.
-
-        If a formula engine to calculate this metric is not already running, it will be
-        started.
-
-        A receiver from the formula engine can be obtained by calling the `new_receiver`
-        method.
-
-        Returns:
-            A FormulaEngine that will calculate and stream the total production power of
-                all batteries in the pool.
-        """
-        engine = self._battery_pool._formula_pool.from_power_formula_generator(
-            "battery_pool_production_power",
-            BatteryPowerFormula,
-            FormulaGeneratorConfig(
-                component_ids=self._battery_pool._batteries,
-                formula_type=FormulaType.PRODUCTION,
-            ),
-        )
-        assert isinstance(engine, FormulaEngine)
-        return engine
-
-    @property
-    def consumption_power(self) -> FormulaEngine[Power]:
-        """Fetch the total consumption power of the batteries in the pool.
-
-        This formula produces positive values when consuming power and 0 otherwise.
-
-        If a formula engine to calculate this metric is not already running, it will be
-        started.
-
-        A receiver from the formula engine can be obtained by calling the `new_receiver`
-        method.
-
-        Returns:
-            A FormulaEngine that will calculate and stream the total consumption
-                power of all batteries in the pool.
-        """
-        engine = self._battery_pool._formula_pool.from_power_formula_generator(
-            "battery_pool_consumption_power",
-            BatteryPowerFormula,
-            FormulaGeneratorConfig(
-                component_ids=self._battery_pool._batteries,
-                formula_type=FormulaType.CONSUMPTION,
-            ),
-        )
-        assert isinstance(engine, FormulaEngine)
-        return engine
-
     @property
     def soc(self) -> ReceiverFetcher[Sample[Percentage]]:
         """Fetch the normalized average weighted-by-capacity SoC values for the pool.

tests/timeseries/_battery_pool/test_battery_pool.py

@@ -483,23 +483,15 @@ async def test_battery_pool_power(mocker: MockerFixture) -> None:
 
     battery_pool = microgrid.battery_pool()
     power_receiver = battery_pool.power.new_receiver()
-    consumption_receiver = battery_pool.consumption_power.new_receiver()
-    production_receiver = battery_pool.production_power.new_receiver()
 
     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_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_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)
 
     await mockgrid.cleanup()