aioamazondevices 11.0.3__py3-none-any.whl → 11.1.2__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -9,6 +9,7 @@ from aiohttp import ClientSession
 
 from . import __version__
 from .const.devices import (
+    AQM_DEVICE_TYPE,
     DEVICE_TO_IGNORE,
     DEVICE_TYPE_TO_MODEL,
     SPEAKER_GROUP_FAMILY,
@@ -20,7 +21,7 @@ from .const.http import (
     URI_DEVICES,
     URI_NEXUS_GRAPHQL,
 )
-from .const.metadata import SENSORS
+from .const.metadata import ALEXA_INFO_SKILLS, AQM_RANGE_SENSORS, SENSORS
 from .const.queries import QUERY_DEVICE_DATA, QUERY_SENSOR_STATE
 from .const.schedules import (
     NOTIFICATION_ALARM,
@@ -164,12 +165,13 @@ class AmazonEchoApi:
         self, endpoint: dict[str, Any], serial_number: str
     ) -> dict[str, AmazonDeviceSensor]:
         device_sensors: dict[str, AmazonDeviceSensor] = {}
+        device = self._final_devices[serial_number]
         for feature in endpoint.get("features", {}):
             if (sensor_template := SENSORS.get(feature["name"])) is None:
                 # Skip sensors that are not in the predefined list
                 continue
 
-            if not (name := sensor_template["name"]):
+            if not (sensor_template_name_value := sensor_template["name"]):
                 raise CannotRetrieveData("Unable to read sensor template")
 
             for feature_property in feature.get("properties"):
@@ -190,7 +192,7 @@ class AmazonEchoApi:
                         if not value_raw:
                             _LOGGER.warning(
                                 "Sensor %s [device %s] ignored due to empty value",
-                                name,
+                                sensor_template_name_value,
                                 serial_number,
                             )
                             continue
@@ -208,26 +210,50 @@ class AmazonEchoApi:
                     except (KeyError, ValueError) as exc:
                         _LOGGER.warning(
                             "Sensor %s [device %s] ignored due to errors in feature %s: %s",  # noqa: E501
-                            name,
+                            sensor_template_name_value,
                             serial_number,
                             feature_property,
                             repr(exc),
                         )
                 if error:
                     _LOGGER.debug(
-                        "error in sensor %s - %s - %s", name, error_type, error_msg
-                    )
-
-                if error_type != "NOT_FOUND":
-                    device_sensors[name] = AmazonDeviceSensor(
-                        name,
-                        value,
-                        error,
+                        "error in sensor %s - %s - %s",
+                        sensor_template_name_value,
                         error_type,
                         error_msg,
-                        scale,
                     )
 
+                if error_type == "NOT_FOUND":
+                    continue
+
+                sensor_name = sensor_template_name_value
+
+                if (
+                    device.device_type == AQM_DEVICE_TYPE
+                    and sensor_template_name_value == "rangeValue"
+                ):
+                    if not (
+                        (instance := feature.get("instance"))
+                        and (aqm_sensor := AQM_RANGE_SENSORS.get(instance))
+                        and (aqm_sensor_name := aqm_sensor.get("name"))
+                    ):
+                        _LOGGER.debug(
+                            "No template for rangeValue (%s) - Skipping sensor",
+                            instance,
+                        )
+                        continue
+                    sensor_name = aqm_sensor_name
+                    scale = aqm_sensor.get("scale")
+
+                device_sensors[sensor_name] = AmazonDeviceSensor(
+                    sensor_name,
+                    value,
+                    error,
+                    error_type,
+                    error_msg,
+                    scale,
+                )
+
         return device_sensors
 
     async def _get_devices_endpoint_data(self) -> dict[str, dict[str, Any]]:
@@ -247,13 +273,15 @@ class AmazonEchoApi:
 
         endpoint_data = await self._http_wrapper.response_to_json(raw_resp, "endpoint")
 
-        if not (data := endpoint_data.get("data")) or not data.get("listEndpoints"):
+        if not (data := endpoint_data.get("data")) or not data.get("alexaVoiceDevices"):
             await self._format_human_error(endpoint_data)
             return {}
 
-        endpoints = data["listEndpoints"]
         devices_endpoints: dict[str, dict[str, Any]] = {}
-        for endpoint in endpoints.get("endpoints"):
+
+        # Process Alexa Voice Enabled devices
+        # Just map endpoint ID to serial number to facilitate sensor lookup
+        for endpoint in data.get("alexaVoiceDevices", {}).get("endpoints", {}):
             # save looking up sensor data on apps
             if endpoint.get("alexaEnabledMetadata", {}).get("category") == "APP":
                 continue
@@ -263,6 +291,39 @@ class AmazonEchoApi:
                 devices_endpoints[serial_number] = endpoint
                 self._endpoints[endpoint["endpointId"]] = serial_number
 
+        # Process Air Quality Monitors if present
+        # map endpoint ID to serial number to facilitate sensor lookup but also
+        # create AmazonDevice as these are not present in api/devices-v2/device endpoint
+        for aqm_endpoint in data.get("airQualityMonitors", {}).get("endpoints", {}):
+            aqm_serial_number: str = aqm_endpoint["serialNumber"]["value"]["text"]
+            devices_endpoints[aqm_serial_number] = aqm_endpoint
+            self._endpoints[aqm_endpoint["endpointId"]] = aqm_serial_number
+
+            device_name = aqm_endpoint["friendlyNameObject"]["value"]["text"]
+            device_type = aqm_endpoint["legacyIdentifiers"]["dmsIdentifier"][
+                "deviceType"
+            ]["value"]["text"]
+            software_version = aqm_endpoint["softwareVersion"]["value"]["text"]
+
+            self._final_devices[aqm_serial_number] = AmazonDevice(
+                account_name=device_name,
+                capabilities=[],
+                device_family="AIR_QUALITY_MONITOR",
+                device_type=device_type,
+                device_owner_customer_id=self._session_state_data.account_customer_id
+                or "n/a",
+                household_device=False,
+                device_cluster_members={aqm_serial_number: AQM_DEVICE_TYPE},
+                online=True,
+                serial_number=aqm_serial_number,
+                software_version=software_version,
+                entity_id=None,
+                endpoint_id=aqm_endpoint.get("endpointId"),
+                sensors={},
+                notifications_supported=False,
+                notifications={},
+            )
+
         return devices_endpoints
 
     async def get_devices_data(
@@ -397,6 +458,11 @@ class AmazonEchoApi:
 
             serial_number: str = device["serialNumber"]
 
+            _has_notification_capability = any(
+                capability in capabilities
+                for capability in ["REMINDERS", "TIMERS_AND_ALARMS"]
+            )
+
             final_devices_list[serial_number] = AmazonDevice(
                 account_name=account_name,
                 capabilities=capabilities,
@@ -414,6 +480,7 @@ class AmazonEchoApi:
                 entity_id=None,
                 endpoint_id=None,
                 sensors={},
+                notifications_supported=_has_notification_capability,
                 notifications={},
             )
 
@@ -468,7 +535,7 @@ class AmazonEchoApi:
         sound_name: str,
     ) -> None:
         """Call Alexa.Sound to play sound."""
-        await self._sequence_handler.send_message(
+        await self._call_alexa_command_per_cluster_member(
             device, AmazonSequenceType.Sound, sound_name
         )
 
@@ -489,7 +556,7 @@ class AmazonEchoApi:
         text_command: str,
     ) -> None:
         """Call Alexa.TextCommand to issue command."""
-        await self._sequence_handler.send_message(
+        await self._call_alexa_command_per_cluster_member(
             device, AmazonSequenceType.TextCommand, text_command
         )
 
@@ -499,7 +566,7 @@ class AmazonEchoApi:
         skill_name: str,
     ) -> None:
         """Call Alexa.LaunchSkill to launch a skill."""
-        await self._sequence_handler.send_message(
+        await self._call_alexa_command_per_cluster_member(
             device, AmazonSequenceType.LaunchSkill, skill_name
         )
 
@@ -509,7 +576,22 @@ class AmazonEchoApi:
         info_skill_name: str,
     ) -> None:
         """Call Info skill.  See ALEXA_INFO_SKILLS . const."""
-        await self._sequence_handler.send_message(device, info_skill_name, "")
+        info_skill = ALEXA_INFO_SKILLS.get(info_skill_name, info_skill_name)
+        await self._call_alexa_command_per_cluster_member(device, info_skill, "")
+
+    async def _call_alexa_command_per_cluster_member(
+        self,
+        device: AmazonDevice,
+        message_type: str,
+        message_body: str,
+    ) -> None:
+        """Call Alexa command per cluster member."""
+        for cluster_member in device.device_cluster_members:
+            await self._sequence_handler.send_message(
+                self._final_devices[cluster_member],
+                message_type,
+                message_body,
+            )
 
     async def _format_human_error(self, sensors_state: dict) -> bool:
         """Format human readable error from malformed data."""

aioamazondevices/const/devices.py

@@ -4,6 +4,7 @@ from .http import AMAZON_DEVICE_TYPE
 
 SPEAKER_GROUP_FAMILY = "WHA"
 SPEAKER_GROUP_MODEL = "Speaker Group"
+AQM_DEVICE_TYPE = "AEZME1X38KDRA"
 
 DEVICE_TO_IGNORE: list[str] = [
     AMAZON_DEVICE_TYPE,  # Alexa App for iOS
@@ -28,10 +29,15 @@ DEVICE_TO_IGNORE: list[str] = [
     "A3BW5ZVFHRCQPO",  # BMW Mini Car System - issue #479
     "A133UZ2CB0IB8",  # Sony Soundbar Sony HT-A5000 - issue #486
     "A2M9HB23M9MSSM",  # Smartwatch Amazfit Bip U Pro - issue #507
+    "A2QDHDQIWC2LTG",  # Echo Buds (Left) - issue #515
+    "A31PMVIWCRNTX2",  # Echo Buds (Right) - issue #515
+    "A3HVREY4JWAZ6K",  # Echo Buds (Charger) - issue #515
     "A1P7E7V3FCZKU6",  # Toshiba Corporation TV 32LF221U19 - issue #531
+    "APHEAY6LX7T13",  # Samsung Refrigerator RS22T5561SR/AA - issue #577
     "A1NPP2J03FTS0I",  # Eero Pro 6 - issue #602
     "A14AIWB3T3AS1Z",  # Samsung Soundbar HW-Q950A - issue #603
-    "APHEAY6LX7T13",  # Samsung Refrigerator RS22T5561SR/AA - issue #577
+    "A1X5IB2CRN3E8G",  # Fitbit Versa 3 - issue #651
+    "A1NQ0LXWBGVQS9",  # Samsung 2012 QLED TV - Issue #660
 ]
 
 DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
@@ -426,4 +432,23 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Orbi Voice (RBS40V)",
         "hw_version": None,
     },
+    AQM_DEVICE_TYPE: {
+        "model": "Air Quality Monitor",
+        "hw_version": "Gen1",
+    },
+    "A1MR3F8QRZNAXI": {
+        "model": "Echo Dot Max",
+        "hw_version": "Gen1",
+    },
+    "A1XULUOD31VLF4": {
+        "manufacturer": "Broan-NuTone LLC",
+        "model": "Bathroom Fan with Alexa (VC110CCT)",
+        "hw_version": None,
+    },
+    "A15QWUTQ6FSMYX": {
+        # This appears to be a group for both speakers
+        # but four devices show this device type (see issue #515)
+        "model": "Echo Buds",
+        "hw_version": "Gen2",
+    },
 }

aioamazondevices/const/metadata.py

@@ -27,26 +27,60 @@ SENSORS: dict[str, dict[str, str | None]] = {
         "subkey": None,
         "scale": None,
     },
+    "range": {
+        "name": "rangeValue",
+        "key": "rangeValue",
+        "subkey": "value",
+        "scale": None,
+    },
 }
 
-ALEXA_INFO_SKILLS = [
-    "Alexa.Calendar.PlayToday",
-    "Alexa.Calendar.PlayTomorrow",
-    "Alexa.Calendar.PlayNext",
-    "Alexa.Date.Play",
-    "Alexa.Time.Play",
-    "Alexa.News.NationalNews",
-    "Alexa.FlashBriefing.Play",
-    "Alexa.Traffic.Play",
-    "Alexa.Weather.Play",
-    "Alexa.CleanUp.Play",
-    "Alexa.GoodMorning.Play",
-    "Alexa.SingASong.Play",
-    "Alexa.FunFact.Play",
-    "Alexa.Joke.Play",
-    "Alexa.TellStory.Play",
-    "Alexa.ImHome.Play",
-    "Alexa.GoodNight.Play",
-]
+AQM_RANGE_SENSORS: dict[str, dict[str, str | None]] = {
+    "4": {
+        "name": "Humidity",
+        "scale": "%",
+    },
+    "5": {
+        "name": "VOC",
+        "scale": None,
+    },
+    "6": {
+        "name": "PM25",
+        "scale": "MicroGramsPerCubicMeter",
+    },
+    "7": {
+        "name": "PM10",
+        "scale": "MicroGramsPerCubicMeter",
+    },
+    "8": {
+        "name": "CO",
+        "scale": "ppm",
+    },
+    "9": {
+        "name": "Air Quality",
+        "scale": None,
+    },
+}
+
+
+ALEXA_INFO_SKILLS = {
+    "alexa_calendar_today": "Alexa.Calendar.PlayToday",
+    "alexa_calendar_tomorrow": "Alexa.Calendar.PlayTomorrow",
+    "alexa_calendar_next": "Alexa.Calendar.PlayNext",
+    "alexa_date": "Alexa.Date.Play",
+    "alexa_time": "Alexa.Time.Play",
+    "alexa_nationalnews": "Alexa.News.NationalNews",
+    "alexa_flashbriefing": "Alexa.FlashBriefing.Play",
+    "alexa_traffic": "Alexa.Traffic.Play",
+    "alexa_weather": "Alexa.Weather.Play",
+    "alexa_cleanup": "Alexa.CleanUp.Play",
+    "alexa_goodmorning": "Alexa.GoodMorning.Play",
+    "alexa_singasong": "Alexa.SingASong.Play",
+    "alexa_funfact": "Alexa.FunFact.Play",
+    "alexa_joke": "Alexa.Joke.Play",
+    "alexa_tellstory": "Alexa.TellStory.Play",
+    "alexa_imhome": "Alexa.ImHome.Play",
+    "alexa_goodnight": "Alexa.GoodNight.Play",
+}
 
 MAX_CUSTOMER_ACCOUNT_RETRIES = 3

aioamazondevices/const/queries.py

@@ -2,40 +2,50 @@
 
 QUERY_DEVICE_DATA = """
 query getDevicesBaseData {
-  listEndpoints(
+  alexaVoiceDevices: listEndpoints(
     listEndpointsInput: {
-        displayCategory: "ALEXA_VOICE_ENABLED"
-        includeHouseholdDevices: true
+      displayCategory: "ALEXA_VOICE_ENABLED"
+      includeHouseholdDevices: true
     }
-  )
-  {
-    endpoints {
-      endpointId: id
-      friendlyNameObject { value { text } }
-      manufacturer { value { text } }
-      model { value { text} }
-      serialNumber { value { text } }
-      softwareVersion { value { text } }
-      creationTime
-      enablement
-      displayCategories {
-        all { value }
-        primary { value }
-      }
-      alexaEnabledMetadata {
-        iconId
-        isVisible
-        category
-        capabilities
-      }
-      legacyIdentifiers {
-        dmsIdentifier {
-          deviceType { value { text } }
-        }
-        chrsIdentifier { entityId }
-      }
-      legacyAppliance { applianceId }
+  ) {
+    ...DeviceEndpoints
+  }
+
+  airQualityMonitors: listEndpoints(
+    listEndpointsInput: {
+      displayCategory: "AIR_QUALITY_MONITOR"
+      includeHouseholdDevices: true
     }
+  ) {
+    ...DeviceEndpoints
+  }
+}
+
+fragment DeviceEndpoints on ListEndpointsResponse {
+  endpoints {
+    endpointId: id
+    friendlyNameObject { value { text } }
+    manufacturer { value { text } }
+    model { value { text } }
+    serialNumber { value { text } }
+    softwareVersion { value { text } }
+    creationTime
+    enablement
+    displayCategories {
+      all { value }
+      primary { value }
+    }
+    alexaEnabledMetadata {
+      iconId
+      isVisible
+      category
+      capabilities
+    }
+    legacyIdentifiers {
+      dmsIdentifier { deviceType { value { text } } }
+      chrsIdentifier { entityId }
+    }
+    legacyAppliance { applianceId }
   }
 }
 """
@@ -46,6 +56,7 @@ fragment EndpointState on Endpoint {
   friendlyNameObject { value { text } }
   features {
     name
+    instance
     properties {
       name
       type
@@ -76,6 +87,11 @@ fragment EndpointState on Endpoint {
         timeOfSample
         timeOfLastChange
       }
+      ... on RangeValue {
+        rangeValue { value }
+        timeOfSample
+        timeOfLastChange
+      }
     }
   }
 }

aioamazondevices/implementation/sequence.py

@@ -123,7 +123,7 @@ class AmazonSequenceHandler:
                     "uri": "connection://AMAZON.Launch/" + message_body,
                 },
             }
-        elif message_type in ALEXA_INFO_SKILLS:
+        elif message_type in ALEXA_INFO_SKILLS.values():
             payload = {
                 **base_payload,
             }

aioamazondevices/structures.py

@@ -44,6 +44,7 @@ class AmazonDevice:
     entity_id: str | None
     endpoint_id: str | None
     sensors: dict[str, AmazonDeviceSensor]
+    notifications_supported: bool
     notifications: dict[str, AmazonSchedule]
 
 

{aioamazondevices-11.0.3.dist-info → aioamazondevices-11.1.2.dist-info}/METADATA

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

{aioamazondevices-11.0.3.dist-info → aioamazondevices-11.1.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-aioamazondevices/__init__.py,sha256=Q_uFYFnNYMzrZjtqxHRSTatCd-pn44lYmk0nn0Q3rOY,277
-aioamazondevices/api.py,sha256=CQ_CQMhpwHryTX8Utqmw8AVKvi56UmD3xpozIXTe0Uc,19888
+aioamazondevices/__init__.py,sha256=xTc0WeNhgVatWs2jOYhExLbA8RRICucmoDbm6JIc0UQ,277
+aioamazondevices/api.py,sha256=QrUKwyJL_CvtJegdp2SczogV-AU4yWjU8aCsHappzA4,23538
 aioamazondevices/const/__init__.py,sha256=xQt8Smq2Ojjo30KKdev_gxDkcpY9PJlArTUXKel8oqs,38
-aioamazondevices/const/devices.py,sha256=-W4yBSeACIsG3z_8MC_jrQoFJN1NZMe4c62XPee6q1k,11285
+aioamazondevices/const/devices.py,sha256=YZ30GoOCItnwm_3vbXK83RYMyzmbDXQOcJy32wAQRaM,12164
 aioamazondevices/const/http.py,sha256=tgsRJWfx_SFRBk6T7TiClP02qIsPN4wShfMqRbZcQio,1204
-aioamazondevices/const/metadata.py,sha256=zfia4dzEJQ1NPKiVzL-BslOngBRPSpL_vX0DPvIBhSg,1250
-aioamazondevices/const/queries.py,sha256=weCYmUJedNyx1P8z_tG_6cHGMjICUVo6KOckkl4P_-w,1900
+aioamazondevices/const/metadata.py,sha256=7RUnu0F5gezJLvJRtXnU15rp-g5P8EE5K8g7nnPjV4k,2204
+aioamazondevices/const/queries.py,sha256=MrY-7g5dNPe4MS8PpUninztQOQCFr9hscBzh_ryVxlM,2230
 aioamazondevices/const/schedules.py,sha256=GohhoXSGxXEq_fEycSBsjaDJdIxuMtvspLVqaCmJjOU,1378
 aioamazondevices/const/sounds.py,sha256=hdrXYKEuSOCw7fDdylvqLcDqD5poHzhgXEnUwq_TwDE,1923
 aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
@@ -12,12 +12,12 @@ aioamazondevices/http_wrapper.py,sha256=MrPiWisER2piJy02yiP5eAP6SDuq-i10lIp5DN_e
 aioamazondevices/implementation/__init__.py,sha256=HU18CNdQaDYFksyHi8BL0a0FK0_knqo60ueOxH3zvgo,47
 aioamazondevices/implementation/dnd.py,sha256=UrYSavcaddpYY7JA3aGXEjw7TCNaVERnEcunNcvheac,2065
 aioamazondevices/implementation/notification.py,sha256=b9pvajZvdn-ykISuYFb9-BW4bVczUQGnnnuctJ9_kZY,8674
-aioamazondevices/implementation/sequence.py,sha256=xDOzQouGrsPAAPjBfHkDIAuC0fTEB5uqi8QR4VmNHYs,5650
+aioamazondevices/implementation/sequence.py,sha256=2KjNemevskRrJScxnqjwh__XxFgmjTa3chMH_c905yw,5659
 aioamazondevices/login.py,sha256=NNbZjaSC32uOGsKNkSx-URA4DIEGpCZSLp2Ey5xFv9U,17375
 aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/structures.py,sha256=2duKj9kiknFQHVGOysh0pWTQagTT-IDStCskayrwYSE,1425
+aioamazondevices/structures.py,sha256=eAMXMvkqa0dlqlxE-tz8GGSqmOjnfTBjRPqvmMuzXsE,1459
 aioamazondevices/utils.py,sha256=V6b5_CNJ5LtVBl9KSitr14nNle4mNDkZVojGhKfy60A,2373
-aioamazondevices-11.0.3.dist-info/METADATA,sha256=BxEuuS0OxVpBisq1ViK3xhejCOdQBAwu_1b7glFrQSg,8308
-aioamazondevices-11.0.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-aioamazondevices-11.0.3.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-11.0.3.dist-info/RECORD,,
+aioamazondevices-11.1.2.dist-info/METADATA,sha256=g0yIJtBIncoYM2cU9BXZ2aEsftR-_wxyBANqSLJk2pg,8308
+aioamazondevices-11.1.2.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+aioamazondevices-11.1.2.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-11.1.2.dist-info/RECORD,,

{aioamazondevices-11.0.3.dist-info → aioamazondevices-11.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any