aioamazondevices 0.7.3__tar.gz → 0.9.0__tar.gz

{aioamazondevices-0.7.3 → aioamazondevices-0.9.0}/PKG-INFO

@@ -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.7.3 → aioamazondevices-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "0.7.3"
+version = "0.9.0"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"
@@ -22,7 +22,7 @@ packages = [
 "Changelog" = "https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md"
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
 beautifulsoup4 = "*"
 colorlog = "*"
 httpx = "*"
@@ -30,7 +30,7 @@ orjson = "*"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.1"
-pytest-cov = "^5.0"
+pytest-cov = ">=5,<7"
 
 [tool.semantic_release]
 version_toml = ["pyproject.toml:tool.poetry.version"]

{aioamazondevices-0.7.3 → aioamazondevices-0.9.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-0.7.3 → aioamazondevices-0.9.0}/src/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-0.7.3 → aioamazondevices-0.9.0}/src/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