aioamazondevices 6.2.4__py3-none-any.whl → 6.2.6__py3-none-any.whl

aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "6.2.4"
+__version__ = "6.2.6"
 
 
 from .api import AmazonDevice, AmazonEchoApi

aioamazondevices/api.py

@@ -142,7 +142,6 @@ class AmazonEchoApi:
 
         self._session = client_session
         self._devices: dict[str, Any] = {}
-        self._sensors_available: bool = True
 
         _LOGGER.debug("Initialize library v%s", __version__)
 
@@ -622,13 +621,15 @@ class AmazonEchoApi:
                 else None
             )
             if serial_number in self._devices:
-                devices_sensors[serial_number] = self._get_device_sensor_state(endpoint)
+                devices_sensors[serial_number] = self._get_device_sensor_state(
+                    endpoint, serial_number
+                )
                 devices_endpoints[serial_number] = endpoint
 
         return devices_endpoints, devices_sensors
 
     def _get_device_sensor_state(
-        self, endpoint: dict[str, Any]
+        self, endpoint: dict[str, Any], serial_number: str
     ) -> dict[str, AmazonDeviceSensor]:
         device_sensors: dict[str, AmazonDeviceSensor] = {}
         if endpoint_dnd := endpoint.get("settings", {}).get("doNotDisturb"):
@@ -639,22 +640,49 @@ class AmazonEchoApi:
                 scale=None,
             )
         for feature in endpoint.get("features", {}):
-            if (sensor := SENSORS.get(feature["name"])) is None:
+            if (sensor_template := SENSORS.get(feature["name"])) is None:
                 # Skip sensors that are not in the predefined list
                 continue
 
-            if not (name := sensor["name"]):
+            if not (name := sensor_template["name"]):
                 raise CannotRetrieveData("Unable to read sensor template")
 
             for feature_property in feature.get("properties"):
-                if sensor["name"] != feature_property.get("name"):
+                if sensor_template["name"] != feature_property.get("name"):
                     continue
 
-                value = feature_property[sensor["key"]]
-                scale = value["scale"] if sensor["scale"] else None
-                error = bool(sensor.get("error"))
-                if subkey := sensor["subkey"]:
-                    value = value[subkey]
+                value: str | int | float = "n/a"
+                scale: str | None = None
+                error = bool(feature_property.get("error"))
+                if not error:
+                    try:
+                        value_raw = feature_property[sensor_template["key"]]
+                        if not value_raw:
+                            _LOGGER.warning(
+                                "Sensor %s [device %s] ignored due to empty value",
+                                name,
+                                serial_number,
+                            )
+                            continue
+                        scale = (
+                            value_raw[scale_template]
+                            if (scale_template := sensor_template["scale"])
+                            else None
+                        )
+                        value = (
+                            value_raw[subkey_template]
+                            if (subkey_template := sensor_template["subkey"])
+                            else value_raw
+                        )
+
+                    except (KeyError, ValueError) as exc:
+                        _LOGGER.warning(
+                            "Sensor %s [device %s] ignored due to errors in feature %s: %s",  # noqa: E501
+                            name,
+                            serial_number,
+                            feature_property,
+                            repr(exc),
+                        )
                 device_sensors[name] = AmazonDeviceSensor(
                     name,
                     value,

{aioamazondevices-6.2.4.dist-info → aioamazondevices-6.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioamazondevices
-Version: 6.2.4
+Version: 6.2.6
 Summary: Python library to control Amazon devices
 License-Expression: Apache-2.0
 License-File: LICENSE

{aioamazondevices-6.2.4.dist-info → aioamazondevices-6.2.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-aioamazondevices/__init__.py,sha256=O5sZcBW6O16XeV2LlY-nIVk5ugcMwgXzmtB7xKMd0wo,276
-aioamazondevices/api.py,sha256=zE7q03ok3CoIlKiClAA3tFch3oWdJEu4s61S4ZUEfBw,42277
+aioamazondevices/__init__.py,sha256=2rkrcsrHU_OkLuxwVmHbM2zQIokytaNz17RY5Sme80U,276
+aioamazondevices/api.py,sha256=h3LVTzj4f2unlD8PPyezBT0OsbF5viICIK8YhT2MoIU,43533
 aioamazondevices/const.py,sha256=laRFapeQRpg3aGi10iCOH5OzBi1cnaPJX0s1phSl21w,11769
 aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
 aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aioamazondevices/query.py,sha256=AGHHzefzfYzB7RLWPtlFxYc_rpUZdoeApsU2jYz3urQ,2053
 aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
 aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-6.2.4.dist-info/METADATA,sha256=indV-n8QQZYkmaRmhsWVx4DDipUTxNiMgz4nm6DN7Rg,7656
-aioamazondevices-6.2.4.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-aioamazondevices-6.2.4.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-6.2.4.dist-info/RECORD,,
+aioamazondevices-6.2.6.dist-info/METADATA,sha256=us19gN-RKVrY6ICis6RkboCyMzStX5jHSTWbbfKfAXc,7656
+aioamazondevices-6.2.6.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+aioamazondevices-6.2.6.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-6.2.6.dist-info/RECORD,,