Merge branch 'dev' into perf/optimize-boot

Author: danielbrunt57

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/config_flow.py

@@ -14,7 +14,6 @@
 from functools import reduce
 import html as html_lib
 import logging
-import traceback
 from typing import Any, Optional
 
 from aiohttp import ClientConnectionError, ClientSession, InvalidURL, web, web_response
@@ -405,13 +404,13 @@ async def async_step_start_proxy(self, user_input=None):
                 write=30.0,
                 pool=30.0,
             )
-            _LOGGER.warning(
-                "PROXY DEBUG >>> Session timeout set to: %s",
+            _LOGGER.debug(
+                "Proxy session timeout set to: %s",
                 self.proxy.session.timeout,
             )
         else:
             _LOGGER.warning(
-                "PROXY DEBUG >>> No session found on proxy object. Attrs: %s",
+                "Proxy: No session found on proxy object. Attrs: %s",
                 dir(self.proxy),
             )
         if not self.proxy_view:
@@ -1111,7 +1110,7 @@ async def wrapped(request, **kwargs):
                     for k, v in request.headers.items()
                 }
                 _LOGGER.debug(
-                    "PROXY DEBUG >>> Request: %s %s | Remote: %s | Headers: %s",
+                    "Proxy request: %s %s | Remote: %s | Headers: %s",
                     request.method,
                     request.url,
                     request.remote,
@@ -1129,7 +1128,7 @@ async def wrapped(request, **kwargs):
                         else "unknown"
                     )
                     _LOGGER.debug(
-                        "PROXY DEBUG >>> Success: %s %s | Status: %s | Response headers: %s",
+                        "Proxy response: %s %s | Status: %s | Response headers: %s",
                         request.method,
                         request.url,
                         result.status if hasattr(result, "status") else "unknown",
@@ -1147,17 +1146,13 @@ async def wrapped(request, **kwargs):
             except web.HTTPException:
                 raise  # Let aiohttp handle redirects (HTTPFound) and other HTTP exceptions
             except Exception as ex:  # pylint: disable=broad-except
-                tb = traceback.format_exc()
                 _LOGGER.warning(
-                    "PROXY DEBUG >>> EXCEPTION at %s %s\n"
-                    "Type: %s\n"
-                    "Message: %s\n"
-                    "Full traceback:\n%s",
+                    "Proxy exception at %s %s: %s - %s",
                     request.method,
                     request.url,
                     type(ex).__name__,
                     ex,
-                    tb,
+                    exc_info=True,
                 )
                 return web_response.Response(
                     headers={"content-type": "text/html"},

custom_components/alexa_media/helpers.py

@@ -78,10 +78,14 @@ def _devices_preview(devs: list[Entity]) -> str:
     for device in devices:
         dev_name = _device_name(device)
 
-        if dev_name and (
-            (include_filter and dev_name not in include_filter)
-            or (exclude_filter and dev_name in exclude_filter)
-        ):
+        # If include_filter is set, we must have a name and it must match.
+        if include_filter and (not dev_name or dev_name not in include_filter):
+            _LOGGER.debug(
+                "%s: Not including device: %s", account, _device_label(device)
+            )
+            continue
+        # Exclude only when name is present and matches.
+        if exclude_filter and dev_name and dev_name in exclude_filter:
             _LOGGER.debug("%s: Excluding device: %s", account, _device_label(device))
             continue
 

custom_components/alexa_media/manifest.json

@@ -14,5 +14,5 @@
     "wrapt>=1.14.0",
     "dictor>=0.1.12,<0.2"
   ],
-  "version": "5.12.0"
+  "version": "5.12.2"
 }

custom_components/alexa_media/sensor.py

@@ -1024,7 +1024,7 @@ def __init__(self, client, n_json, account, debug: bool = False):
             n_json,
             "date_time",
             account,
-            "Next alarm",
+            f"next {self._type}",
             "mdi:alarm",
             debug=debug,
         )
@@ -1044,7 +1044,7 @@ def __init__(self, client, n_json, account, debug: bool = False):
             n_json,
             "remainingTime",
             account,
-            "Next timer",
+            f"next {self._type}",
             (
                 "mdi:timer-outline"
                 if (version.parse(HA_VERSION) >= version.parse("0.113.0"))
@@ -1106,7 +1106,7 @@ def __init__(self, client, n_json, account, debug: bool = False):
             n_json,
             "alarmTime",
             account,
-            "Next reminder",
+            f"next {self._type}",
             "mdi:reminder",
             debug=debug,
         )

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "alexa_media_player"
-version = "5.12.0"
+version = "5.12.2"
 description = "This is a custom component to allow control of Amazon Alexa devices in [Homeassistant](https://home-assistant.io) using the unofficial Alexa API."
 authors = [
   "Keaton Taylor <keatonstaylor@gmail.com>",