Improve daily_energy_consumption w/ different client tz

Request some days from the past and some days from the future -> receive
the latest day bucket.

Author: Vilppu Vuorinen

pymelcloud/client.py

@@ -197,21 +197,19 @@ async def fetch_device_state(self, device) -> Optional[Dict[Any, Any]]:
             return await resp.json()
 
     async def fetch_energy_report(self, device) -> Optional[Dict[Any, Any]]:
-        """Fetch energy report for the current day.
-
-        The energy report rolls over at midnight MELCloud time.
-        """
+        """Fetch energy report containing today and 1-2 days from the past."""
         device_id = device.device_id
-        today_str = datetime.today().strftime("%Y-%m-%d")
-        tomorrow_str = (datetime.today() + timedelta(days=1)).strftime("%Y-%m-%d")
+        from_str = (datetime.today() - timedelta(days=2)).strftime("%Y-%m-%d")
+        to_str = (datetime.today() + timedelta(days=2)).strftime("%Y-%m-%d")
+
         async with self._session.post(
             f"{BASE_URL}/EnergyCost/Report",
             headers=_headers(self._token),
             json={
                 "DeviceId": device_id,
                 "UseCurrency": False,
-                "FromDate": f"{today_str}T00:00:00",
-                "ToDate": f"{tomorrow_str}T00:00:00"
+                "FromDate": f"{from_str}T00:00:00",
+                "ToDate": f"{to_str}T00:00:00"
             },
             raise_for_status=True,
         ) as resp:

pymelcloud/device.py

@@ -199,16 +199,27 @@ def power(self) -> Optional[bool]:
     def daily_energy_consumed(self) -> Optional[float]:
         """Return daily energy consumption for the current day in kWh.
 
-        The value resets at midnight MELCloud time.
+        The value resets at midnight MELCloud time. The logic here is a bit iffy and
+        fragmented between Device and Client. Here's how it goes:
+          - Client requests a 5 day report. Today, 2 days from the past and 2 days from
+            the past.
+          - MELCloud, with its clock potentially set to a different timezone than the
+            client, returns a report containing data from a couple of days from the
+            past and from the current day in MELCloud time.
+          - Device sums up the date from the last day bucket in the report.
+
+        TLDR: Request some days from the past and some days from the future -> receive
+        the latest day bucket.
         """
         if self._energy_report is None:
             return None
-        return (self._energy_report.get("TotalHeatingConsumed", 0.0)
-                + self._energy_report.get("TotalCoolingConsumed", 0.0)
-                + self._energy_report.get("TotalAutoConsumed", 0.0)
-                + self._energy_report.get("TotalDryConsumed", 0.0)
-                + self._energy_report.get("TotalFanConsumed", 0.0)
-                + self._energy_report.get("TotalOtherConsumed", 0.0))
+
+        consumption = 0
+
+        for mode in ['Heating', 'Cooling', 'Auto', 'Dry', 'Fan', 'Other']:
+            consumption += self._energy_report.get(mode, [0.0])[-1]
+
+        return consumption
 
     @property
     def wifi_signal(self) -> Optional[int]:

tests/test_device.py

@@ -54,15 +54,13 @@ async def test_round_temperature():
         "ata_listdevice.json",
         "ata_get.json",
         {
-            "TotalHeatingConsumed": 1.0,
-            "TotalCoolingConsumed": 0.0,
-            "TotalAutoConsumed": 2.0,
-            "TotalDryConsumed": 0.0,
-            "TotalFanConsumed": 3.0,
+            "Heating": [0.0, 0.0, 1.0],
+            "Cooling": [0.0, 0.1, 10.0],
+            "Dry": [0.2, 0.0, 100.0],
+            "Fan": [0.3, 1000.0],
         },
     )
 
     await device.update()
 
-    assert device.daily_energy_consumed == 6.0
-
+    assert device.daily_energy_consumed == 1111.0