Refresh devices when there are structure chagnes (#1218)

Author: allenporter

google_nest_sdm/device.py

@@ -292,11 +292,16 @@ def _async_handle_traits(self, event_message: EventMessage) -> None:
         traits = event_message.resource_update_traits
         if not traits:
             return
-        _LOGGER.debug("Trait update %s", traits)
         # Parse the traits using a separate object, then overwrite
         # each present field with an updated copy of the original trait with
         # the new fields merged in.
+        _LOGGER.debug("Trait update %s", traits)
         parsed_traits = TraitTypes.parse_trait_object({TRAITS: traits})
+        self._async_update_traits(parsed_traits, event_message.timestamp)
+
+    def _async_update_traits(
+        self, parsed_traits: TraitTypes, timestamp: datetime.datetime
+    ) -> None:
         for trait_field in fields(parsed_traits):
             if (
                 (alias := trait_field.metadata.get("alias")) is None
@@ -308,9 +313,9 @@ def _async_handle_traits(self, event_message: EventMessage) -> None:
             if (
                 self._trait_event_ts
                 and (ts := self._trait_event_ts.get(trait_field.name))
-                and ts > event_message.timestamp
+                and ts > timestamp
             ):
-                _LOGGER.debug("Discarding stale update (%s)", event_message.timestamp)
+                _LOGGER.debug("Discarding stale update (%s)", timestamp)
                 continue
 
             # Only merge updates into existing models, updating the existing
@@ -320,7 +325,14 @@ def _async_handle_traits(self, event_message: EventMessage) -> None:
             for k, v in asdict(new).items():
                 if v is not None:
                     setattr(existing, k, v)
-            self._trait_event_ts[trait_field.name] = event_message.timestamp
+            self._trait_event_ts[trait_field.name] = timestamp
+
+    def merge_from_update(self, new_device: Device) -> None:
+        """Merge fields from an updated device object.
+
+        This is used when refreshing the device list from the API.
+        """
+        self._async_update_traits(new_device, datetime.datetime.utcnow())
 
     @property
     def event_media_manager(self) -> EventMediaManager:

google_nest_sdm/device_manager.py

@@ -69,7 +69,13 @@ async def async_handle_event(self, event_message: EventMessage) -> None:
             return
 
         if event_message.relation_update:
+            _LOGGER.debug("Handling relation update: %s", event_message.relation_update)
             self._handle_device_relation(event_message.relation_update)
+            # Also discover any new devices/structures
+            try:
+                await self.async_refresh()
+            except ApiException:
+                _LOGGER.debug("Failed to refresh devices")
             if self._update_callback:
                 await self._update_callback(event_message)
             return
@@ -119,19 +125,27 @@ async def async_refresh(self) -> None:
         }
         for structure in new_structures.values():
             if structure.name not in self._structures:
+                _LOGGER.debug("Adding structure %s", structure.name)
                 self._structures[structure.name] = structure
         removed_structure_ids = old_structure_ids - set(new_structures.keys())
         for structure_id in removed_structure_ids:
+            _LOGGER.debug("Removing structure %s", structure_id)
             del self._structures[structure_id]
 
         # Refresh devices
         devices = await self._api.async_get_devices()
         old_device_ids = set(self._devices.keys())
         new_devices = {device.name: device for device in devices if device.name}
         for device in new_devices.values():
-            self._add_device(device)
+            if existing_device := self._devices.get(device.name):
+                existing_device.merge_from_update(device)
+            else:
+                _LOGGER.debug("Adding device %s", device.name)
+                self._add_device(device)
+
         removed_device_ids = old_device_ids - set(new_devices.keys())
         for device_id in removed_device_ids:
+            _LOGGER.debug("Removing device %s", device_id)
             del self._devices[device_id]
 
         if self._change_callback and (