fix: restore Echo-connected devices (#2958)

Fixes #2956, #2952, #2948, #2945, #2931, #2946

Author: francescolf

custom_components/alexa_media/__init__.py

@@ -433,7 +433,9 @@ async def async_update_data() -> Optional[AlexaEntityData]:
         ].values()
         auth_info = hass.data[DATA_ALEXAMEDIA]["accounts"][email].get("auth_info")
         new_devices = hass.data[DATA_ALEXAMEDIA]["accounts"][email]["new_devices"]
-        should_get_network = False  # get_network_details is deprecated
+        should_get_network = hass.data[DATA_ALEXAMEDIA]["accounts"][email][
+            "should_get_network"
+        ]
         extended_entity_discovery = hass.data[DATA_ALEXAMEDIA]["accounts"][email][
             "options"
         ].get(CONF_EXTENDED_ENTITY_DISCOVERY)
@@ -484,6 +486,9 @@ async def async_update_data() -> Optional[AlexaEntityData]:
         if entities_to_monitor:
             tasks.append(get_entity_data(login_obj, list(entities_to_monitor)))
 
+        if should_get_network:
+            tasks.append(AlexaAPI.get_network_details(login_obj))
+
         try:
             # Note: asyncio.TimeoutError and aiohttp.ClientError are already
             # handled by the data update coordinator.
@@ -496,7 +501,34 @@ async def async_update_data() -> Optional[AlexaEntityData]:
                     *optional_task_results,
                 ) = await asyncio.gather(*tasks)
 
-                if entities_to_monitor:
+                if should_get_network:
+                    _LOGGER.debug(
+                        "Alexa entities have been loaded. Prepared for discovery."
+                    )
+                    api_devices = optional_task_results.pop()
+                    if not api_devices:
+                        _LOGGER.warning(
+                            "%s: Alexa API returned an unexpected response while getting connected devices.",
+                            hide_email(email),
+                        )
+                    alexa_entities = parse_alexa_entities(api_devices)
+                    hass.data[DATA_ALEXAMEDIA]["accounts"][email]["devices"].update(
+                        alexa_entities
+                    )
+                    hass.data[DATA_ALEXAMEDIA]["accounts"][email][
+                        "should_get_network"
+                    ] = False
+
+                    # First run is a special case. Get the state of all entities(including disabled)
+                    # This ensures all entities have state during startup without needing to request coordinator refresh
+                    for type_of_entity, entities in alexa_entities.items():
+                        if type_of_entity == "guard" or extended_entity_discovery:
+                            for entity in entities:
+                                entities_to_monitor.add(entity.get("id"))
+                    entity_state = await get_entity_data(
+                        login_obj, list(entities_to_monitor)
+                    )
+                elif entities_to_monitor:
                     entity_state = optional_task_results.pop()
 
                 if new_devices:

custom_components/alexa_media/alexa_entity.py

@@ -263,20 +263,19 @@ def parse_alexa_entities(network_details: Optional[dict[str, Any]]) -> AlexaEnti
     air_quality_sensors = []
     contact_sensors = []
     switches = []
-    location_details = (
-        (network_details or {}).get("locationDetails", {}).get("locationDetails", {})
-    )
 
-    appliances = {}
-    for location in location_details.values():
-        amazon_bridge_details = location["amazonBridgeDetails"]["amazonBridgeDetails"]
-        for bridge in amazon_bridge_details.values():
-            appliance_details = bridge["applianceDetails"]["applianceDetails"]
-            for appliance in appliance_details.values():
-                appliances[appliance["applianceId"]] = appliance
+    if not network_details:
+        return {
+            "light": lights,
+            "guard": guards,
+            "temperature": temperature_sensors,
+            "air_quality": air_quality_sensors,
+            "binary_sensor": contact_sensors,
+            "smart_switch": switches,
+        }
 
-    for appliance in appliances.values():
-        device_bridge = get_device_bridge(appliance, appliances)
+    for appliance in network_details:
+        device_bridge = get_device_bridge(appliance, network_details)
         if is_known_ha_bridge(device_bridge):
             _LOGGER.debug("Found Home Assistant bridge, skipping %s", appliance)
             continue
@@ -518,7 +517,7 @@ def is_cap_state_still_acceptable(
         if formatted_time_of_sample:
             try:
                 time_of_sample = datetime.strptime(
-                    formatted_time_of_sample, "%Y-%m-%dT%H:%M:%S.%f%z"
+                    formatted_time_of_sample, "%Y-%m-%dT%H:%M:%S%z"
                 )
                 return time_of_sample >= since
             except ValueError:

custom_components/alexa_media/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/alandtse/alexa_media_player/issues",
   "loggers": ["alexapy", "authcaptureproxy"],
-  "requirements": ["alexapy==1.29.5", "packaging>=20.3", "wrapt>=1.14.0"],
+  "requirements": ["alexapy==1.29.7", "packaging>=20.3", "wrapt>=1.14.0"],
   "version": "5.7.3"
 }