Adjust time handling for solar forecast calculations

felixschndr · Dec 7, 2024 · 16024dd · 16024dd
1 parent 9f6ed04
commit 16024dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/source/main.py b/source/main.py
@@ -14,8 +14,12 @@ def log_solar_forecast(log_as_review: bool = False) -> None:
     sun_forecast_handler = SunForecastHandler()
     deprecated_sun_forecast_handler = DeprecatedSunForecastHandler()
 
-    start = datetime.now(tz=TimeHandler.get_timezone()).replace(hour=0, minute=0, second=0, microsecond=0)
-    end = start + timedelta(days=1)
+    now = datetime.now(tz=TimeHandler.get_timezone())
+    start = now.replace(hour=5, minute=0, second=0, microsecond=0)
+    end = now.replace(hour=23, minute=0, second=0, microsecond=0)
+    if log_as_review:
+        end -= timedelta(minutes=2)
+
     solar_output_today = sun_forecast_handler.get_solar_output_in_timeframe(start, end)
     solar_output_today_deprecated = deprecated_sun_forecast_handler.get_expected_solar_output_of_today()
     if log_as_review:

diff --git a/source/sun_forecast_handler.py b/source/sun_forecast_handler.py
@@ -40,8 +40,8 @@ def _get_debug_solar_output(self) -> EnergyAmount:
     def get_solar_output_in_timeframe(self, timestamp_start: datetime, timestamp_end: datetime) -> EnergyAmount:
         solar_data = []
 
-        now = datetime.now(tz=(TimeHandler.get_timezone())) - timedelta(
-            minutes=1
+        now = datetime.now(tz=(TimeHandler.get_timezone())).replace(second=0, microsecond=0) - timedelta(
+            seconds=1
         )  # Account for execution times of the program
         if timestamp_start >= now or timestamp_end >= now:
             self.log.trace("Need to retrieve forecast data")