Update FormulaGenerators to pass custom constructors to engines

This is because the default constructors for specialized quantity
types will stop working in a subsequent commit.

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

Author: shsms

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_battery_power_formula.py

@@ -43,7 +43,7 @@ def generate(
                 in the component graph.
         """
         builder = self._get_builder(
-            "battery-power", ComponentMetricId.ACTIVE_POWER, Power
+            "battery-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
         )
         component_ids = self._config.component_ids
         if not component_ids:

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_chp_power_formula.py

@@ -38,7 +38,9 @@ def generate(self) -> FormulaEngine[Power]:
             FormulaGenerationError: If there's no dedicated meter attached to every CHP.
 
         """
-        builder = self._get_builder("chp-power", ComponentMetricId.ACTIVE_POWER, Power)
+        builder = self._get_builder(
+            "chp-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
+        )
 
         chp_meter_ids = self._get_chp_meters()
         if not chp_meter_ids:

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_consumer_power_formula.py

@@ -35,7 +35,7 @@ def generate(self) -> FormulaEngine[Power]:
                 meter.
         """
         builder = self._get_builder(
-            "consumer-power", ComponentMetricId.ACTIVE_POWER, Power
+            "consumer-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
         )
         component_graph = connection_manager.get().component_graph
         grid_component = next(

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_ev_charger_current_formula.py

@@ -37,21 +37,21 @@ def generate(self) -> FormulaEngine3Phase[Current]:
             # frequency as the other streams.  So we subscribe with a non-existing
             # component id, just to get a `None` message at the resampling interval.
             builder = self._get_builder(
-                "ev-current", ComponentMetricId.ACTIVE_POWER, Current
+                "ev-current", ComponentMetricId.ACTIVE_POWER, Current.from_amperes
             )
             builder.push_component_metric(
                 NON_EXISTING_COMPONENT_ID, nones_are_zeros=True
             )
             engine = builder.build()
             return FormulaEngine3Phase(
                 "ev-current",
-                Current,
+                Current.from_amperes,
                 (engine, engine, engine),
             )
 
         return FormulaEngine3Phase(
             "ev-current",
-            Current,
+            Current.from_amperes,
             (
                 (
                     self._gen_phase_formula(
@@ -76,7 +76,7 @@ def _gen_phase_formula(
         component_ids: abc.Set[int],
         metric_id: ComponentMetricId,
     ) -> FormulaEngine[Current]:
-        builder = self._get_builder("ev-current", metric_id, Current)
+        builder = self._get_builder("ev-current", metric_id, Current.from_amperes)
 
         # generate a formula that just adds values from all EV Chargers.
         for idx, component_id in enumerate(component_ids):

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_ev_charger_power_formula.py

@@ -22,7 +22,9 @@ def generate(self) -> FormulaEngine[Power]:
         Returns:
             A formula engine that calculates total EV Charger power values.
         """
-        builder = self._get_builder("ev-power", ComponentMetricId.ACTIVE_POWER, Power)
+        builder = self._get_builder(
+            "ev-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
+        )
 
         component_ids = self._config.component_ids
         if not component_ids:

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_grid_current_formula.py

@@ -43,7 +43,7 @@ def generate(self) -> FormulaEngine3Phase[Current]:
 
         return FormulaEngine3Phase(
             "grid-current",
-            Current,
+            Current.from_amperes,
             (
                 self._gen_phase_formula(
                     grid_successors, ComponentMetricId.CURRENT_PHASE_1
@@ -62,7 +62,7 @@ def _gen_phase_formula(
         grid_successors: Set[Component],
         metric_id: ComponentMetricId,
     ) -> FormulaEngine[Current]:
-        builder = self._get_builder("grid-current", metric_id, Current)
+        builder = self._get_builder("grid-current", metric_id, Current.from_amperes)
 
         # generate a formula that just adds values from all components that are
         # directly connected to the grid.

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_grid_power_formula.py

@@ -24,7 +24,9 @@ def generate(
         Raises:
             ComponentNotFound: when the component graph doesn't have a `GRID` component.
         """
-        builder = self._get_builder("grid-power", ComponentMetricId.ACTIVE_POWER, Power)
+        builder = self._get_builder(
+            "grid-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
+        )
         component_graph = connection_manager.get().component_graph
         grid_component = next(
             (

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_producer_power_formula.py

@@ -36,7 +36,7 @@ def generate(self) -> FormulaEngine[Power]:
                 meter.
         """
         builder = self._get_builder(
-            "producer_power", ComponentMetricId.ACTIVE_POWER, Power
+            "producer_power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
         )
         component_graph = connection_manager.get().component_graph
         grid_component = next(

src/frequenz/sdk/timeseries/_formula_engine/_formula_generators/_pv_power_formula.py

@@ -34,7 +34,9 @@ def generate(self) -> FormulaEngine[Power]:
         Raises:
             ComponentNotFound: if there are no PV inverters in the component graph.
         """
-        builder = self._get_builder("pv-power", ComponentMetricId.ACTIVE_POWER, Power)
+        builder = self._get_builder(
+            "pv-power", ComponentMetricId.ACTIVE_POWER, Power.from_watts
+        )
 
         pv_meters = self._get_pv_meters()
         if not pv_meters:

tests/timeseries/test_logical_meter.py

@@ -34,7 +34,7 @@ async def test_grid_power_1(self, mocker: MockerFixture) -> None:
             logical_meter._namespace,  # pylint: disable=protected-access
             mockgrid.main_meter_id,
             ComponentMetricId.ACTIVE_POWER,
-            Power,
+            Power.from_watts,
         )
 
         results = []
@@ -73,7 +73,7 @@ async def test_grid_power_2(
                 logical_meter._namespace,  # pylint: disable=protected-access
                 meter_id,
                 ComponentMetricId.ACTIVE_POWER,
-                Power,
+                Power.from_watts,
             )
             for meter_id in mockgrid.meter_ids
         ]