Issue 499 allow showing sensor data from other assets in the same account

documentation/changelog.rst

@@ -9,6 +9,7 @@ New features
 -------------
 
 * Hit the replay button to replay what happened, available on the sensor and asset pages [see `PR #463 <http://www.github.com/FlexMeasures/flexmeasures/pull/463>`_]
+* The asset page also allows to show sensor data from other assets that belong to the same account [see `PR #500 <http://www.github.com/FlexMeasures/flexmeasures/pull/500>`_]
 * Improved import of time series data from CSV file: 1) drop duplicate records with warning, and 2) allow configuring which column contains explicit recording times for each data point (use case: import forecasts) [see `PR #501 <http://www.github.com/FlexMeasures/flexmeasures/pull/501>`_]
 
 Bugfixes

flexmeasures/api/v3_0/sensors.py

@@ -110,7 +110,7 @@ def index(self, account: Account):
         :status 403: INVALID_SENDER
         :status 422: UNPROCESSABLE_ENTITY
         """
-        sensors = get_sensors(account_name=account.name)
+        sensors = get_sensors(accounts=[account])
         return sensors_schema.dump(sensors), 200
 
     @route("/data", methods=["POST"])

flexmeasures/data/models/generic_assets.py

@@ -431,18 +431,26 @@ def search_beliefs(
     def sensors_to_show(self) -> List["Sensor"]:  # noqa F821
         """Sensors to show, as defined by the sensors_to_show attribute.
 
+        Sensors to show are defined as a list of sensor ids, which
+        is set by the "sensors_to_show" field of the asset's "attributes" column.
+        Valid sensors either belong to the asset itself, to other assets in the same account,
+        or to public assets.
+
+
         Defaults to two of the asset's sensors.
         """
         if not self.has_attribute("sensors_to_show"):
             return self.sensors[:2]
 
-        from flexmeasures.data.services.sensors import get_public_sensors
+        from flexmeasures.data.services.sensors import get_sensors
 
         sensor_ids = self.get_attribute("sensors_to_show")
         sensor_map = {
             sensor.id: sensor
-            for sensor in self.sensors + get_public_sensors(sensor_ids)
-            if sensor.id in sensor_ids
+            for sensor in get_sensors(
+                accounts=[self.owner, None],  # include public sensors
+                filter_by_sensor_ids=sensor_ids,
+            )
         }
 
         # Return sensors in the order given by the sensors_to_show attribute

flexmeasures/data/services/sensors.py

@@ -1,43 +1,36 @@
 from __future__ import annotations
 
-from werkzeug.exceptions import NotFound
+import sqlalchemy as sa
 
 from flexmeasures import Sensor, Account
 from flexmeasures.data.models.generic_assets import GenericAsset
 
 
 def get_sensors(
-    account_name: str | None = None,
+    accounts: list[Account | None] = None,
+    filter_by_sensor_ids: list[int] | None = None,
 ) -> list[Sensor]:
-    """Return a list of Sensor objects.
+    """Return a list of Sensor objects that belong to any of the given accounts, and/or public sensors.
 
-    :param account_name: optionally, filter by account name.
+    :param accounts:             optionally, select only sensors from this list of accounts
+                                 (include None to select sensors that belong to a public asset).
+    :param filter_by_sensor_ids: optionally, filter by sensor id.
     """
     sensor_query = Sensor.query
-
-    if account_name is not None:
-        account = Account.query.filter(Account.name == account_name).one_or_none()
-        if not account:
-            raise NotFound(f"There is no account named {account_name}!")
-        sensor_query = (
-            sensor_query.join(GenericAsset)
-            .filter(Sensor.generic_asset_id == GenericAsset.id)
-            .filter(GenericAsset.owner == account)
+    if accounts is not None:
+        account_ids = [account.id for account in accounts if account is not None]
+        sensor_query = sensor_query.join(GenericAsset).filter(
+            Sensor.generic_asset_id == GenericAsset.id
         )
-
-    return sensor_query.all()
-
-
-def get_public_sensors(sensor_ids: list[int] | None = None) -> list[Sensor]:
-    """Return a list of Sensor objects that belong to a public asset.
-
-    :param sensor_ids: optionally, filter by sensor id.
-    """
-    sensor_query = (
-        Sensor.query.join(GenericAsset)
-        .filter(Sensor.generic_asset_id == GenericAsset.id)
-        .filter(GenericAsset.account_id.is_(None))
-    )
-    if sensor_ids:
-        sensor_query = sensor_query.filter(Sensor.id.in_(sensor_ids))
+        if None in accounts:
+            sensor_query = sensor_query.filter(
+                sa.or_(
+                    GenericAsset.account_id.in_(account_ids),
+                    GenericAsset.account_id.is_(None),
+                )
+            )
+        else:
+            sensor_query = sensor_query.filter(GenericAsset.account_id.in_(account_ids))
+    if filter_by_sensor_ids:
+        sensor_query = sensor_query.filter(Sensor.id.in_(filter_by_sensor_ids))
     return sensor_query.all()