FlexMeasures
diff --git a/‎documentation/changelog.rst‎
Lines changed: 3 additions & 0 deletions b/‎documentation/changelog.rst‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎documentation/views/asset-data.rst‎
Lines changed: 5 additions & 4 deletions b/‎documentation/views/asset-data.rst‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎flexmeasures/api/v3_0/assets.py‎
Lines changed: 2 additions & 4 deletions b/‎flexmeasures/api/v3_0/assets.py‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎flexmeasures/cli/data_add.py‎
Lines changed: 20 additions & 8 deletions b/‎flexmeasures/cli/data_add.py‎
Lines changed: 20 additions & 8 deletions
diff --git a/‎flexmeasures/conftest.py‎
Lines changed: 25 additions & 0 deletions b/‎flexmeasures/conftest.py‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎flexmeasures/data/migrations/versions/e690d373a3d9_copy_Power_Price_Weather_time_series_data_to_TimedBeliefs_table.py‎
Lines changed: 1 addition & 1 deletion b/‎flexmeasures/data/migrations/versions/e690d373a3d9_copy_Power_Price_Weather_time_series_data_to_TimedBeliefs_table.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎flexmeasures/data/models/charts/__init__.py‎
Lines changed: 1 addition & 0 deletions b/‎flexmeasures/data/models/charts/__init__.py‎
Lines changed: 1 addition & 0 deletions
@@ -84,6 +84,9 @@ New features
 * Support creating schedules with only information known prior to some time, now also via the CLI (the API already supported it) [see `PR #1871 <https://www.github.com/FlexMeasures/flexmeasures/pull/1871>`_].
 * Added capability to update an asset's parent from the UI [`PR #1957 <https://www.github.com/FlexMeasures/flexmeasures/pull/1957>`_]
 * Add ``fields`` param to the asset-listing endpoints, to save bandwidth in response data [see `PR #1884 <https://www.github.com/FlexMeasures/flexmeasures/pull/1884>`_]
+* Support for flex-config in the ``SensorsToShowSchema`` [see `PR #1904 <https://www.github.com/FlexMeasures/flexmeasures/pull/1904>`_]
+* Upgrade graph modal to support flex-config references in plots  [see `PR #1926 <https://www.github.com/FlexMeasures/flexmeasures/pull/1926>`_]
+
 
   .. note:: For backwards-compatibility, the new ``fields`` parameter will only be fully active, i.e. also returning less fields per default, in v0.32. Set ``FLEXMEASURES_API_SUNSET_ACTIVE=True`` to test the full effect now.
 
 
@@ -108,19 +108,20 @@ Editing the graphs dashboard
 
 Click the "Edit Graph" button to open the graph editor.
 
-Use the "Add Graph" button to create graphs. For each graph, you can select one or more sensors, from all available sensors associated with the asset, including public sensors, and add them to your plot.  
+Use the "Add Graph" button to create graphs. For each graph, you can select one or more sensors, from all available sensors associated with the asset, including public sensors, and add them to your plot.
 
-You can overlay data from multiple sensors on a single graph. To do this, click on an existing plot and add more sensors from the available options on the right. 
+In addition, you can add an asset's flex-config to the graph, as long as the value of that config is a sensor(e.g. `[{"title":"Power","plots":[{"sensor":2}]},{"title":"Costs","plots":[{"sensors":[5,6]}]}]`).
 
-Finally, it is possible to set custom titles for any sensor graph by clicking on the "edit" button right next to the default or current title.
+Finally, it is possible to set custom titles for any graph by clicking on the "edit" button right next to the default or current title.
 
 .. image:: https://github.com/FlexMeasures/screenshots/raw/main/screenshot-asset-editgraph.png
     :align: center
 ..    :scale: 40%
 
 |
 
-Internally, the asset has a `sensors_to_show` field, which controls which sensor data appears in the plot. This can also be set by a script. The accepted format is a dictionary with a graph title and a lists of sensor IDs (e.g. `[{"title": "Power", "sensor": 2}, {"title": "Costs", "sensors": [5,6] }]`).
+Internally, the asset has a `sensors_to_show` field, which controls which sensor data appears in the plot. This can also be set by a script or through the API. 
+The accepted format is a dictionary with a graph title followed by a plot containing senors or asset flex-config reference (e.g. `[{"title":"Power","plots":[{"sensor":2}]},{"title":"Costs","plots":[{"sensor":5},{"asset":10,"flex-model":"soc-min"},]}]`).
 
 
 Showing daily KPIs
 
@@ -50,6 +50,7 @@
     GenericAssetSchema as AssetSchema,
     GenericAssetIdField as AssetIdField,
     GenericAssetTypeSchema as AssetTypeSchema,
+    SensorsToShowSchema,
 )
 from flexmeasures.data.schemas.scheduling import AssetTriggerSchema
 from flexmeasures.data.services.scheduling import (
@@ -63,9 +64,6 @@
 )
 from flexmeasures.api.common.schemas.users import AccountIdField
 from flexmeasures.api.common.schemas.assets import default_response_fields
-from flexmeasures.utils.coding_utils import (
-    flatten_unique,
-)
 from flexmeasures.ui.utils.view_utils import clear_session, set_session_variables
 from flexmeasures.auth.policy import check_access
 from flexmeasures.data.schemas.sensors import (
@@ -913,7 +911,7 @@ def get_chart_data(self, id: int, asset: GenericAsset, **kwargs):
           tags:
             - Assets
         """
-        sensors = flatten_unique(asset.validate_sensors_to_show())
+        sensors = SensorsToShowSchema.flatten(asset.validate_sensors_to_show())
         return asset.search_beliefs(sensors=sensors, as_json=True, **kwargs)
 
     @route("/<id>/auditlog")
 
@@ -1826,19 +1826,31 @@ def create_asset_with_one_sensor(
         db.session.flush()
         battery = discharging_sensor.generic_asset
         battery.sensors_to_show = [
-            {"title": "Prices", "sensor": day_ahead_sensor.id},
+            {"title": "Prices", "plots": [{"sensor": day_ahead_sensor.id}]},
             {
                 "title": "Power flows",
-                "sensors": [production_sensor.id, discharging_sensor.id],
+                "plots": [
+                    {"sensors": [production_sensor.id, discharging_sensor.id]},
+                ],
             },
         ]
 
         # the site gets a similar dashboard (TODO: after #1801, add also capacity constraint)
         building_asset.sensors_to_show = [
-            {"title": "Prices", "sensor": day_ahead_sensor.id},
+            {
+                "title": "Prices",
+                "plots": [
+                    {
+                        "asset": building_asset.id,
+                        "flex-context": "consumption-price",
+                    }
+                ],
+            },
             {
                 "title": "Power flows",
-                "sensors": [production_sensor.id, discharging_sensor.id],
+                "plots": [
+                    {"sensors": [production_sensor.id, discharging_sensor.id]},
+                ],
             },
         ]
 
@@ -1878,10 +1890,10 @@ def create_asset_with_one_sensor(
 
         process = shiftable_power.generic_asset
         process.sensors_to_show = [
-            {"title": "Prices", "sensor": day_ahead_sensor.id},
-            {"title": "Inflexible", "sensor": inflexible_power.id},
-            {"title": "Breakable", "sensor": breakable_power.id},
-            {"title": "Shiftable", "sensor": shiftable_power.id},
+            {"title": "Prices", "plots": [{"sensor": day_ahead_sensor.id}]},
+            {"title": "Inflexible", "plots": [{"sensor": inflexible_power.id}]},
+            {"title": "Breakable", "plots": [{"sensor": breakable_power.id}]},
+            {"title": "Shiftable", "plots": [{"sensor": shiftable_power.id}]},
         ]
 
         db.session.commit()
 
@@ -548,6 +548,31 @@ def create_assets(
             ),
         )
         db.session.add(sensor)
+        scc_sensor = Sensor(
+            name="site-consumption-capacity",
+            generic_asset=asset,
+            event_resolution=timedelta(minutes=15),
+            unit="MW",
+        )
+        db.session.add(scc_sensor)
+        cc_sensor = Sensor(
+            name="consumption-capacity",
+            generic_asset=asset,
+            event_resolution=timedelta(minutes=15),
+            unit="MW",
+        )
+        db.session.add(cc_sensor)
+        pc_sensor = Sensor(
+            name="production-capacity",
+            generic_asset=asset,
+            event_resolution=timedelta(minutes=15),
+            unit="MW",
+        )
+        db.session.add(pc_sensor)
+        db.session.flush()  # assign sensor IDs
+        asset.flex_model["consumption-capacity"] = {"sensor": cc_sensor.id}
+        asset.flex_model["production-capacity"] = {"sensor": pc_sensor.id}
+        asset.flex_context["site-consumption-capacity"] = {"sensor": scc_sensor.id}
         assets.append(asset)
 
         # one day of test data (one complete sine curve)
 
@@ -118,7 +118,7 @@ def copy_time_series_data(
     # Copy in batches and report on progress
     for i in range(len(results) // batch_size + 1):
         if i > 0:
-            print(f"  - done copying {i*batch_size} rows...")
+            print(f"  - done copying {i * batch_size} rows...")
 
         insert_values = []
         for values in results[i * batch_size : (i + 1) * batch_size]:
 
@@ -19,6 +19,7 @@ def chart_type_to_chart_specs(chart_type: str, **kwargs) -> dict:
         for chart_type, chart_specs in getmembers(belief_charts)
         if isfunction(chart_specs) or isinstance(chart_specs, dict)
     }
+
     # Create chart specs
     chart_specs_or_fnc = belief_charts_mapping[chart_type]
     if isfunction(chart_specs_or_fnc):
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ def chart_type_to_chart_specs(chart_type: str, **kwargs) -> dict:`
`19`	`19`	`for chart_type, chart_specs in getmembers(belief_charts)`
`20`	`20`	`if isfunction(chart_specs) or isinstance(chart_specs, dict)`
`21`	`21`	`}`
	`22`	`+`
`22`	`23`	`# Create chart specs`
`23`	`24`	`chart_specs_or_fnc = belief_charts_mapping[chart_type]`
`24`	`25`	`if isfunction(chart_specs_or_fnc):`