fix: gather inflexible device sensors from nested commodities entries too

Addresses Copilot review on #2358: get_inflexible_device_sensors only
inspected the top-level flex-context keys, omitting inflexible devices
configured within per-commodity contexts from sensor status/metadata.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TaMepbxRYzJxQKFtu6Hq4p
Signed-off-by: F.N. Claessen <felix@seita.nl>

Author: Flix6x

flexmeasures/data/models/generic_assets.py

@@ -847,20 +847,23 @@ def get_inflexible_device_sensors(self):
         """
         Searches for inflexible device sensors upwards on the asset tree, across the
         deprecated ``inflexible-device-sensors`` key (bare sensor IDs) and the
-        ``inflexible-consumption``/``inflexible-production`` keys (sensor references).
+        ``inflexible-consumption``/``inflexible-production`` keys (sensor references),
+        both top-level and within each nested ``commodities`` entry.
         This search will stop once any sensors are found (will not aggregate towards the top of the tree)
         """
 
         from flexmeasures.data.models.time_series import Sensor
         from flexmeasures.data.models.planning.devices import INFLEXIBLE_DEVICE_KEYS
 
         flex_context = self.get_flex_context()
+        contexts = [flex_context] + list(flex_context.get("commodities") or [])
         # Need to load inflexible device sensors manually as generic_asset does not get to SQLAlchemy session context.
         sensor_ids = list(
             dict.fromkeys(  # dedupe, preserving order
                 entry["sensor"] if isinstance(entry, dict) else entry
+                for context in contexts
                 for key in INFLEXIBLE_DEVICE_KEYS
-                for entry in (flex_context.get(key) or [])
+                for entry in (context.get(key) or [])
             )
         )
         if sensor_ids:

flexmeasures/data/tests/test_generic_assets.py

@@ -354,7 +354,8 @@ def test_get_inflexible_device_sensors_across_keys(
     fresh_db, setup_generic_asset_types_fresh_db, setup_accounts_fresh_db
 ):
     """Inflexible device sensors are gathered from all three flex-context keys,
-    walking up the asset tree until any of them is found."""
+    both top-level and within nested commodities entries, walking up the asset
+    tree until any of them is found."""
     db = fresh_db
     asset_type = setup_generic_asset_types_fresh_db["battery"]
     owner = setup_accounts_fresh_db["Prosumer"]
@@ -365,13 +366,20 @@ def test_get_inflexible_device_sensors_across_keys(
     db.session.flush()
     load_sensor = Sensor(name="a load", generic_asset=site, unit="kW")
     pv_sensor = Sensor(name="a pv", generic_asset=site, unit="kW")
-    db.session.add_all([load_sensor, pv_sensor])
+    boiler_sensor = Sensor(name="a boiler", generic_asset=site, unit="kW")
+    db.session.add_all([load_sensor, pv_sensor, boiler_sensor])
     db.session.flush()
     site.flex_context = {
         "inflexible-consumption": [{"sensor": load_sensor.id}],
         "inflexible-production": [
             {"sensor": pv_sensor.id, "exclude-source-types": ["scheduler"]}
         ],
+        "commodities": [
+            {
+                "commodity": "gas",
+                "inflexible-consumption": [{"sensor": boiler_sensor.id}],
+            }
+        ],
     }
     leaf = GenericAsset(
         name="gathering battery",
@@ -382,5 +390,6 @@ def test_get_inflexible_device_sensors_across_keys(
     db.session.add(leaf)
     db.session.commit()
 
-    assert set(leaf.get_inflexible_device_sensors()) == {load_sensor, pv_sensor}
-    assert set(site.get_inflexible_device_sensors()) == {load_sensor, pv_sensor}
+    expected_sensors = {load_sensor, pv_sensor, boiler_sensor}
+    assert set(leaf.get_inflexible_device_sensors()) == expected_sensors
+    assert set(site.get_inflexible_device_sensors()) == expected_sensors