Update formula generators to work with new FormulaEngine interface

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

Author: shsms

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

@@ -16,7 +16,7 @@
 class BatteryPowerFormula(FormulaGenerator):
     """Creates a formula engine from the component graph for calculating grid power."""
 
-    async def generate(
+    def generate(
         self,
     ) -> FormulaEngine:
         """Make a formula for the cumulative AC battery power of a microgrid.
@@ -54,14 +54,14 @@ async def generate(
             # If there are no battery inverters, we have to send 0 values as the same
             # frequency as the other streams.  So we subscribe with a non-existing
             # component id, just to get a `None` message at the resampling interval.
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 NON_EXISTING_COMPONENT_ID, nones_are_zeros=True
             )
             return builder.build()
 
         for idx, comp in enumerate(battery_inverters):
             if idx > 0:
                 builder.push_oper("+")
-            await builder.push_component_metric(comp.component_id, nones_are_zeros=True)
+            builder.push_component_metric(comp.component_id, nones_are_zeros=True)
 
         return builder.build()

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

@@ -17,7 +17,7 @@
 class EVChargerCurrentFormula(FormulaGenerator):
     """Create a formula engine from the component graph for calculating grid current."""
 
-    async def generate(self) -> FormulaEngine3Phase:
+    def generate(self) -> FormulaEngine3Phase:
         """Generate a formula for calculating total EV current for given component ids.
 
         Returns:
@@ -35,37 +35,37 @@ async def generate(self) -> FormulaEngine3Phase:
             # 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)
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 NON_EXISTING_COMPONENT_ID, nones_are_zeros=True
             )
             engine = builder.build()
             return FormulaEngine3Phase(
                 "ev-current",
-                (engine.new_receiver(), engine.new_receiver(), engine.new_receiver()),
+                (engine, engine, engine),
             )
 
         return FormulaEngine3Phase(
             "ev-current",
             (
                 (
-                    await self._gen_phase_formula(
+                    self._gen_phase_formula(
                         component_ids, ComponentMetricId.CURRENT_PHASE_1
                     )
-                ).new_receiver(),
+                ),
                 (
-                    await self._gen_phase_formula(
+                    self._gen_phase_formula(
                         component_ids, ComponentMetricId.CURRENT_PHASE_2
                     )
-                ).new_receiver(),
+                ),
                 (
-                    await self._gen_phase_formula(
+                    self._gen_phase_formula(
                         component_ids, ComponentMetricId.CURRENT_PHASE_3
                     )
-                ).new_receiver(),
+                ),
             ),
         )
 
-    async def _gen_phase_formula(
+    def _gen_phase_formula(
         self,
         component_ids: set[int],
         metric_id: ComponentMetricId,
@@ -77,6 +77,6 @@ async def _gen_phase_formula(
             if idx > 0:
                 builder.push_oper("+")
 
-            await builder.push_component_metric(component_id, nones_are_zeros=True)
+            builder.push_component_metric(component_id, nones_are_zeros=True)
 
         return builder.build()

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

@@ -15,7 +15,7 @@
 class EVChargerPowerFormula(FormulaGenerator):
     """Create a formula engine from the component graph for calculating grid power."""
 
-    async def generate(self) -> FormulaEngine:
+    def generate(self) -> FormulaEngine:
         """Generate a formula for calculating total EV power for given component ids.
 
         Returns:
@@ -33,7 +33,7 @@ async def generate(self) -> FormulaEngine:
             # If there are no EV Chargers, we have to send 0 values as the same
             # frequency as the other streams. So we subscribe with a non-existing
             # component id, just to get a `None` message at the resampling interval.
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 NON_EXISTING_COMPONENT_ID, nones_are_zeros=True
             )
             return builder.build()
@@ -42,6 +42,6 @@ async def generate(self) -> FormulaEngine:
             if idx > 0:
                 builder.push_oper("+")
 
-            await builder.push_component_metric(component_id, nones_are_zeros=True)
+            builder.push_component_metric(component_id, nones_are_zeros=True)
 
         return builder.build()

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

@@ -8,13 +8,12 @@
 import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Generic
 
 from frequenz.channels import Sender
 
 from ....actor import ChannelRegistry, ComponentMetricRequest
 from ....microgrid.component import ComponentMetricId
-from .._formula_engine import _GenericEngine
+from .._formula_engine import FormulaEngine, FormulaEngine3Phase
 from .._resampled_formula_builder import ResampledFormulaBuilder
 
 
@@ -36,7 +35,7 @@ class FormulaGeneratorConfig:
     component_ids: set[int] | None = None
 
 
-class FormulaGenerator(ABC, Generic[_GenericEngine]):
+class FormulaGenerator(ABC):
     """A class for generating formulas from the component graph."""
 
     def __init__(
@@ -74,5 +73,5 @@ def _get_builder(
         return builder
 
     @abstractmethod
-    async def generate(self) -> _GenericEngine:
+    def generate(self) -> FormulaEngine | FormulaEngine3Phase:
         """Generate a formula engine, based on the component graph."""

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

@@ -14,7 +14,7 @@
 class GridCurrentFormula(FormulaGenerator):
     """Create a formula engine from the component graph for calculating grid current."""
 
-    async def generate(self) -> FormulaEngine3Phase:
+    def generate(self) -> FormulaEngine3Phase:
         """Generate a formula for calculating grid current from the component graph.
 
         Returns:
@@ -43,25 +43,19 @@ async def generate(self) -> FormulaEngine3Phase:
         return FormulaEngine3Phase(
             "grid-current",
             (
-                (
-                    await self._gen_phase_formula(
-                        grid_successors, ComponentMetricId.CURRENT_PHASE_1
-                    )
-                ).new_receiver(),
-                (
-                    await self._gen_phase_formula(
-                        grid_successors, ComponentMetricId.CURRENT_PHASE_2
-                    )
-                ).new_receiver(),
-                (
-                    await self._gen_phase_formula(
-                        grid_successors, ComponentMetricId.CURRENT_PHASE_3
-                    )
-                ).new_receiver(),
+                self._gen_phase_formula(
+                    grid_successors, ComponentMetricId.CURRENT_PHASE_1
+                ),
+                self._gen_phase_formula(
+                    grid_successors, ComponentMetricId.CURRENT_PHASE_2
+                ),
+                self._gen_phase_formula(
+                    grid_successors, ComponentMetricId.CURRENT_PHASE_3
+                ),
             ),
         )
 
-    async def _gen_phase_formula(
+    def _gen_phase_formula(
         self,
         grid_successors: Set[Component],
         metric_id: ComponentMetricId,
@@ -90,7 +84,7 @@ async def _gen_phase_formula(
             else:
                 continue
 
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 comp.component_id, nones_are_zeros=nones_are_zeros
             )
 

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

@@ -12,7 +12,7 @@
 class GridPowerFormula(FormulaGenerator):
     """Creates a formula engine from the component graph for calculating grid power."""
 
-    async def generate(
+    def generate(
         self,
     ) -> FormulaEngine:
         """Generate a formula for calculating grid power from the component graph.
@@ -63,7 +63,7 @@ async def generate(
             else:
                 continue
 
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 comp.component_id, nones_are_zeros=nones_are_zeros
             )
 

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

@@ -16,7 +16,7 @@
 class PVPowerFormula(FormulaGenerator):
     """Creates a formula engine for calculating the PV power production."""
 
-    async def generate(self) -> FormulaEngine:
+    def generate(self) -> FormulaEngine:
         """Make a formula for the PV power production of a microgrid.
 
         Returns:
@@ -44,7 +44,7 @@ async def generate(self) -> FormulaEngine:
             # If there are no PV inverters, we have to send 0 values as the same
             # frequency as the other streams.  So we subscribe with a non-existing
             # component id, just to get a `None` message at the resampling interval.
-            await builder.push_component_metric(
+            builder.push_component_metric(
                 NON_EXISTING_COMPONENT_ID, nones_are_zeros=True
             )
             return builder.build()
@@ -53,6 +53,6 @@ async def generate(self) -> FormulaEngine:
             if idx > 0:
                 builder.push_oper("+")
 
-            await builder.push_component_metric(comp.component_id, nones_are_zeros=True)
+            builder.push_component_metric(comp.component_id, nones_are_zeros=True)
 
         return builder.build()