aioamazondevices 3.0.10__tar.gz → 3.1.1__tar.gz

{aioamazondevices-3.0.10 → aioamazondevices-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.0.10
+Version: 3.1.1
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

{aioamazondevices-3.0.10 → aioamazondevices-3.1.1}/pyproject.toml

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

{aioamazondevices-3.0.10 → aioamazondevices-3.1.1}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.0.10 → aioamazondevices-3.1.1}/src/aioamazondevices/api.py

@@ -42,9 +42,13 @@ from .const import (
     NODE_BLUETOOTH,
     NODE_DEVICES,
     NODE_DO_NOT_DISTURB,
+    NODE_IDENTIFIER,
     NODE_PREFERENCES,
     SAVE_PATH,
+    SENSORS,
+    URI_IDS,
     URI_QUERIES,
+    URI_SENSORS,
 )
 from .exceptions import (
     CannotAuthenticate,
@@ -54,6 +58,15 @@ from .exceptions import (
 )
 
 
+@dataclass
+class AmazonDeviceSensor:
+    """Amazon device sensor class."""
+
+    name: str
+    value: Any
+    scale: str | None
+
+
 @dataclass
 class AmazonDevice:
     """Amazon device class."""
@@ -70,6 +83,9 @@ class AmazonDevice:
     do_not_disturb: bool
     response_style: str | None
     bluetooth_state: bool
+    entity_id: str
+    appliance_id: str
+    sensors: dict[str, AmazonDeviceSensor]
 
 
 class AmazonSequenceType(StrEnum):
@@ -125,6 +141,7 @@ class AmazonEchoApi:
         self._list_for_clusters: dict[str, str] = {}
 
         self.session: ClientSession
+        self._devices: dict[str, Any] = {}
 
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
@@ -485,6 +502,84 @@ class AmazonEchoApi:
         await self._save_to_file(login_data, "login_data", JSON_EXTENSION)
         return login_data
 
+    async def _get_devices_ids(self) -> list[dict[str, str]]:
+        """Retrieve devices entityId and applianceId."""
+        _, raw_resp = await self._session_request(
+            "GET",
+            url=f"https://alexa.amazon.{self._domain}{URI_IDS}",
+        )
+        json_data = await raw_resp.json()
+
+        network_detail = orjson.loads(json_data["networkDetail"])
+        # Navigate through the nested structure step by step
+        location_details = network_detail["locationDetails"]["locationDetails"]
+        default_location = location_details["Default_Location"]
+        amazon_bridge = default_location["amazonBridgeDetails"]["amazonBridgeDetails"]
+        lambda_bridge = amazon_bridge["LambdaBridge_AAA/SonarCloudService"]
+        appliance_details = lambda_bridge["applianceDetails"]["applianceDetails"]
+
+        entity_ids_list: list[dict[str, str]] = []
+        # Process each appliance that starts with AAA_SonarCloudService
+        for appliance_key, appliance_data in appliance_details.items():
+            if not appliance_key.startswith("AAA_SonarCloudService"):
+                continue
+
+            entity_id = appliance_data["entityId"]
+            appliance_id = appliance_data["applianceId"]
+
+            # Create identifier object for this appliance
+            identifier = {
+                "entityId": entity_id,
+                "applianceId": appliance_id,
+            }
+
+            # Update device information for each device in the identifier list
+            for device_identifier in appliance_data["alexaDeviceIdentifierList"]:
+                serial_number = device_identifier["dmsDeviceSerialNumber"]
+
+                # Add identifier information to the device
+                self._devices[serial_number] |= {NODE_IDENTIFIER: identifier}
+
+            # Add to entity IDs list for sensor retrieval
+            entity_ids_list.append({"entityId": entity_id, "entityType": "ENTITY"})
+
+        return entity_ids_list
+
+    async def _get_sensors_states(
+        self, entity_ids_list: list[dict[str, str]]
+    ) -> dict[str, dict[str, AmazonDeviceSensor]]:
+        """Retrieve devices sensors states."""
+        _data = {"stateRequests": entity_ids_list}
+        _, raw_resp = await self._session_request(
+            "POST",
+            url=f"https://alexa.amazon.{self._domain}{URI_SENSORS}",
+            input_data=_data,
+            json_data=True,
+        )
+        json_data = await raw_resp.json()
+
+        final_sensors: dict[str, dict[str, AmazonDeviceSensor]] = {}
+        for sensors in json_data["deviceStates"]:
+            _id = sensors["entity"]["entityId"]
+            dict_sensors: dict[str, AmazonDeviceSensor] = {}
+            for sensor in sensors["capabilityStates"]:
+                sensor_json = orjson.loads(sensor)
+                if sensor_json["name"] in SENSORS:
+                    _value = sensor_json["value"]
+                    _value_dict = isinstance(_value, dict)
+                    _name = sensor_json["name"]
+                    dict_sensors.update(
+                        {
+                            _name: AmazonDeviceSensor(
+                                name=_name,
+                                value=(_value["value"] if _value_dict else _value),
+                                scale=_value.get("scale") if _value_dict else None,
+                            )
+                        }
+                    )
+            final_sensors.update({_id: dict_sensors})
+        return final_sensors
+
     async def login_mode_interactive(self, otp_code: str) -> dict[str, Any]:
         """Login to Amazon interactively via OTP."""
         _LOGGER.debug("Logging-in for %s [otp code %s]", self._login_email, otp_code)
@@ -574,7 +669,7 @@ class AmazonEchoApi:
         self,
     ) -> dict[str, AmazonDevice]:
         """Get Amazon devices data."""
-        devices: dict[str, Any] = {}
+        self._devices = {}
         for key in URI_QUERIES:
             _, raw_resp = await self._session_request(
                 method=HTTPMethod.GET,
@@ -597,17 +692,28 @@ class AmazonEchoApi:
 
             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}
+                if previous_data := self._devices.get(dev_serial):
+                    self._devices[dev_serial] = previous_data | {key: data}
                 else:
-                    devices[dev_serial] = {key: data}
+                    self._devices[dev_serial] = {key: data}
+
+        entity_ids_list = await self._get_devices_ids()
+        devices_sensors = await self._get_sensors_states(entity_ids_list)
 
         final_devices_list: dict[str, AmazonDevice] = {}
-        for device in devices.values():
+        for device in self._devices.values():
             devices_node = device[NODE_DEVICES]
             preferences_node = device.get(NODE_PREFERENCES)
             do_not_disturb_node = device[NODE_DO_NOT_DISTURB]
             bluetooth_node = device[NODE_BLUETOOTH]
+            identifier_node = device.get(NODE_IDENTIFIER, {})
+
+            # Add sensors
+            if identifier_node:
+                for _device_id, _device_sensors in devices_sensors.items():
+                    if _device_id == identifier_node["entityId"]:
+                        sensors = _device_sensors
+
             # Remove stale, orphaned and virtual devices
             if (
                 NODE_DEVICES not in device
@@ -633,6 +739,9 @@ class AmazonEchoApi:
                     preferences_node["responseStyle"] if preferences_node else None
                 ),
                 bluetooth_state=bluetooth_node["online"],
+                entity_id=identifier_node.get("entityId"),
+                appliance_id=identifier_node.get("applianceId"),
+                sensors=sensors,
             )
 
         self._list_for_clusters.update(

{aioamazondevices-3.0.10 → aioamazondevices-3.1.1}/src/aioamazondevices/const.py

@@ -51,20 +51,45 @@ NODE_DEVICES = "devices"
 NODE_DO_NOT_DISTURB = "doNotDisturbDeviceStatusList"
 NODE_PREFERENCES = "devicePreferences"
 NODE_BLUETOOTH = "bluetoothStates"
+NODE_IDENTIFIER = "identifier"
+NODE_SENSORS = "sensors"
 
 URI_QUERIES = {
     NODE_DEVICES: "/api/devices-v2/device",
     NODE_DO_NOT_DISTURB: "/api/dnd/device-status-list",
     NODE_PREFERENCES: "/api/device-preferences",
     NODE_BLUETOOTH: "/api/bluetooth",
+    # "/api/ping"
+    # "/api/np/command"
+    # "/api/np/player"
+    # "/api/device-wifi-details"
+    # "/api/activities"
+    # "/api/behaviors/v2/automations"
+    # "/api/notifications"
 }
 
+URI_IDS = "/api/phoenix"
+URI_SENSORS = "/api/phoenix/state"
+
+SENSORS = [
+    "babyCryDetectionState",
+    "beepingApplianceDetectionState",
+    "coughDetectionState",
+    "dogBarkDetectionState",
+    "humanPresenceDetectionState",
+    "illuminance",
+    "temperature",
+    "waterSoundsDetectionState",
+]
+SENSOR_STATE_OFF = "NOT_DETECTED"
+
 # File extensions
 SAVE_PATH = "out"
 HTML_EXTENSION = ".html"
 JSON_EXTENSION = ".json"
 BIN_EXTENSION = ".bin"
 
+SPEAKER_GROUP_FAMILY = "WHA"
 SPEAKER_GROUP_MODEL = "Speaker Group"
 
 DEVICE_TO_IGNORE: list[str] = [
@@ -81,6 +106,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Show 5",
         "hw_version": "Gen3",
     },
+    "A15996VY63BQ2D": {
+        "model": "Echo Show 8",
+        "hw_version": "Gen2",
+    },
     "A1Q6UGEXJZWJQ0": {
         "model": "Fire TV Stick 4K",
         "hw_version": "Gen2",
@@ -89,10 +118,26 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
+    "A1TD5Z1R8IWBHA ": {
+        "model": "Fire HD 8",
+        "hw_version": "Gen12",
+    },
+    "A1VGB7MHSIEYFK": {
+        "model": "Fire TV Cube",
+        "hw_version": "Gen3",
+    },
+    "A1WZKXFLI43K86": {
+        "model": "FireTV 4k MAX",
+        "hw_version": "Gen2",
+    },
     "A1Z88NGR2BK6A2": {
         "model": "Echo Show 8",
         "hw_version": "Gen1",
     },
+    "A265XOI9586NML": {
+        "model": "Fire TV Stick with Alexa Voice Remote",
+        "hw_version": None,
+    },
     "A271DR1789MXDS": {
         "model": "Fire Tablet 7",
         "hw_version": "Gen12",
@@ -143,7 +188,11 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
     },
     "A3C9PE6TNYLTCH": {
         "model": "Speaker Group",
-        "hw_version": "None",
+        "hw_version": None,
+    },
+    "A3EVMLQTU6WL1W": {
+        "model": "FireTV 4k MAX",
+        "hw_version": "Gen1",
     },
     "A3RMGO6LYLH7YN": {
         "model": "Echo Dot",
@@ -155,7 +204,7 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
     },
     "A3VRME03NAXFUB": {
         "model": "Echo Flex",
-        "hw_version": "None",
+        "hw_version": None,
     },
     "A4ZP7ZC4PI6TO": {
         "model": "Echo Show 3",
@@ -173,6 +222,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen2",
     },
+    "ADVBD696BHNV5": {
+        "model": "Fire TV Stick",
+        "hw_version": "Gen1",
+    },
     "AIPK7MM90V7TB": {
         "model": "Echo Show 10",
         "hw_version": "Gen3",
@@ -182,7 +235,7 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "hw_version": "Gen1",
     },
     "AKPGW064GI9HE": {
-        "model": " Fire TV Stick 4K",
+        "model": "Fire TV Stick 4K",
         "hw_version": "Gen1",
     },
     "ATNLRCEBX3W4P": {