aioamazondevices 0.7.3__py3-none-any.whl → 0.9.0__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -28,6 +28,7 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
+    DEVICES,
     DOMAIN_BY_COUNTRY,
     HTML_EXTENSION,
     JSON_EXTENSION,
@@ -58,7 +59,7 @@ class AmazonEchoApi:
         login_country_code: str,
         login_email: str,
         login_password: str,
-        save_html: bool = False,
+        save_raw_data: bool = False,
     ) -> None:
         """Initialize the scanner."""
         # Force country digits as lower case
@@ -79,7 +80,7 @@ class AmazonEchoApi:
         self._url = f"https://www.amazon.{domain}"
         self._cookies = self._build_init_cookies()
         self._headers = DEFAULT_HEADERS
-        self._save_html = save_html
+        self._save_raw_data = save_raw_data
         self._serial = self._serial_number()
 
         self.session: AsyncClient
@@ -235,7 +236,7 @@ class AmazonEchoApi:
         output_path: str = SAVE_PATH,
     ) -> None:
         """Save response data to disk."""
-        if not self._save_html:
+        if not self._save_raw_data:
             return
 
         output_dir = Path(output_path)
@@ -441,7 +442,7 @@ class AmazonEchoApi:
         self,
     ) -> dict[str, Any]:
         """Get Amazon devices data."""
-        devices = {}
+        devices: dict[str, Any] = {}
         for key in URI_QUERIES:
             _, raw_resp = await self._session_request(
                 "GET",
@@ -457,10 +458,21 @@ class AmazonEchoApi:
 
             _LOGGER.debug("JSON data: |%s|", json_data)
 
-            devices.update(
-                {
-                    key: json_data,
-                },
-            )
-
-        return devices
+            for data in json_data[key]:
+                dev_serial = data.get("serialNumber") or data.get("deviceSerialNumber")
+                if previous_data := devices.get(dev_serial):
+                    devices[dev_serial] = previous_data | {key: data}
+                else:
+                    devices[dev_serial] = {key: data}
+
+        # Remove stale, orphaned and virtual devices
+        final_devices_list: dict[str, Any] = devices.copy()
+        for serial in devices:
+            device = devices[serial]
+            if (
+                DEVICES not in device
+                or device[DEVICES].get("deviceType") == AMAZON_DEVICE_TYPE
+            ):
+                final_devices_list.pop(serial)
+
+        return final_devices_list

aioamazondevices/const.py

@@ -35,12 +35,12 @@ DEFAULT_HEADERS = {
     "Accept-Encoding": "gzip",
 }
 
+DEVICES = "devices"
 URI_QUERIES = {
-    "base": "/api/devices-v2/device",
-    "status": "/api/dnd/device-status-list",
-    "preferences": "/api/device-preferences",
-    "automations": "/api/behaviors/v2/automations",
-    "bluetooth": "/api/bluetooth",
+    DEVICES: "/api/devices-v2/device",
+    "doNotDisturbDeviceStatusList": "/api/dnd/device-status-list",
+    "devicePreferences": "/api/device-preferences",
+    "bluetoothStates": "/api/bluetooth",
 }
 
 # Amazon APP info

{aioamazondevices-0.7.3.dist-info → aioamazondevices-0.9.0.dist-info}/METADATA

@@ -1,19 +1,18 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.7.3
+Version: 0.9.0
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
 License: Apache-2.0
 Author: Simone Chemelli
 Author-email: simone.chemelli@gmail.com
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries

aioamazondevices-0.9.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioamazondevices/__init__.py,sha256=uvo6LseWC7RF7rLYW5_5MxB9lsIE-azOJqwDtdoZmY4,276
+aioamazondevices/api.py,sha256=5WuQuXi0TX6pjuZBn5JcqPPNUe43E8FnLhSmYGfe4vE,17168
+aioamazondevices/const.py,sha256=MJYY90iUDvj1x3MKEh5RQoflQ-ftnIp0YvJLTSemGEI,1351
+aioamazondevices/exceptions.py,sha256=yQ9nL4UwBdHNXvdRj8TRemed6PXBmExP8lbHaAp04vY,546
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices-0.9.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-0.9.0.dist-info/METADATA,sha256=apvr3suIW9DI-5_lw2K8YBnsuq38jdV9v61V9EsYc6s,4701
+aioamazondevices-0.9.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+aioamazondevices-0.9.0.dist-info/RECORD,,

aioamazondevices-0.7.3.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioamazondevices/__init__.py,sha256=43R_n8z8MnmFxV1nrDOdsTWDjs61LdB_GbYMBmN1YTU,276
-aioamazondevices/api.py,sha256=3eagygo9Kx1Qx2v602wZW6MyCTuA5Tmq545TmGX6zWc,16518
-aioamazondevices/const.py,sha256=BnA9rU9S9vH9mmmE-In443PECLUmGll9-iWu-oETo4s,1348
-aioamazondevices/exceptions.py,sha256=yQ9nL4UwBdHNXvdRj8TRemed6PXBmExP8lbHaAp04vY,546
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices-0.7.3.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-0.7.3.dist-info/METADATA,sha256=u9bchAmH6hMggC3zHTUDMR7phel-64dmrv9ptUdp0vE,4752
-aioamazondevices-0.7.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-aioamazondevices-0.7.3.dist-info/RECORD,,