aioamazondevices 0.11.0__tar.gz → 0.12.0__tar.gz

{aioamazondevices-0.11.0 → aioamazondevices-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.11.0
+Version: 0.12.0
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
 License: Apache-2.0

{aioamazondevices-0.11.0 → aioamazondevices-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "0.11.0"
+version = "0.12.0"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"

{aioamazondevices-0.11.0 → aioamazondevices-0.12.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-0.11.0 → aioamazondevices-0.12.0}/src/aioamazondevices/api.py

@@ -29,10 +29,13 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
-    DEVICES,
     DOMAIN_BY_COUNTRY,
     HTML_EXTENSION,
     JSON_EXTENSION,
+    NODE_BLUETOOTH,
+    NODE_DEVICES,
+    NODE_DO_NOT_DISTURB,
+    NODE_PREFERENCES,
     SAVE_PATH,
     URI_QUERIES,
 )
@@ -43,13 +46,16 @@ from .exceptions import CannotAuthenticate, CannotRegisterDevice, WrongMethod
 class AmazonDevice:
     """Amazon device class."""
 
-    connected: bool
-    connection_type: str
-    ip_address: str
-    name: str
-    mac: str
-    type: str
-    wifi: str
+    account_name: str
+    capabilities: list[str]
+    device_family: str
+    device_type: str
+    online: bool
+    serial_number: str
+    software_version: str
+    do_not_disturb: bool
+    response_style: str | None
+    bluetooth_state: bool
 
 
 class AmazonEchoApi:
@@ -486,7 +492,7 @@ class AmazonEchoApi:
 
     async def get_devices_data(
         self,
-    ) -> dict[str, Any]:
+    ) -> dict[str, AmazonDevice]:
         """Get Amazon devices data."""
         devices: dict[str, Any] = {}
         for key in URI_QUERIES:
@@ -511,13 +517,28 @@ class AmazonEchoApi:
                 else:
                     devices[dev_serial] = {key: data}
 
-        # Remove stale, orphaned and virtual devices
-        final_devices_list: dict[str, Any] = devices.copy()
-        for serial, device in devices.items():
+        final_devices_list: dict[str, AmazonDevice] = {}
+        for device in devices.values():
+            # Remove stale, orphaned and virtual devices
             if (
-                DEVICES not in device
-                or device[DEVICES].get("deviceType") == AMAZON_DEVICE_TYPE
+                NODE_DEVICES not in device
+                or device[NODE_DEVICES].get("deviceType") == AMAZON_DEVICE_TYPE
             ):
-                final_devices_list.pop(serial)
+                continue
+
+            serial_number: str = device[NODE_DEVICES]["serialNumber"]
+            preferences = device.get(NODE_PREFERENCES)
+            final_devices_list[serial_number] = AmazonDevice(
+                account_name=device[NODE_DEVICES]["accountName"],
+                capabilities=device[NODE_DEVICES]["capabilities"],
+                device_family=device[NODE_DEVICES]["deviceFamily"],
+                device_type=device[NODE_DEVICES]["deviceType"],
+                online=device[NODE_DEVICES]["online"],
+                serial_number=serial_number,
+                software_version=device[NODE_DEVICES]["softwareVersion"],
+                do_not_disturb=device[NODE_DO_NOT_DISTURB]["enabled"],
+                response_style=preferences["responseStyle"] if preferences else None,
+                bluetooth_state=device[NODE_BLUETOOTH]["online"],
+            )
 
         return final_devices_list

{aioamazondevices-0.11.0 → aioamazondevices-0.12.0}/src/aioamazondevices/const.py

@@ -44,12 +44,16 @@ DEFAULT_HEADERS = {
     "Accept-Encoding": "gzip",
 }
 
-DEVICES = "devices"
+NODE_DEVICES = "devices"
+NODE_DO_NOT_DISTURB = "doNotDisturbDeviceStatusList"
+NODE_PREFERENCES = "devicePreferences"
+NODE_BLUETOOTH = "bluetoothStates"
+
 URI_QUERIES = {
-    DEVICES: "/api/devices-v2/device",
-    "doNotDisturbDeviceStatusList": "/api/dnd/device-status-list",
-    "devicePreferences": "/api/device-preferences",
-    "bluetoothStates": "/api/bluetooth",
+    NODE_DEVICES: "/api/devices-v2/device",
+    NODE_DO_NOT_DISTURB: "/api/dnd/device-status-list",
+    NODE_PREFERENCES: "/api/device-preferences",
+    NODE_BLUETOOTH: "/api/bluetooth",
 }
 
 # File extensions