aioamazondevices 3.1.14__tar.gz → 3.1.19__tar.gz

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

@@ -1,29 +1,24 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.1.14
+Version: 3.1.19
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
 Author-email: simone.chemelli@gmail.com
-Requires-Python: >=3.12,<4.0
-Classifier: Development Status :: 2 - Pre-Alpha
+Requires-Python: >=3.12
+Classifier: Development Status :: 4 - Beta
 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.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiohttp
-Requires-Dist: babel
 Requires-Dist: beautifulsoup4
 Requires-Dist: colorlog
+Requires-Dist: langcodes
 Requires-Dist: orjson
 Requires-Dist: yarl
 Project-URL: Bug Tracker, https://github.com/chemelli74/aioamazondevices/issues
 Project-URL: Changelog, https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md
-Project-URL: Repository, https://github.com/chemelli74/aioamazondevices
 Description-Content-Type: text/markdown
 
 # aioamazondevices

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

@@ -1,13 +1,16 @@
-[tool.poetry]
+[project]
 name = "aioamazondevices"
-version = "3.1.14"
+version = "3.1.19"
+requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
-authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
+authors = [
+{ name = "Simone Chemelli", email = "simone.chemelli@gmail.com" },
+]
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/chemelli74/aioamazondevices"
 classifiers = [
-    "Development Status :: 2 - Pre-Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Operating System :: OS Independent",
@@ -16,22 +19,22 @@ classifiers = [
 packages = [
     { include = "aioamazondevices", from = "src" },
 ]
+dependencies = [
+"aiohttp",
+"beautifulsoup4",
+"colorlog",
+"langcodes",
+"orjson",
+"yarl",
+]
 
-[tool.poetry.urls]
+[project.urls]
 "Bug Tracker" = "https://github.com/chemelli74/aioamazondevices/issues"
 "Changelog" = "https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md"
 
-[tool.poetry.dependencies]
-aiohttp = "*"
-python = "^3.12"
-babel = "*"
-beautifulsoup4 = "*"
-colorlog = "*"
-orjson = "*"
-yarl = "*"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.1"
+pytest = "^8.4"
 pytest-cov = ">=5,<7"
 
 [tool.semantic_release]

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

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

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

@@ -16,8 +16,8 @@ from urllib.parse import parse_qs, urlencode
 
 import orjson
 from aiohttp import ClientConnectorError, ClientResponse, ClientSession
-from babel import Locale
 from bs4 import BeautifulSoup, Tag
+from langcodes import Language
 from multidict import CIMultiDictProxy, MultiDictProxy
 from yarl import URL
 
@@ -58,6 +58,7 @@ from .exceptions import (
     CannotRetrieveData,
     WrongMethod,
 )
+from .utils import obfuscate_email, scrub_fields
 
 
 @dataclass
@@ -317,7 +318,7 @@ class AmazonEchoApi:
             "%s request: %s with payload %s [json=%s]",
             method,
             url,
-            input_data,
+            scrub_fields(input_data) if input_data else None,
             json_data,
         )
 
@@ -473,7 +474,7 @@ class AmazonEchoApi:
             msg = resp_json["response"]["error"]["message"]
             _LOGGER.error(
                 "Cannot register device for %s: %s",
-                self._login_email,
+                obfuscate_email(self._login_email),
                 msg,
             )
             raise CannotRegisterDevice(f"{HTTPStatus(resp.status).phrase}: {msg}")
@@ -601,7 +602,11 @@ class AmazonEchoApi:
 
     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)
+        _LOGGER.debug(
+            "Logging-in for %s [otp code: %s]",
+            obfuscate_email(self._login_email),
+            bool(otp_code),
+        )
         self._client_session()
 
         code_verifier = self._create_code_verifier()
@@ -671,7 +676,7 @@ class AmazonEchoApi:
 
         _LOGGER.debug(
             "Logging-in for %s with stored data",
-            self._login_email,
+            obfuscate_email(self._login_email),
         )
 
         self._client_session()
@@ -723,7 +728,11 @@ class AmazonEchoApi:
 
         final_devices_list: dict[str, AmazonDevice] = {}
         for device in self._devices.values():
-            devices_node = device[NODE_DEVICES]
+            # Remove stale, orphaned and virtual devices
+            devices_node = device.get(NODE_DEVICES)
+            if not devices_node or (devices_node.get("deviceType") in DEVICE_TO_IGNORE):
+                continue
+
             preferences_node = device.get(NODE_PREFERENCES)
             do_not_disturb_node = device[NODE_DO_NOT_DISTURB]
             bluetooth_node = device[NODE_BLUETOOTH]
@@ -736,13 +745,6 @@ class AmazonEchoApi:
                     if _device_id == identifier_node["entityId"]:
                         sensors = _device_sensors
 
-            # Remove stale, orphaned and virtual devices
-            if (
-                NODE_DEVICES not in device
-                or devices_node.get("deviceType") in DEVICE_TO_IGNORE
-            ):
-                continue
-
             serial_number: str = devices_node["serialNumber"]
             final_devices_list[serial_number] = AmazonDevice(
                 account_name=devices_node["accountName"],
@@ -819,8 +821,9 @@ class AmazonEchoApi:
         message_source: AmazonMusicSource | None = None,
     ) -> None:
         """Send message to specific device."""
-        locale_data = Locale.parse(f"und_{self._login_country_code}")
-        locale = f"{locale_data.language}-{locale_data.language}"
+        lang_object = Language.make(territory=self._login_country_code.upper())
+        lang_maximized = lang_object.maximize()
+        locale = f"{lang_maximized.language}-{lang_maximized.region}"
 
         if not self._login_stored_data:
             _LOGGER.warning("Trying to send message before login")

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

@@ -6,6 +6,25 @@ _LOGGER = logging.getLogger(__package__)
 
 DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
 
+TO_REDACT = {
+    "address1",
+    "address2",
+    "address3",
+    "city",
+    "county",
+    "deviceAccountId",
+    "deviceAddress",
+    "deviceOwnerCustomerId",
+    "given_name",
+    "name",
+    "password",
+    "postalCode",
+    "searchCustomerId",
+    "state",
+    "street",
+    "user_id",
+}
+
 DOMAIN_BY_ISO3166_COUNTRY = {
     "ar": {
         "domain": "com",
@@ -115,7 +134,8 @@ SPEAKER_GROUP_FAMILY = "WHA"
 SPEAKER_GROUP_MODEL = "Speaker Group"
 
 DEVICE_TO_IGNORE: list[str] = [
-    AMAZON_DEVICE_TYPE,  # Alexa App for Mobile
+    AMAZON_DEVICE_TYPE,  # Alexa App for iOS
+    "A2TF17PFR55MTB",  # Alexa App for Android
     "A1RTAM01W29CUP",  # Alexa App for PC
 ]
 
@@ -140,6 +160,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Show 15",
         "hw_version": "Gen1",
     },
+    "A1NL4BVLQ4L3N3": {
+        "model": "Echo Show",
+        "hw_version": "Gen1",
+    },
     "A1Q6UGEXJZWJQ0": {
         "model": "Fire TV Stick 4K",
         "hw_version": "Gen2",
@@ -165,6 +189,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "FireTV 4k MAX",
         "hw_version": "Gen2",
     },
+    "A1XWJRHALS1REP": {
+        "model": "Echo Show 5",
+        "hw_version": "Gen2",
+    },
     "A1Z88NGR2BK6A2": {
         "model": "Echo Show 8",
         "hw_version": "Gen1",
@@ -197,10 +225,18 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Fire TV Stick",
         "hw_version": "Gen2",
     },
+    "A2M35JJZWCQOMZ": {
+        "model": "Echo Plus",
+        "hw_version": "Gen1",
+    },
     "A2M4YX06LWP8WI": {
         "model": "Fire Tablet 7",
         "hw_version": "Gen5",
     },
+    "A2N49KXGVA18AR": {
+        "model": "Fire HD 10 Plus",
+        "hw_version": "Gen11",
+    },
     "A2U21SRK4QGSE1": {
         "model": "Echo Dot",
         "hw_version": "Gen4",
@@ -250,6 +286,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Sonos Beam",
         "hw_version": None,
     },
+    "A3RBAYBE7VM004": {
+        "model": "Echo Studio",
+        "hw_version": None,
+    },
     "A3RMGO6LYLH7YN": {
         "model": "Echo Dot",
         "hw_version": "Gen4",
@@ -299,6 +339,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Fire TV Stick 4K",
         "hw_version": "Gen1",
     },
+    "AP1F6KUH00XPV": {
+        "model": "Echo Stereo Pair",
+        "hw_version": "Virtual",
+    },
     "ASQZWP4GPYUT7": {
         "model": "Echo pop",
         "hw_version": "Gen1",

aioamazondevices-3.1.19/src/aioamazondevices/utils.py

@@ -0,0 +1,58 @@
+"""Utils module for Amazon devices."""
+
+from collections.abc import Collection
+from typing import Any
+
+from .const import TO_REDACT
+
+
+def obfuscate_email(email: str) -> str:
+    """Obfuscate an email address partially."""
+    try:
+        username, domain = email.split("@")
+        domain_name, domain_ext = domain.rsplit(".", 1)
+
+        def obfuscate_part(part: str, visible: int = 1) -> str:
+            if len(part) <= visible:
+                return "*" * len(part)
+            return part[:visible] + "*" * (len(part) - visible)
+
+        # Obfuscate username and domain parts
+        obf_user = ".".join(obfuscate_part(u, 1) for u in username.split("."))
+        obf_domain = obfuscate_part(domain_name, 1)
+
+    except (SyntaxError, ValueError):
+        return "[invalid email]"
+    else:
+        return f"{obf_user}@{obf_domain}.{domain_ext}"
+
+
+def scrub_fields(
+    obj: Any,  # noqa: ANN401
+    field_names: Collection[str] = TO_REDACT,
+    replacement: str = "[REDACTED]",
+) -> Any:  # noqa: ANN401
+    """Return a deep-copied version of *obj* with redacted keys."""
+    if isinstance(obj, dict):
+        result = {}
+        for k, v in obj.items():
+            # If the key itself is sensitive → overwrite its value
+            if k in field_names:
+                result[k] = replacement
+            else:
+                # Otherwise keep walking
+                result[k] = scrub_fields(v, field_names, replacement)
+        return result
+
+    if isinstance(obj, list):
+        return [scrub_fields(item, field_names, replacement) for item in obj]
+
+    if isinstance(obj, tuple):
+        return tuple(scrub_fields(item, field_names, replacement) for item in obj)
+
+    if isinstance(obj, set):
+        # Note: a set cannot contain mutable/unhashable items like dicts,
+        # so we assume its members are hashable after scrubbing.
+        return {scrub_fields(item, field_names, replacement) for item in obj}
+
+    return obj