Fix/don't break on multi asset flex model with one asset (#1795)

* improve error messages w.r.t. to asset ID

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

* fix: flex model deserialization when multi-sensor flex model is not a list anymore

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

* add changelog entry

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

* remove some long-deprecated code

Signed-off-by: Nicolas Höning <nicolas@seita.nl>

* fix: only convert back to single-asset case in case sensor is not part of the flex-model

Signed-off-by: F.N. Claessen <felix@seita.nl>

* revert: part of db8d0b1

Signed-off-by: F.N. Claessen <felix@seita.nl>

* docs: add extra inline explanations of code-blocks

Signed-off-by: F.N. Claessen <felix@seita.nl>

---------

Signed-off-by: Nicolas Höning <nicolas@seita.nl>
Signed-off-by: F.N. Claessen <felix@seita.nl>
Co-authored-by: F.N. Claessen <felix@seita.nl>
(cherry picked from commit 978066a)

Author: nhoening

documentation/changelog.rst

@@ -11,6 +11,7 @@ Bugfixes
 -----------
 * Support different but still compatible units in time series segments of variable quantities [see `PR #1792 <https://www.github.com/FlexMeasures/flexmeasures/pull/1792>`_]
 * Fix account and `/assets/owned_by` pages rendering, giving them asset icons [see `PR #1772 <https://github.com/FlexMeasures/flexmeasures/pull/1772>`_]
+* Fix bug when sending one sensor in flex-model when triggering schedule on asset [see `PR #1795 <https://github.com/FlexMeasures/flexmeasures/pull/1795>`_]
 * Allow consultants to view client users [see `PR #1755 <https://www.github.com/FlexMeasures/flexmeasures/pull/1755>`_]
 * Fix bug where removed flex-model fields don't show up under the dropdown for new fields, except after a page refresh [see `PR #1775 <https://www.github.com/FlexMeasures/flexmeasures/pull/1775>`_]
 * Fix bug in displaying user audit log (incl. expanding its API schema) [see `PR #1779 <https://github.com/FlexMeasures/flexmeasures/pull/1779>`_]

flexmeasures/data/models/planning/__init__.py

@@ -178,7 +178,6 @@ def collect_flex_config(self):
         """Merge the flex-config from the db (from the asset and its ancestors) with the initialization flex-config.
 
         Note that self.flex_context overrides db_flex_context (from the asset and its ancestors).
-        # todo: also fetch db_flex_model once that exists
         """
         if self.asset is not None:
             asset = self.asset
@@ -193,11 +192,13 @@ def collect_flex_config(self):
         asset_ids = []
         flex_model = self.flex_model.copy()
         if not isinstance(self.flex_model, list):
+            # To enable the matching of the passed flex_model with db_flex_models, we need to find out the asset ID
             if "asset" not in flex_model:
                 if self.asset is not None:
                     flex_model["asset"] = asset.id
                 else:
                     flex_model["asset"] = self.sensor.generic_asset.id
+            # Listify the flex-model for the next code block, which actually does the merging with the db_flex_model
             flex_model = [flex_model]
 
         for flex_model_d in flex_model:
@@ -214,9 +215,12 @@ def collect_flex_config(self):
             v for k, v in db_flex_model.items() if k not in asset_ids
         ]
         combined_flex_model = amended_db_flex_model + amended_flex_model
-        if len(combined_flex_model) == 1:
+        # For the single-asset case, revert the flex-model listification
+        if len(combined_flex_model) == 1 and "sensor" not in combined_flex_model[0]:
+            # Single-asset case
             self.flex_model = combined_flex_model[0]
         else:
+            # Multi-asset case
             self.flex_model = combined_flex_model
 
     def deserialize_config(self):

flexmeasures/data/models/planning/storage.py

@@ -38,7 +38,6 @@
     integrate_time_series,
 )
 from flexmeasures.utils.time_utils import get_max_planning_horizon
-from flexmeasures.utils.coding_utils import deprecated
 from flexmeasures.utils.time_utils import determine_minimum_resampling_resolution
 from flexmeasures.utils.unit_utils import ur, convert_units
 
@@ -1119,15 +1118,17 @@ def _get_device_power_capacity(
                     site_power_capacity = site_power_capacity.get("sensor", None)
                     if site_power_capacity is None:
                         raise ValueError(
-                            "site-power-capacity attribute is a dict, but has no sensor key."
+                            f"site-power-capacity attribute on asset {asset.id} is a dict, but has no sensor key."
                         )
 
                 power_capacities.append(
                     self._ensure_variable_quantity(site_power_capacity, "MW")
                 )
                 continue
 
-            raise ValueError("Power capacity is not defined in the flex-model.")
+            raise ValueError(
+                f"Power capacity on asset {asset.id} is not defined in the flex-model."
+            )
         return power_capacities
 
     def _ensure_variable_quantity(
@@ -1807,24 +1808,3 @@ def prepend_series(series: pd.Series, value) -> pd.Series:
     # sort index to keep the time ordering
     series = series.sort_index()
     return series.shift(1)
-
-
-#####################
-# TO BE DEPRECATED #
-####################
-@deprecated(build_device_soc_values, "0.14")
-def build_device_soc_targets(
-    targets: list[dict[str, datetime | float]] | pd.Series,
-    soc_at_start: float,
-    start_of_schedule: datetime,
-    end_of_schedule: datetime,
-    resolution: timedelta,
-) -> pd.Series:
-    return build_device_soc_values(
-        targets, soc_at_start, start_of_schedule, end_of_schedule, resolution
-    )
-
-
-StorageScheduler.compute_schedule = deprecated(StorageScheduler.compute, "0.14")(
-    StorageScheduler.compute_schedule
-)