Fix #31 energy_current_hour will show wrong value with paid subscription (#37)

* #31 Correction of energy_current_hour evaluation

* Cleanup and typos corrections

* Fix black error

Author: koleo9am

forecast_solar/models.py

@@ -26,6 +26,26 @@ def _timed_value(at: datetime, data: dict[datetime, int]) -> int | None:
     return None
 
 
+def _interval_value_sum(
+    interval_begin: datetime, interval_end: datetime, data: dict[datetime, int]
+) -> int:
+    """Return the sum of values in interval."""
+
+    total = 0
+
+    for timestamp, wh in data.items():
+        # Skip all until this hour
+        if timestamp < interval_begin:
+            continue
+
+        if timestamp >= interval_end:
+            break
+
+        total += wh
+
+    return total
+
+
 class AccountType(str, Enum):
     """Enumeration representing the Forecast.Solar account type."""
 
@@ -77,9 +97,11 @@ def energy_production_tomorrow(self) -> int:
     @property
     def energy_production_today_remaining(self) -> int:
         """Return estimated energy produced in rest of today."""
-        return self.sum_energy_production_in_interval(
+        return _interval_value_sum(
             self.now(),
-            self.now().replace(hour=0, minute=0, second=0) + timedelta(days=1),
+            self.now().replace(hour=0, minute=0, second=0, microsecond=0)
+            + timedelta(days=1),
+            self.wh_period,
         )
 
     @property
@@ -100,7 +122,11 @@ def power_highest_peak_time_tomorrow(self) -> datetime:
     @property
     def energy_current_hour(self) -> int:
         """Return the estimated energy production for the current hour."""
-        return _timed_value(self.now(), self.wh_period) or 0
+        return _interval_value_sum(
+            self.now().replace(minute=0, second=0, microsecond=0),
+            self.now().replace(minute=0, second=0, microsecond=0) + timedelta(hours=1),
+            self.wh_period,
+        )
 
     def day_production(self, specific_date: date) -> int:
         """Return the day production."""
@@ -133,29 +159,10 @@ def power_production_at_time(self, time: datetime) -> int:
 
     def sum_energy_production(self, period_hours: int) -> int:
         """Return the sum of the energy production."""
-        now = self.now().replace(minute=59, second=59)
+        now = self.now().replace(minute=59, second=59, microsecond=999)
         until = now + timedelta(hours=period_hours)
 
-        return self.sum_energy_production_in_interval(now, until)
-
-    def sum_energy_production_in_interval(
-        self, interval_begin: datetime, interval_end: datetime
-    ) -> int:
-        """Return the sum of the energy production in interval."""
-
-        total = 0
-
-        for timestamp, wh in self.wh_period.items():
-            # Skip all dates until this hour
-            if timestamp < interval_begin:
-                continue
-
-            if timestamp > interval_end:
-                break
-
-            total += wh
-
-        return total
+        return _interval_value_sum(now, until, self.wh_period)
 
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> Estimate:

tests/test_models.py

@@ -16,7 +16,8 @@ def test_estimate_previous_day(patch_previous_day):
     assert estimate.energy_production_tomorrow == 5435
 
     assert estimate.power_production_now == 0
-    assert estimate.energy_current_hour == 140
+    # production this hour at 23:48 is zero
+    assert estimate.energy_current_hour == 0
 
     assert estimate.power_highest_peak_time_today == datetime.fromisoformat(
         "2022-10-15T15:00:00+02:00"
@@ -70,7 +71,8 @@ def test_estimate_near_end(patch_near_end_today):
     assert estimate.energy_production_tomorrow == 5435
 
     assert estimate.power_production_now == 337
-    assert estimate.energy_current_hour == 502
+    # production this hour at 16:48 is sum of values between 16:00 and 16:59:59.999
+    assert estimate.energy_current_hour == 642
 
     assert estimate.power_highest_peak_time_today == datetime.fromisoformat(
         "2022-10-15T15:00:00+02:00"