aioamazondevices 3.1.19__tar.gz → 3.1.22__tar.gz

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/PKG-INFO

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

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "3.1.19"
+version = "3.1.22"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [
@@ -38,7 +38,7 @@ pytest = "^8.4"
 pytest-cov = ">=5,<7"
 
 [tool.semantic_release]
-version_toml = ["pyproject.toml:tool.poetry.version"]
+version_toml = ["pyproject.toml:project.version"]
 version_variables = [
     "src/aioamazondevices/__init__.py:__version__",
 ]

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/src/aioamazondevices/api.py

@@ -479,11 +479,6 @@ class AmazonEchoApi:
             )
             raise CannotRegisterDevice(f"{HTTPStatus(resp.status).phrase}: {msg}")
 
-        await self._save_to_file(
-            await resp.text(),
-            url=register_url,
-            extension=JSON_EXTENSION,
-        )
         success_response = resp_json["response"]["success"]
 
         tokens = success_response["tokens"]
@@ -530,16 +525,43 @@ class AmazonEchoApi:
         location_details = network_detail["locationDetails"]["locationDetails"]
         default_location = location_details["Default_Location"]
         amazon_bridge = default_location["amazonBridgeDetails"]["amazonBridgeDetails"]
-        lambda_bridge = amazon_bridge.get("LambdaBridge_AAA/SonarCloudService")
-        if not lambda_bridge:
-            # Some very old devices lack the key for sensors data
-            return []
-        appliance_details = lambda_bridge["applianceDetails"]["applianceDetails"]
 
+        # New devices are based on LambdaBridge_AAA structure
+        lambda_bridge_aaa = amazon_bridge.get("LambdaBridge_AAA/SonarCloudService")
+        appliance_details_aaa = (
+            lambda_bridge_aaa["applianceDetails"]["applianceDetails"]
+            if lambda_bridge_aaa
+            else {}
+        )
+
+        entity_ids_list: list[dict[str, str]] = await self._get_entities_ids(
+            appliance_details_aaa, "AAA_SonarCloudService"
+        )
+
+        # Old devices are based on LambdaBridge_AlexaBridge structure
+        for bridge_key, bridge_value in amazon_bridge.items():
+            if "LambdaBridge_AlexaBridge/" in bridge_key:
+                # Value key:    "LambdaBridge_AlexaBridge/XXXXXXXXXXXXXX@XXXXXXXXXXXXXX"
+                # Value subkey: "AlexaBridge_XXXXXXXXXXXXXX@XXXXXXXXXXXXXX_XXXXXXXXXXXX"
+                subkey = bridge_key.split("_")[1].replace("/", "_")
+
+                appliance_details_alexa = bridge_value["applianceDetails"][
+                    "applianceDetails"
+                ]
+                entity_ids_list.extend(
+                    await self._get_entities_ids(appliance_details_alexa, subkey)
+                )
+
+        return entity_ids_list
+
+    async def _get_entities_ids(
+        self, appliance_details: dict[str, Any], searchkey: str
+    ) -> list[dict[str, str]]:
+        """Extract entityId and applianceId."""
         entity_ids_list: list[dict[str, str]] = []
-        # Process each appliance that starts with AAA_SonarCloudService
+        # Process each appliance that starts with "searchkey"
         for appliance_key, appliance_data in appliance_details.items():
-            if not appliance_key.startswith("AAA_SonarCloudService"):
+            if not appliance_key.startswith(searchkey):
                 continue
 
             entity_id = appliance_data["entityId"]
@@ -662,7 +684,7 @@ class AmazonEchoApi:
         register_device = await self._register_device(device_login_data)
         self._login_stored_data = register_device
 
-        _LOGGER.info("Register device: %s", register_device)
+        _LOGGER.info("Register device: %s", scrub_fields(register_device))
         return register_device
 
     async def login_mode_stored_data(self) -> dict[str, Any]:
@@ -704,7 +726,6 @@ class AmazonEchoApi:
             _LOGGER.debug("Response code: |%s|", response_code)
 
             response_data = await raw_resp.text()
-            _LOGGER.debug("Response data: |%s|", response_data)
 
             if not self._csrf_cookie:
                 self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE, Morsel()).value
@@ -712,7 +733,7 @@ class AmazonEchoApi:
 
             json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
-            _LOGGER.debug("JSON data: |%s|", json_data)
+            _LOGGER.debug("JSON data: |%s|", scrub_fields(json_data))
 
             for data in json_data[key]:
                 dev_serial = data.get("serialNumber") or data.get("deviceSerialNumber")

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/src/aioamazondevices/const.py

@@ -7,11 +7,13 @@ _LOGGER = logging.getLogger(__package__)
 DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
 
 TO_REDACT = {
+    "address",
     "address1",
     "address2",
     "address3",
     "city",
     "county",
+    "customerId",
     "deviceAccountId",
     "deviceAddress",
     "deviceOwnerCustomerId",

{aioamazondevices-3.1.19 → aioamazondevices-3.1.22}/src/aioamazondevices/utils.py

@@ -37,7 +37,9 @@ def scrub_fields(
         result = {}
         for k, v in obj.items():
             # If the key itself is sensitive → overwrite its value
-            if k in field_names:
+            if k == "email":
+                result[k] = obfuscate_email(v)
+            elif k in field_names:
                 result[k] = replacement
             else:
                 # Otherwise keep walking