feat: Allow rooms trait to unconditionally override map info rooms during merging.

Author: allenporter

roborock/data/v1/v1_containers.py

@@ -722,9 +722,9 @@ def mapFlag(self) -> int:
     def rooms_map(self) -> dict[int, NamedRoomMapping]:
         """Returns a dictionary of room mappings by segment id."""
         return {
-            room.id: room.named_room_mapping
+            room.id: mapping
             for room in self.rooms or ()
-            if room.id is not None and room.named_room_mapping is not None
+            if room.id is not None and (mapping := room.named_room_mapping) is not None
         }
 
 

roborock/devices/traits/v1/home.py

@@ -119,25 +119,20 @@ async def _refresh_map_info(self, map_info: MultiMapsListMapInfo) -> CombinedMap
         """Collect room data for a specific map and return CombinedMapInfo."""
         await self._rooms_trait.refresh()
 
-        # We have room names from two sources. The map_info.rooms which we just
-        # received from the MultiMapsList or the self._rooms_trait.rooms which
-        # comes from the GET_ROOM_MAPPING command. We merge them, giving priority
-        # to map_info rooms, and excluding unset rooms from the trait.
-        rooms: list[NamedRoomMapping] = list(
-            {
-                **map_info.rooms_map,
-                **{
-                    room.segment_id: room
-                    for room in self._rooms_trait.rooms or ()
-                    if (existing := map_info.rooms_map.get(room.segment_id)) is None
-                    or (room.raw_name and existing.raw_name is None)
-                },
-            }.values()
-        )
+        # We have room names from multiple sources:
+        # - The map_info.rooms which we just received from the MultiMapsList
+        # - RoomsTrait rooms come from the GET_ROOM_MAPPING command for the current device (only)
+        # - RoomsTrait rooms that are pulled from the cloud API
+        # We always prefer the RoomsTrait room names since they are always newer and
+        # just refreshed above.
+        rooms_map: dict[str, NamedRoomMapping] = {
+            **map_info.rooms_map,
+            **{room.segment_id: room for room in self._rooms_trait.rooms or ()},
+        }
         return CombinedMapInfo(
             map_flag=map_info.map_flag,
             name=map_info.name,
-            rooms=rooms,
+            rooms=list(rooms_map.values()),
         )
 
     async def _refresh_map_content(self) -> MapContent:

roborock/devices/traits/v1/rooms.py

@@ -72,7 +72,7 @@ def _parse_rooms(
         )
 
     async def _refresh_rooms(self) -> list[HomeDataRoom]:
-        """Merge the existing rooms with new rooms returned from the API."""
+        """Fetch the latest rooms from the web API."""
         try:
             return await self._web_api.get_rooms()
         except Exception:

tests/devices/traits/v1/test_home.py

@@ -244,7 +244,7 @@ async def test_discover_home_empty_cache(
     assert map_123_data.rooms[0].iot_id == "2362041"
     assert map_123_data.rooms[0].name == "Example room 3"
     assert map_123_data.rooms[1].segment_id == 19
-    assert map_123_data.rooms[0].iot_id == "2362041"
+    assert map_123_data.rooms[1].iot_id == "2362042"
     assert map_123_data.rooms[1].name == "Room 19"  # Not in mock home data
 
     map_123_content = home_trait.home_map_content[123]
@@ -675,7 +675,7 @@ async def test_refresh_map_info_prefers_map_info_names_and_adds_missing_rooms(
     # - segment_id 18 with valid name: not in map_info, should be added
     # - segment_id 20 with valid name: overrides map_info fallback "Room 20"
     rooms_trait.rooms = [
-        NamedRoomMapping(segment_id=16, iot_id="2362048"),  # Exists in map_info, should not override
+        NamedRoomMapping(segment_id=16, iot_id="2362048"),  # Will override even with no name
         NamedRoomMapping(
             segment_id=19, iot_id="2362042", raw_name="Updated Bedroom Name"
         ),  # Exists in map_info, should not override
@@ -697,9 +697,9 @@ async def test_refresh_map_info_prefers_map_info_names_and_adds_missing_rooms(
     # Sort rooms by segment_id for consistent assertions
     sorted_rooms = sorted(result.rooms, key=lambda r: r.segment_id)
 
-    # Room 16: from map_info, kept (not overridden by rooms_trait fallback)
+    # Room 16: from map_info is overridden by rooms_trait
     assert sorted_rooms[0].segment_id == 16
-    assert sorted_rooms[0].name == "Kitchen from map_info"
+    assert sorted_rooms[0].name == "Room 16"
     assert sorted_rooms[0].iot_id == "2362048"
 
     # Room 17: from rooms_trait with fallback name, added because not in map_info
@@ -714,7 +714,7 @@ async def test_refresh_map_info_prefers_map_info_names_and_adds_missing_rooms(
 
     # Room 19: from map_info, kept (not overridden by rooms_trait)
     assert sorted_rooms[3].segment_id == 19
-    assert sorted_rooms[3].name == "Bedroom from map_info"
+    assert sorted_rooms[3].name == "Updated Bedroom Name"
     assert sorted_rooms[3].iot_id == "2362042"
 
     # Room 20: map_info fallback name replaced by rooms_trait name