Updates

Author: aneisch

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions)
 [![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity)
-[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2026.2.1%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest)
+[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2026.2.2%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest)
 <br><a href="https://www.buymeacoffee.com/aneisch" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-black.png" width="150px" height="35px" alt="Buy Me A Coffee" style="height: 35px !important;width: 150px !important;" ></a>
 
 I do my best to keep [Home Assistant](https://github.com/home-assistant/home-assistant) on the [latest release](https://github.com/home-assistant/home-assistant/releases/latest). I'm heavily utilizing [AppDaemon](http://appdaemon.readthedocs.io/en/latest/) and [NodeRed](https://flows.nodered.org/node/node-red-contrib-home-assistant-websocket) for advanced/templated automations. See [Appdaemon config](https://github.com/aneisch/home-assistant-config/tree/master/extras/appdaemon) and my NodeRed screenshots below for details. Most of my setup is run as Docker containers (see [docker-compose](https://github.com/aneisch/home-assistant-config/tree/master/extras/docker-compose) for container list).
@@ -58,21 +58,21 @@ Home Assistant and other containers have ingress handled automatically by [Traef
 Description | value
 -- | --
 Lines of ESPHome YAML | 6017
-Lines of Home Assistant YAML | 12716
-[Integrations](https://www.home-assistant.io/integrations/) in use | 77
+Lines of Home Assistant YAML | 12733
+[Integrations](https://www.home-assistant.io/integrations/) in use | 76
 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 
 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37
 
 Description | value
 -- | --
-Entities in the [`ai_task`](https://www.home-assistant.io/components/ai_task) domain | 2
-Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 144
+Entities in the [`ai_task`](https://www.home-assistant.io/components/ai_task) domain | 1
+Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 145
 Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 183
-Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 72
+Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 74
 Entities in the [`calendar`](https://www.home-assistant.io/components/calendar) domain | 1
 Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 13
 Entities in the [`climate`](https://www.home-assistant.io/components/climate) domain | 1
-Entities in the [`conversation`](https://www.home-assistant.io/components/conversation) domain | 3
+Entities in the [`conversation`](https://www.home-assistant.io/components/conversation) domain | 2
 Entities in the [`counter`](https://www.home-assistant.io/components/counter) domain | 1
 Entities in the [`cover`](https://www.home-assistant.io/components/cover) domain | 19
 Entities in the [`datetime`](https://www.home-assistant.io/components/datetime) domain | 6
@@ -97,20 +97,20 @@ Entities in the [`plant`](https://www.home-assistant.io/components/plant) domain
 Entities in the [`remote`](https://www.home-assistant.io/components/remote) domain | 5
 Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 58
 Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 14
-Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 731
+Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 738
 Entities in the [`setter`](https://www.home-assistant.io/components/setter) domain | 1
 Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 2
 Entities in the [`stt`](https://www.home-assistant.io/components/stt) domain | 1
 Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1
-Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 208
+Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 209
 Entities in the [`text`](https://www.home-assistant.io/components/text) domain | 2
 Entities in the [`timer`](https://www.home-assistant.io/components/timer) domain | 6
 Entities in the [`tts`](https://www.home-assistant.io/components/tts) domain | 2
 Entities in the [`update`](https://www.home-assistant.io/components/update) domain | 90
 Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1
 Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 1
 Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 8
-**Total state objects** | **1835**
+**Total state objects** | **1844**
 ## The HACS integrations/plugins that I use:
 
 **Appdaemon**:<br>

automations.yaml

@@ -1498,7 +1498,8 @@
     - sensor.latest_utility_bill_id
   conditions:
   - condition: template
-    value_template: '{{ trigger.to_state not in ["unknown", "unavailable"] }}'
+    value_template: '{{ trigger.to_state.state not in ["unknown", "unavailable"] and
+      trigger.from_state.state not in ["unknown", "unavailable"] }}'
   actions:
   - action: google_sheets.append_sheet
     metadata: {}

configuration.yaml

@@ -255,7 +255,7 @@ logger:
     # asyncio: debug
     homeassistant.components.tts: debug
     homeassistant.components.pico_tts: debug
-    homeassistant.components.google_generative_ai_conversation: debug
+    #homeassistant.components.google_generative_ai_conversation: debug
     #zigpy: debug
     # bellows: debug
     # zigpy_xbee: debug

custom_components/alexa_media/__init__.py

@@ -951,7 +951,7 @@ async def update_last_called(login_obj, last_called=None, force=False):
 
         if not isinstance(last_called, dict) or not last_called.get("summary"):
             try:
-                async with async_timeout.timeout(10):
+                async with async_timeout.timeout(20):
                     last_called = await AlexaAPI.get_last_device_serial(login_obj)
             except TypeError:
                 _LOGGER.debug(

custom_components/alexa_media/alexa_entity.py

@@ -757,9 +757,7 @@ def is_cap_state_still_acceptable(
         return False
 
     try:
-        time_of_sample = datetime.strptime(
-            formatted_time_of_sample, "%Y-%m-%dT%H:%M:%S%z"
-        )
+        time_of_sample = datetime.fromisoformat(formatted_time_of_sample)
     except ValueError:
         return False
 

custom_components/alexa_media/const.py

@@ -277,6 +277,7 @@
     "A2J0R2SD7G9LPA": "Lenovo SmartTab M10",
     "A2JKHJ0PX4J3L3": "Fire TV Cube (Gen2)",
     "A2LH725P8DQR2A": "Fabriq Riff",
+    "A2LLN0UXRW4N50": "Echo Show 11 (Gen1)",
     "A2LWARUGJLBYEW": "Fire TV Stick (Gen2)",
     "A2M35JJZWCQOMZ": "Echo Plus (Gen1)",
     "A2M4YX06LWP8WI": "Fire Tablet",

custom_components/alexa_media/helpers.py

@@ -29,26 +29,109 @@
 ArgType = TypeVar("ArgType")
 
 
+def _norm_filter_token(value: Any) -> str | None:
+    """Normalize a single filter token for reliable matching."""
+    if value is None:
+        return None
+    s = str(value).strip()
+    if not s:
+        return None
+    return s.casefold()
+
+
+def _coerce_filter(value: Any) -> set[str]:
+    """Coerce include/exclude filter input into a normalized set[str].
+
+    Accepts:
+    - None / empty -> empty set
+    - comma-separated str -> split on commas
+    - list/set/tuple -> per-item normalization
+    - anything else -> single token (best effort)
+    """
+    if not value:
+        return set()
+
+    # Legacy/back-compat: allow comma-separated string
+    if isinstance(value, str):
+        out = set()
+        for part in value.split(","):
+            token = _norm_filter_token(part)
+            if token:
+                out.add(token)
+        return out
+
+    if isinstance(value, (list, set, tuple)):
+        out = set()
+        for v in value:
+            token = _norm_filter_token(v)
+            if token:
+                out.add(token)
+        return out
+
+    token = _norm_filter_token(value)
+    return {token} if token else set()
+
+
 async def add_devices(
     account: str,
     devices: list[Entity],
     add_devices_callback: Callable[[list[Entity], bool], None],
-    include_filter: Optional[list[str]] = None,
-    exclude_filter: Optional[list[str]] = None,
+    include_filter: str | list[str] | set[str] | tuple[str, ...] | None = None,
+    exclude_filter: str | list[str] | set[str] | tuple[str, ...] | None = None,
 ) -> bool:
     """Add devices using add_devices_callback."""
-    include_filter = include_filter or []
-    exclude_filter = exclude_filter or []
+    include_filter_set = _coerce_filter(include_filter)
+    exclude_filter_set = _coerce_filter(exclude_filter)
+    if include_filter_set:
+        _LOGGER.debug(
+            "%s: include_filter_set: %s",
+            account,
+            include_filter_set,
+        )
+    if exclude_filter_set:
+        _LOGGER.debug(
+            "%s: exclude_filter_set: %s",
+            account,
+            exclude_filter_set,
+        )
 
     def _device_name(dev: Entity) -> str | None:
-        """Best-effort name before entity_id is assigned."""
-        return (
+        """Best-effort name before entity_id is assigned.
+
+        For AMP switches, reconstruct the legacy "<device> <suffix> switch"
+        name only if those attributes were explicitly set.
+        """
+
+        # First prefer explicitly set name attributes (works for tests + most entities)
+        name = (
             getattr(dev, "name", None)
             or getattr(dev, "_attr_name", None)
             or getattr(dev, "_name", None)
             or getattr(dev, "_device_name", None)
             or getattr(dev, "_friendly_name", None)
         )
+        if name:
+            return name
+
+        # Only attempt switch reconstruction if attributes were explicitly defined
+        # (avoids MagicMock auto-attribute trap in tests)
+        dev_dict = getattr(dev, "__dict__", {})
+
+        client = dev_dict.get("_client")
+        suffix = dev_dict.get("_unique_id_suffix")
+
+        if client and suffix:
+            client_dict = getattr(client, "__dict__", {})
+            base = (
+                client_dict.get("name")
+                or client_dict.get("_attr_name")
+                or client_dict.get("_name")
+                or client_dict.get("_device_name")
+            )
+            if base:
+                return f"{base} {suffix} switch"
+
+        return None
 
     def _device_label(dev: Entity) -> str:
         """Return a compact, stable identifier for logging."""
@@ -68,19 +151,58 @@ def _devices_preview(devs: list[Entity]) -> str:
         suffix = f" …(+{len(devs) - max_items} more)" if len(devs) > max_items else ""
         return ", ".join(labels) + suffix
 
-    new_devices: list[Entity] = []
-    for device in devices:
-        dev_name = _device_name(device)
+    def _filter_devices(
+        devs: list[Entity],
+        include_set: set[str],
+        exclude_set: set[str],
+    ) -> list[Entity]:
+        selected: list[Entity] = []
 
-        if (include_filter and dev_name not in include_filter) or (
-            exclude_filter and dev_name in exclude_filter
-        ):
-            _LOGGER.debug("%s: Excluding device: %s", account, _device_label(device))
-            continue
+        include_mode = bool(include_set)
+        if include_mode and exclude_set:
+            _LOGGER.debug(
+                "%s: include_devices set; ignoring exclude_devices per documented precedence",
+                account,
+            )
+
+        for dev in devs:
+            dev_name = _norm_filter_token(_device_name(dev))
+
+            # INCLUDE MODE: only include explicitly listed names
+            if include_mode:
+                if dev_name and dev_name in include_set:
+                    selected.append(dev)
+                else:
+                    if not dev_name:
+                        _LOGGER.debug(
+                            "%s: Not including device (no name yet): %s",
+                            account,
+                            _device_label(dev),
+                        )
+                    else:
+                        _LOGGER.debug(
+                            "%s: Not including device: %s (match key=%r)",
+                            account,
+                            _device_label(dev),
+                            dev_name,
+                        )
+                continue
+
+            # EXCLUDE MODE: exclude listed names
+            if exclude_set and dev_name and dev_name in exclude_set:
+                _LOGGER.debug(
+                    "%s: Excluding device: %s (match key=%r)",
+                    account,
+                    _device_label(dev),
+                    dev_name,
+                )
+                continue
+
+            selected.append(dev)
 
-        new_devices.append(device)
+        return selected
 
-    devices = new_devices
+    devices = _filter_devices(devices, include_filter_set, exclude_filter_set)
     if not devices:
         return True
 
@@ -234,7 +356,7 @@ async def _catch_login_errors(func, instance, args, kwargs) -> Any:
             email = login.email
             if await login.test_loggedin():
                 _LOGGER.info(
-                    "%s.%s: Successfully re-login after a login error for %s",
+                    "%s.%s: Successful re-login after a login error for %s",
                     func.__module__[func.__module__.find(".") + 1 :],
                     func.__name__,
                     hide_email(email),

custom_components/alexa_media/manifest.json

@@ -9,10 +9,10 @@
   "issue_tracker": "https://github.com/alandtse/alexa_media_player/issues",
   "loggers": ["alexapy", "authcaptureproxy"],
   "requirements": [
-    "alexapy==1.29.15",
+    "alexapy==1.29.16",
     "packaging>=20.3",
     "wrapt>=1.14.0",
     "dictor>=0.1.12,<0.2"
   ],
-  "version": "5.12.2"
+  "version": "5.13.0"
 }

custom_components/alexa_media/strings.json

@@ -18,23 +18,25 @@
     },
     "step": {
       "user": {
-        "title": "Alexa Media Player - Configuration",
-        "description": "* Required entry",
         "data": {
-          "url": "Amazon region domain (e.g., amazon.co.uk)",
+          "debug": "Advanced debug",
           "email": "Email Address",
-          "password": "Password",
-          "securitycode": "One-time password (OTP)",
-          "otp_secret": "52-character Authenticator App Key for Amazon 2SV",
+          "exclude_devices": "or Exclude these devices from all (comma separated)",
+          "extended_entity_discovery": "Include additional sensors, switches and lights",
           "hass_url": "Local network URL to access Home Assistant",
-          "public_url": "Public URL shared with external hosted services",
           "include_devices": "Only include these devices (comma separated)",
-          "exclude_devices": "or Exclude these devices from all (comma separated)",
-          "scan_interval": "Scheduled polling interval (seconds)",
+          "otp_secret": "52-character Authenticator App Key for Amazon 2SV",
+          "password": "Password",
+          "public_url": "Public URL shared with external hosted services",
           "queue_delay": "Delay to queue multiple commands together (seconds)",
+          "scan_interval": "Scheduled polling interval (seconds)",
+          "securitycode": "One-time password (OTP)",
           "should_get_network": "Discover Alexa network",
-          "extended_entity_discovery": "Include additional sensors, switches and lights",
-          "debug": "Advanced debugging"
+          "url": "Amazon region domain (e.g., amazon.co.uk)"
+        },
+        "data_description": {
+          "debug": "Enables very verbose, trace-level logging for advanced troubleshooting.\nNot recommended for normal operation due to increased log volume.\nEnsure logger levels are set to DEBUG for full output.",
+          "otp_secret": "Example: 35T5 LQSY I5IO 3EFQ LGAJ I6YB JWBY JJPR PYT7 XPPW IDAK SQBJ CVXA"
         }
       },
       "proxy_warning": {
@@ -59,14 +61,19 @@
         "title": "Alexa Media Player - Reconfiguration",
         "description": "* Required entry",
         "data": {
-          "public_url": "Public URL shared with external hosted services",
-          "include_devices": "Only include these devices (comma separated)",
+          "debug": "Advanced debug",
           "exclude_devices": "or Exclude these devices from all (comma separated)",
-          "scan_interval": "Scheduled polling frequency (seconds)",
-          "queue_delay": "Delay to queue multiple commands together (seconds)",
-          "should_get_network": "Discover Alexa network",
           "extended_entity_discovery": "Include additional sensors, switches and lights",
-          "debug": "Advanced debugging"
+          "include_devices": "Only include these devices (comma separated)",
+          "otp_secret": "52-character Authenticator App Key for Amazon 2SV",
+          "public_url": "Public URL shared with external hosted services",
+          "queue_delay": "Delay to queue multiple commands together (seconds)",
+          "scan_interval": "Scheduled polling interval (seconds)",
+          "should_get_network": "Discover Alexa network"
+        },
+        "data_description": {
+          "debug": "Enables very verbose, trace-level logging for advanced troubleshooting.\nNot recommended for normal operation due to increased log volume.\nEnsure logger levels are set to DEBUG for full output.",
+          "otp_secret": "Example: 35T5 LQSY I5IO 3EFQ LGAJ I6YB JWBY JJPR PYT7 XPPW IDAK SQBJ CVXA"
         }
       }
     }