aioamazondevices 6.2.1__py3-none-any.whl → 6.2.3__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -75,6 +75,7 @@ class AmazonDeviceSensor:
 
     name: str
     value: str | int | float
+    error: bool
     scale: str | None
 
 
@@ -630,32 +631,37 @@ class AmazonEchoApi:
         self, endpoint: dict[str, Any]
     ) -> dict[str, AmazonDeviceSensor]:
         device_sensors: dict[str, AmazonDeviceSensor] = {}
-        if (
-            endpoint_dnd := endpoint.get("settings", {}).get("doNotDisturb")
-        ) and not endpoint_dnd["error"]:
+        if endpoint_dnd := endpoint.get("settings", {}).get("doNotDisturb"):
             device_sensors["dnd"] = AmazonDeviceSensor(
-                "dnd", endpoint_dnd.get("toggleValue"), None
+                name="dnd",
+                value=endpoint_dnd.get("toggleValue"),
+                error=bool(endpoint_dnd.get("error")),
+                scale=None,
             )
         for feature in endpoint.get("features", {}):
-            first_property = (feature.get("properties") or [None])[0] or {}
-            if (
-                first_property.get("type") != "RETRIEVABLE"
-                or (sensor := SENSORS.get(feature["name"])) is None
-            ):
+            feature_property = (feature.get("properties") or [{}])[0]
+            if (sensor := SENSORS.get(feature["name"])) is None:
+                # Skip sensors that are not in the predefined list
                 continue
 
             if not (name := sensor["name"]):
                 raise CannotRetrieveData("Unable to read sensor template")
 
-            value = first_property[sensor["key"]]
-            scale = value["scale"] if sensor["scale"] else None
-            if subkey := sensor["subkey"]:
-                value = value[subkey]
-            device_sensors[name] = AmazonDeviceSensor(
-                name,
-                value,
-                scale,
-            )
+            for feature_property in feature.get("properties"):
+                if sensor["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]
+                device_sensors[name] = AmazonDeviceSensor(
+                    name,
+                    value,
+                    error,
+                    scale,
+                )
 
         return device_sensors
 

aioamazondevices/const.py

@@ -77,7 +77,7 @@ SENSORS: dict[str, dict[str, str | None]] = {
         "scale": "scale",
     },
     "motionSensor": {
-        "name": "motion",
+        "name": "detectionState",
         "key": "detectionStateValue",
         "subkey": None,
         "scale": None,

{aioamazondevices-6.2.1.dist-info → aioamazondevices-6.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 6.2.1
+Version: 6.2.3
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

aioamazondevices-6.2.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+aioamazondevices/__init__.py,sha256=ceEDIjO_0-izP3c2qIBoA5HFyOQUZy2qAvBkrGhPZzU,276
+aioamazondevices/api.py,sha256=-cwcBemxqHrek0TF5N_AFKizdx9KdhETIA8G-XP625I,42347
+aioamazondevices/const.py,sha256=OMGxpG6kRMN6WJgq-nQ8skhRtSgkm_hXtz9my8hBwbE,11314
+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.3.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-6.2.3.dist-info/METADATA,sha256=lASZmiHEn_QhxelH0j3SvmN1x3J9unoUD4Rmbo_aucs,7623
+aioamazondevices-6.2.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-6.2.3.dist-info/RECORD,,

aioamazondevices-6.2.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-aioamazondevices/__init__.py,sha256=hyj8SeDdWcZIzCXEj67RXp4kviqHhwmsvg-yNVpzAas,276
-aioamazondevices/api.py,sha256=7LY15R-f1NURGPYoSJw7gJ6PIZH9Eg8iNdZIk8hjcc4,42039
-aioamazondevices/const.py,sha256=38dhNRpwEJf0FgFQGjt3ONhLdQxjiNrnlcrmQ1AY8oU,11306
-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.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-6.2.1.dist-info/METADATA,sha256=Kxx8XQfmFkRMsY3ZnCIofSvQus6p4xHZ6BMEZdmU5nc,7623
-aioamazondevices-6.2.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-6.2.1.dist-info/RECORD,,