FIX: Add Wind Turbine bindings

Fixes #33

Signed-off-by: Nicolás Hatcher <[email protected]>

Author: nhatcher-frequenz

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "frequenz-microgrid-component-graph-python-bindings"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = "0.27.1"
-frequenz-microgrid-component-graph = "0.2.0"
+frequenz-microgrid-component-graph = "0.3.0"

Cargo.toml

@@ -3,3 +3,4 @@
 ## New Features
 
 - Grid formulas now use single successor meters as fallback components for meters attached to the grid.
+- Adds Wind Turbine bindings

RELEASE_NOTES.md

@@ -292,6 +292,22 @@ class ComponentGraph(Generic[ComponentT, ConnectionT, ComponentIdT]):
                 are not EV chargers.
         """
 
+    def wind_turbine_formula(self, wind_turbine_ids: Set[ComponentIdT] | None) -> str:
+        """Generate the wind turbine formula for this component graph.
+
+        Args:
+            wind_turbine_ids: The set of wind turbine component IDs to include in
+                the formula.  If `None`, all wind turbines in the graph will be
+                included.
+
+        Returns:
+            The wind turbine formula as a string.
+
+        Raises:
+            FormulaGenerationError: if the given component IDs don't exist or
+                are not wind turbines.
+        """
+
     def grid_coalesce_formula(self) -> str:
         """Generate the grid coalesce formula for this component graph.
 

python/frequenz/microgrid_component_graph/__init__.pyi

@@ -10,6 +10,7 @@ struct ComponentClasses<'py> {
     battery: Bound<'py, PyAny>,
     ev_charger: Bound<'py, PyAny>,
     chp: Bound<'py, PyAny>,
+    wind_turbine: Bound<'py, PyAny>,
     battery_inverter: Bound<'py, PyAny>,
     solar_inverter: Bound<'py, PyAny>,
     hybrid_inverter: Bound<'py, PyAny>,
@@ -33,6 +34,7 @@ impl<'py> ComponentClasses<'py> {
                         battery: module.getattr("Battery")?,
                         ev_charger: module.getattr("EvCharger")?,
                         chp: module.getattr("Chp")?,
+                        wind_turbine: module.getattr("WindTurbine")?,
                         battery_inverter: module.getattr("BatteryInverter")?,
                         solar_inverter: module.getattr("SolarInverter")?,
                         hybrid_inverter: module.getattr("HybridInverter")?,
@@ -86,6 +88,10 @@ pub(crate) fn category_from_python_component(
         || object.is(&comp_classes.unspecified_component)
     {
         Ok(cg::ComponentCategory::Unspecified)
+    } else if object.is_instance(&comp_classes.wind_turbine)?
+        || object.is(&comp_classes.wind_turbine)
+    {
+        Ok(cg::ComponentCategory::WindTurbine)
     } else {
         Err(exceptions::PyValueError::new_err(format!(
             "Unsupported component category: {:?}",

src/category.rs

@@ -278,6 +278,18 @@ impl ComponentGraph {
             .map_err(|e| PyErr::new::<FormulaGenerationError, _>(e.to_string()))
     }
 
+    #[pyo3(signature = (wind_turbine_ids=None))]
+    fn wind_turbine_formula(
+        &self,
+        py: Python<'_>,
+        wind_turbine_ids: Option<Bound<'_, PyAny>>,
+    ) -> PyResult<String> {
+        self.graph
+            .wind_turbine_formula(extract_ids(py, wind_turbine_ids)?)
+            .map(|f| f.to_string())
+            .map_err(|e| PyErr::new::<FormulaGenerationError, _>(e.to_string()))
+    }
+
     fn grid_coalesce_formula(&self) -> PyResult<String> {
         self.graph
             .grid_coalesce_formula()

src/graph.rs

@@ -11,6 +11,7 @@
     GridConnectionPoint,
     Meter,
     SolarInverter,
+    WindTurbine,
 )
 
 from frequenz import microgrid_component_graph
@@ -77,3 +78,44 @@ def test_graph_creation() -> None:
         Meter(id=ComponentId(3), microgrid_id=MicrogridId(1)),
         SolarInverter(id=ComponentId(4), microgrid_id=MicrogridId(1)),
     }
+
+
+def test_wind_turbine_graph() -> None:
+    """Test graph creation and formula generation for Wind Turbines."""
+    graph = microgrid_component_graph.ComponentGraph(
+        components={
+            GridConnectionPoint(
+                id=ComponentId(1),
+                microgrid_id=MicrogridId(1),
+                rated_fuse_current=100,
+            ),
+            Meter(id=ComponentId(2), microgrid_id=MicrogridId(1)),
+            WindTurbine(id=ComponentId(3), microgrid_id=MicrogridId(1)),
+        },
+        connections={
+            # Grid -> Meter -> Wind Turbine
+            ComponentConnection(source=ComponentId(1), destination=ComponentId(2)),
+            ComponentConnection(source=ComponentId(2), destination=ComponentId(3)),
+        },
+    )
+
+    # 1. Test Component Retrieval
+    assert graph.components(matching_types=WindTurbine) == {
+        WindTurbine(id=ComponentId(3), microgrid_id=MicrogridId(1))
+    }
+
+    # 2. Test Combined Retrieval (Meter + Wind)
+    assert graph.components(matching_types=[Meter, WindTurbine]) == {
+        Meter(id=ComponentId(2), microgrid_id=MicrogridId(1)),
+        WindTurbine(id=ComponentId(3), microgrid_id=MicrogridId(1)),
+    }
+
+    # 3. Test Formula Generation
+    # The formula usually references the Meter (ID 2) measuring the Turbine (ID 3).
+    assert graph.wind_turbine_formula() == "COALESCE(#3, #2, 0.0)"
+
+    # 4. Test Topology (Successors/Predecessors)
+    # The predecessor of the Wind Turbine (3) should be the Meter (2)
+    assert graph.predecessors(ComponentId(3)) == {
+        Meter(id=ComponentId(2), microgrid_id=MicrogridId(1))
+    }