fix: attempt on fixing negative values (#87)

* fix: attempt on fixing negative values

* fix: fix change of day

* fix: fetch last statistics from last_stat_time

* fix: fix increment on every fetch

* fix: Issue with remote_reading

* feat: Group entities by Contract and Meter Devices (#89)

* feat: Group entities by Contract and Meter Devices

* fix: Fix and Lint

* fix: Issue with coordinator on 1st on the month (#90)

* chore: bump to 0.0.24

* fix: reduce number of calls to RemoteReadings by unique date (and not datetime)

* fix: empty Devices list

* chore: bump requirement to iec-api 0.2.13

* Update manifest.json

Author: GuyKh

custom_components/iec/coordinator.py

@@ -97,7 +97,8 @@ async def _get_kwh_tariff(self) -> float:
 
     async def _get_readings(self, contract_id: int, device_id: str | int, device_code: str | int, date: datetime,
                             resolution: ReadingResolution):
-        key = (contract_id, int(device_id), int(device_code), date, resolution)
+        date_key = date.date()
+        key = (contract_id, int(device_id), int(device_code), date_key, resolution)
         reading = self._readings.get(key)
         if not reading:
             try:
@@ -314,6 +315,10 @@ async def _insert_statistics(self, contract_id: int, is_smart_meter: bool) -> No
         devices = await self._get_devices_by_contract_id(contract_id)
         kwh_price = await self._get_kwh_tariff()
 
+        if not devices:
+            _LOGGER.error(f"Failed fetching devices for IEC Contract {contract_id}")
+            return
+
         for device in devices:
             id_prefix = f"iec_meter_{device.device_number}"
             consumption_statistic_id = f"{DOMAIN}:{id_prefix}_energy_consumption"
@@ -358,10 +363,14 @@ async def _insert_statistics(self, contract_id: int, is_smart_meter: bool) -> No
                 _LOGGER.debug("No recent usage data. Skipping update")
                 continue
 
+            last_stat_hour = datetime.fromtimestamp(last_stat_time) if last_stat_time else readings.data[0].date
+            last_stat_req_hour = last_stat_hour if last_stat_hour.hour > 0 else (last_stat_hour - timedelta(hours=1))
+
+            _LOGGER.debug(f"Fetching LongTerm Statistics since {last_stat_req_hour}")
             stats = await get_instance(self.hass).async_add_executor_job(
                 statistics_during_period,
                 self.hass,
-                readings.data[0].date - timedelta(hours=1),
+                last_stat_req_hour,
                 None,
                 {cost_statistic_id, consumption_statistic_id},
                 "hour",
@@ -395,8 +404,16 @@ async def _insert_statistics(self, contract_id: int, is_smart_meter: bool) -> No
             grouped_new_readings_by_hour = itertools.groupby(new_readings,
                                                              key=lambda reading: reading.date
                                                              .replace(minute=0, second=0, microsecond=0))
-            readings_by_hour: dict[datetime, float] = {key: sum(reading.value for reading in list(group))
-                                                       for key, group in grouped_new_readings_by_hour}
+            readings_by_hour: dict[datetime, float] = {}
+            for key, group in grouped_new_readings_by_hour:
+                group_list = list(group)
+                if len(group_list) < 4:
+                    _LOGGER.debug(f"LongTerm Statistics - Skipping {key} since it's partial for the hour")
+                    continue
+                if key <= TIMEZONE.localize(last_stat_req_hour):
+                    _LOGGER.debug(f"LongTerm Statistics -Skipping {key} data since it's already reported")
+                    continue
+                readings_by_hour[key] = sum(reading.value for reading in group_list)
 
             consumption_metadata = StatisticMetaData(
                 has_mean=False,

custom_components/iec/manifest.json

@@ -10,6 +10,6 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/guykh/iec-custom-component/issues",
   "loggers": ["iec_api"],
-  "requirements": ["iec-api==0.2.12"],
-  "version": "0.0.24"
+  "requirements": ["iec-api==0.2.13"],
+  "version": "0.0.25-beta1"
 }

requirements.txt

@@ -1,5 +1,5 @@
 colorlog>=6.8.2
 homeassistant==2024.2.0
-iec-api==0.2.12
+iec-api==0.2.13
 pip>=21.0
 ruff>=0.2.2