Merge 75fbdc3 into e4c77cc

FlexMeasures · May 31, 2023 · 83a8e1c · 83a8e1c
2 parents e4c77cc + 75fbdc3
commit 83a8e1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/flexmeasures/data/models/reporting/__init__.py b/flexmeasures/data/models/reporting/__init__.py
@@ -75,7 +75,7 @@ def fetch_data(
             )
 
             # store data source as local variable
-            for source in bdf.sources.unique():
+            for source in bdf.sources.unique().dropna():
                 self.data[f"source_{source.id}"] = source
 
             # store BeliefsDataFrame as local variable

diff --git a/flexmeasures/data/models/reporting/pandas_reporter.py b/flexmeasures/data/models/reporting/pandas_reporter.py
@@ -5,6 +5,7 @@
 
 from flask import current_app
 import timely_beliefs as tb
+import pandas as pd
 
 from flexmeasures.data.models.reporting import Reporter
 from flexmeasures.data.schemas.reporting.pandas_reporter import (
@@ -84,6 +85,18 @@ def _compute(
             ]
             final_output = tb.BeliefsDataFrame(timed_beliefs)
 
+        # use event_starts frequency when final_output event resolution
+        # does not correspond with the event resolution of the output sensor
+        event_frequency = final_output.event_starts.inferred_freq
+
+        if event_frequency:
+            event_frequency = pd.to_timedelta(
+                pd.tseries.frequencies.to_offset(event_frequency)
+            ).to_pytimedelta()
+
+            if final_output.event_resolution != final_output.sensor.event_resolution:
+                final_output.event_resolution = event_frequency
+
         return final_output
 
     def get_object_or_literal(self, value: Any, method: str) -> Any: