Workaround for GH #484

Signed-off-by: F.N. Claessen <felix@seita.nl>
FlexMeasures · Nov 11, 2022 · 4713de1 · 4713de1
1 parent 5a3845d
commit 4713de1
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/flexmeasures/data/models/time_series.py b/flexmeasures/data/models/time_series.py
@@ -649,11 +649,28 @@ def search(
 
         bdf_dict = {}
         for sensor in sensors:
+            # Workaround (1st half) for https://github.com/FlexMeasures/flexmeasures/issues/484
+            if event_starts_after is not None:
+                _event_starts_after = (
+                        event_starts_after
+                        - sensor.event_resolution
+                        + timedelta(milliseconds=1)
+                )
+            else:
+                _event_starts_after = event_starts_after
+            if event_ends_before is not None:
+                _event_ends_before = (
+                        event_ends_before
+                        + sensor.event_resolution
+                        - timedelta(milliseconds=1)
+                )
+            else:
+                _event_ends_before = event_ends_before
             bdf = cls.search_session(
                 session=db.session,
                 sensor=sensor,
-                event_starts_after=event_starts_after,
-                event_ends_before=event_ends_before,
+                event_starts_after=_event_starts_after,
+                event_ends_before=_event_ends_before,
                 beliefs_after=beliefs_after,
                 beliefs_before=beliefs_before,
                 horizons_at_least=horizons_at_least,
@@ -690,6 +707,9 @@ def search(
                 bdf = bdf.resample_events(
                     resolution, keep_only_most_recent_belief=most_recent_beliefs_only
                 )
+                # Workaround (2nd half) for https://github.com/FlexMeasures/flexmeasures/issues/484
+                bdf = bdf[bdf.event_starts >= event_starts_after]
+                bdf = bdf[bdf.event_ends <= event_ends_before]
             bdf_dict[bdf.sensor.name] = bdf
 
         if sum_multiple: