aioamazondevices 6.2.7__py3-none-any.whl → 6.2.9__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -141,7 +141,6 @@ class AmazonEchoApi:
         self._list_for_clusters: dict[str, str] = {}
 
         self._session = client_session
-        self._devices: dict[str, Any] = {}
 
         _LOGGER.debug("Initialize library v%s", __version__)
 
@@ -595,21 +594,33 @@ class AmazonEchoApi:
         return await self._response_to_json(raw_resp)
 
     async def _get_sensors_states(
-        self,
+        self, devices: dict[str, Any]
     ) -> tuple[dict[str, dict[str, Any]], dict[str, dict[str, AmazonDeviceSensor]]]:
         """Retrieve devices sensors states."""
         devices_state = await self._get_devices_state()
         devices_sensors: dict[str, dict[str, AmazonDeviceSensor]] = {}
         devices_endpoints: dict[str, dict[str, Any]] = {}
 
-        endpoints = devices_state["data"]["listEndpoints"]
+        if error := devices_state.get("errors"):
+            if isinstance(error, list):
+                error = error[0]
+            msg = error.get("message", "Unknown error")
+            path = error.get("path", "Unknown path")
+            _LOGGER.error("Error retrieving devices state: %s for path %s", msg, path)
+            return {}, {}
+
+        if not (data := devices_state.get("data")) or not data.get("listEndpoints"):
+            _LOGGER.error("Malformed devices state data received: %s", devices_state)
+            return {}, {}
+
+        endpoints = data["listEndpoints"]
         for endpoint in endpoints.get("endpoints"):
             serial_number = (
                 endpoint["serialNumber"]["value"]["text"]
                 if endpoint["serialNumber"]
                 else None
             )
-            if serial_number in self._devices:
+            if serial_number in devices:
                 devices_sensors[serial_number] = self._get_device_sensor_state(
                     endpoint, serial_number
                 )
@@ -831,11 +842,33 @@ class AmazonEchoApi:
             self._country_specific_data(user_domain)
             await self._refresh_auth_cookies()
 
+    async def _get_account_owner_customer_id(self, data: dict[str, Any]) -> str | None:
+        """Get account owner customer ID."""
+        if data["deviceType"] != AMAZON_DEVICE_TYPE:
+            return None
+
+        account_owner_customer_id: str | None = None
+
+        this_device_serial = self._login_stored_data["device_info"][
+            "device_serial_number"
+        ]
+
+        for subdevice in data["appDeviceList"]:
+            if subdevice["serialNumber"] == this_device_serial:
+                account_owner_customer_id = data["deviceOwnerCustomerId"]
+                _LOGGER.debug(
+                    "Setting account owner: %s",
+                    account_owner_customer_id,
+                )
+                break
+
+        return account_owner_customer_id
+
     async def get_devices_data(
         self,
     ) -> dict[str, AmazonDevice]:
         """Get Amazon devices data."""
-        self._devices = {}
+        devices = {}
         _, raw_resp = await self._session_request(
             method=HTTPMethod.GET,
             url=f"https://alexa.amazon.{self._domain}{URI_DEVICES}",
@@ -845,19 +878,26 @@ class AmazonEchoApi:
 
         _LOGGER.debug("JSON devices data: %s", scrub_fields(json_data))
 
-        this_device_serial = self._login_stored_data["device_info"][
-            "device_serial_number"
-        ]
         for data in json_data["devices"]:
             dev_serial = data.get("serialNumber")
-            self._devices[dev_serial] = data
-            if dev_serial == this_device_serial:
-                self._account_owner_customer_id = data["deviceOwnerCustomerId"]
+            if not dev_serial:
+                _LOGGER.warning(
+                    "Skipping device without serial number: %s", data["accountName"]
+                )
+                continue
+            devices[dev_serial] = data
+            if not self._account_owner_customer_id:
+                self._account_owner_customer_id = (
+                    await self._get_account_owner_customer_id(data)
+                )
+
+        if not self._account_owner_customer_id:
+            raise CannotRetrieveData("Cannot find account owner customer ID")
 
-        devices_endpoints, devices_sensors = await self._get_sensors_states()
+        devices_endpoints, devices_sensors = await self._get_sensors_states(devices)
 
         final_devices_list: dict[str, AmazonDevice] = {}
-        for device in self._devices.values():
+        for device in devices.values():
             # Remove stale, orphaned and virtual devices
             if not device or (device.get("deviceType") in DEVICE_TO_IGNORE):
                 continue

{aioamazondevices-6.2.7.dist-info → aioamazondevices-6.2.9.dist-info}/METADATA

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

{aioamazondevices-6.2.7.dist-info → aioamazondevices-6.2.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
-aioamazondevices/__init__.py,sha256=7ypbsqEYHFGm1dMAGooQibrUEoO6tovsrqDr7KH7WwE,276
-aioamazondevices/api.py,sha256=6F4UwDNuQXsdfVxpZKXSWVIKsoNgoFJ2whguJxT0hEM,43558
+aioamazondevices/__init__.py,sha256=uARWO02mQ70rgxwWyOTxs9HC8FjeynIm_FBuhCenQBk,276
+aioamazondevices/api.py,sha256=B7KYropGmSwQl7sYzS7rTDDkiviIASsAszl1tsKDL70,45090
 aioamazondevices/const.py,sha256=pPjMhNABj3rN8uvHzqj41tDiGPx-C50QRcSckvzX9z8,11561
 aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
 aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aioamazondevices/query.py,sha256=qLCuNyVlSbvVQmckZUsmftsz8s04GIukdidsOo4BrD0,2084
 aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
 aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-6.2.7.dist-info/METADATA,sha256=Ap2Tr3-p6e0kSf3IEdz9Vj-cqrp_EmA97IFsRb54weg,7656
-aioamazondevices-6.2.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-aioamazondevices-6.2.7.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-6.2.7.dist-info/RECORD,,
+aioamazondevices-6.2.9.dist-info/METADATA,sha256=0ULxMwg8faUXH8FU6_-2qvBd9Oc3LRm2HRVif5JJh7A,7656
+aioamazondevices-6.2.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+aioamazondevices-6.2.9.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-6.2.9.dist-info/RECORD,,