refactor: Standardize trait data merging to merge_trait_values and remove direct _parse_response methods from traits.

Author: allenporter

roborock/devices/traits/v1/common.py

@@ -18,7 +18,9 @@
 
 
 class V1TraitDataConverter:
-    """Converts responses to RoborockBase objects."""
+    """Converts responses to RoborockBase objects.
+    
+    """
 
     @abstractmethod
     def convert(self, response: V1ResponseData) -> RoborockBase:
@@ -69,11 +71,10 @@ async def refresh(self) -> None:
         """Refresh the contents of this trait."""
         response = await self.rpc_channel.send_command(self.command)
         new_data = self.converter.convert(response)
-        # Mixin doesn't know its type
-        merge_object_values(self, new_data)  # type: ignore[arg-type]
+        merge_trait_values(self, new_data)  # type: ignore[arg-type]
 
 
-def merge_object_values(target: RoborockBase, new_object: RoborockBase) -> bool:
+def merge_trait_values(target: RoborockBase, new_object: RoborockBase) -> bool:
     """Update the target object with set fields in new_object."""
     updated = False
     for field in fields(new_object):

roborock/devices/traits/v1/consumeable.py

@@ -43,9 +43,6 @@ class ConsumableTrait(Consumable, common.V1TraitMixin):
     command = RoborockCommand.GET_CONSUMABLE
     converter = common.DefaultConverter(Consumable)
 
-    def __init__(self) -> None:
-        common.V1TraitMixin.__init__(self)
-
     async def reset_consumable(self, consumable: ConsumableAttribute) -> None:
         """Reset a specific consumable attribute on the device."""
         await self.rpc_channel.send_command(RoborockCommand.RESET_CONSUMABLE, params=[consumable.value])

roborock/devices/traits/v1/device_features.py

@@ -32,6 +32,7 @@ class DeviceFeaturesTrait(DeviceFeatures, common.V1TraitMixin):
     """Trait for managing supported features on Roborock devices."""
 
     command = RoborockCommand.APP_GET_INIT_STATUS
+    converter: DeviceTraitsConverter
 
     def __init__(self, product: HomeDataProduct, device_cache: DeviceCache) -> None:  # pylint: disable=super-init-not-called
         """Initialize DeviceFeaturesTrait."""
@@ -75,7 +76,7 @@ async def refresh(self) -> None:
         """
         cache_data = await self._device_cache.get()
         if cache_data.device_features is not None:
-            common.merge_object_values(self, cache_data.device_features)
+            common.merge_trait_values(self, cache_data.device_features)
             return
         # Save cached device features
         await super().refresh()

roborock/devices/traits/v1/home.py

@@ -18,7 +18,6 @@
 import asyncio
 import base64
 import logging
-from typing import Self
 
 from roborock.data import CombinedMapInfo, NamedRoomMapping, RoborockBase
 from roborock.data.v1.v1_code_mappings import RoborockStateCode
@@ -238,10 +237,6 @@ def home_map_content(self) -> dict[int, MapContent] | None:
         """Returns the map content for all cached maps."""
         return self._home_map_content
 
-    def _parse_response(self, response: common.V1ResponseData) -> Self:
-        """This trait does not parse responses directly."""
-        raise NotImplementedError("HomeTrait does not support direct command responses")
-
     async def _update_home_cache(
         self, home_map_info: dict[int, CombinedMapInfo], home_map_content: dict[int, MapContent]
     ) -> None:

roborock/devices/traits/v1/map_content.py

@@ -91,7 +91,7 @@ def __init__(self, map_parser_config: MapParserConfig | None = None) -> None:
         super().__init__()
         self.converter = MapContentConverter(MapParser(map_parser_config or MapParserConfig()))
 
-    def _parse_response(self, response: common.V1ResponseData) -> MapContent:
+    def _convert(self, response: common.V1ResponseData) -> MapContent:
         """Parse the response from the device into a MapContentTrait instance."""
         if not isinstance(response, bytes):
             raise ValueError(f"Unexpected MapContentTrait response format: {type(response)}")

roborock/devices/traits/v1/network_info.py

@@ -47,7 +47,7 @@ async def refresh(self) -> None:
         device_cache_data = await self._device_cache.get()
         if device_cache_data.network_info:
             _LOGGER.debug("Using cached network info for device %s", self._device_uid)
-            common.merge_object_values(self, device_cache_data.network_info)
+            common.merge_trait_values(self, device_cache_data.network_info)
             return
 
         # Load from device if not in cache

roborock/devices/traits/v1/rooms.py

@@ -103,7 +103,7 @@ async def refresh(self) -> None:
         await self._populate_missing_home_data_rooms(segment_map)
         rooms = self.converter.convert(response)
         rooms = rooms.with_rooom_names(self._iot_id_room_name_map)
-        common.merge_object_values(self, rooms)
+        common.merge_trait_values(self, rooms)
 
     @property
     def _iot_id_room_name_map(self) -> dict[str, str]:

roborock/devices/traits/v1/status.py

@@ -1,5 +1,4 @@
 from functools import cached_property
-from typing import Self
 
 from roborock import (
     CleanRoutes,
@@ -92,11 +91,3 @@ def mop_route_name(self) -> str | None:
         if self.mop_mode is None:
             return None
         return self.mop_route_mapping.get(self.mop_mode)
-
-    def _parse_response(self, response: common.V1ResponseData) -> Self:
-        """Parse the response from the device into a StatusV2-based status object."""
-        if isinstance(response, list):
-            response = response[0]
-        if isinstance(response, dict):
-            return StatusV2.from_dict(response)
-        raise ValueError(f"Unexpected status format: {response!r}")