Merge pull request #218 from vincentwolsink/missing_report_time

Handle missing report timestamps

Author: vincentwolsink

custom_components/enphase_envoy/binary_sensor.py

@@ -165,19 +165,20 @@ def unique_id(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self.coordinator.data.get("inverter_info"):
-            value = (
-                self.coordinator.data.get("inverter_info")
-                .get(self._device_serial_number)
-                .get("last_rpt_date")
-            )
-            return {
-                "last_reported": datetime.datetime.fromtimestamp(
-                    int(value), tz=datetime.timezone.utc
+        try:
+            if self.coordinator.data.get("inverter_info"):
+                value = (
+                    self.coordinator.data.get("inverter_info")
+                    .get(self._device_serial_number)
+                    .get("last_rpt_date")
                 )
-            }
-
-        return None
+                return {
+                    "last_reported": datetime.datetime.fromtimestamp(
+                        int(value), tz=datetime.timezone.utc
+                    )
+                }
+        except (ValueError, TypeError):
+            return None
 
     @property
     def device_info(self) -> DeviceInfo or None:

custom_components/enphase_envoy/envoy_reader.py

@@ -207,6 +207,8 @@ class EnvoyError(EnvoyReaderError):
 
 class FileData:
     def __init__(self, file):
+        self.file = file
+
         if file.endswith(".json"):
             self.content_type = "application/json"
             with open(file) as json_file:
@@ -226,9 +228,21 @@ def status_code(self):
     def headers(self):
         return {"content-type": self.content_type}
 
+    @property
+    def url(self):
+        return self.Url(self.file)
+
     def json(self):
         return self.json_data
 
+    class Url:
+        def __init__(self, url):
+            self.url = url
+
+        @property
+        def path(self):
+            return self.url.split("/")[-1]
+
 
 class StreamData:
     class PhaseData:

custom_components/enphase_envoy/sensor.py

@@ -438,44 +438,45 @@ def native_value(self):
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self.entity_description.key == "inverter_data_watts":
-            if self.coordinator.data.get("inverter_production"):
-                value = (
-                    self.coordinator.data.get("inverter_production")
-                    .get(self._device_serial_number)
-                    .get("lastReportDate")
-                )
-                return {
-                    "last_reported": datetime.datetime.fromtimestamp(
-                        int(value), tz=datetime.timezone.utc
+        try:
+            if self.entity_description.key == "inverter_data_watts":
+                if self.coordinator.data.get("inverter_production"):
+                    value = (
+                        self.coordinator.data.get("inverter_production")
+                        .get(self._device_serial_number)
+                        .get("lastReportDate")
                     )
-                }
-        elif self.entity_description.key.startswith("inverter_info_"):
-            if self.coordinator.data.get("inverter_info"):
-                value = (
-                    self.coordinator.data.get("inverter_info")
-                    .get(self._device_serial_number)
-                    .get("last_rpt_date")
-                )
-                return {
-                    "last_reported": datetime.datetime.fromtimestamp(
-                        int(value), tz=datetime.timezone.utc
+                    return {
+                        "last_reported": datetime.datetime.fromtimestamp(
+                            int(value), tz=datetime.timezone.utc
+                        )
+                    }
+            elif self.entity_description.key.startswith("inverter_info_"):
+                if self.coordinator.data.get("inverter_info"):
+                    value = (
+                        self.coordinator.data.get("inverter_info")
+                        .get(self._device_serial_number)
+                        .get("last_rpt_date")
                     )
-                }
-        elif self.entity_description.key.startswith("inverter_data_"):
-            if self.coordinator.data.get("inverter_device_data"):
-                value = (
-                    self.coordinator.data.get("inverter_device_data")
-                    .get(self._device_serial_number)
-                    .get("last_reading")
-                )
-                return {
-                    "last_reported": datetime.datetime.fromtimestamp(
-                        int(value), tz=datetime.timezone.utc
+                    return {
+                        "last_reported": datetime.datetime.fromtimestamp(
+                            int(value), tz=datetime.timezone.utc
+                        )
+                    }
+            elif self.entity_description.key.startswith("inverter_data_"):
+                if self.coordinator.data.get("inverter_device_data"):
+                    value = (
+                        self.coordinator.data.get("inverter_device_data")
+                        .get(self._device_serial_number)
+                        .get("last_reading")
                     )
-                }
-
-        return None
+                    return {
+                        "last_reported": datetime.datetime.fromtimestamp(
+                            int(value), tz=datetime.timezone.utc
+                        )
+                    }
+        except (ValueError, TypeError):
+            return None
 
     @property
     def device_info(self) -> DeviceInfo | None: