python-roborock 7.4.0__tar.gz → 7.4.2__tar.gz

{python_roborock-7.4.0 → python_roborock-7.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.4.0
+Version: 7.4.2
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/python-roborock/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-7.4.0 → python_roborock-7.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "7.4.0"
+version = "7.4.2"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"

{python_roborock-7.4.0 → python_roborock-7.4.2}/roborock/devices/traits/a01/device_feature.py

@@ -143,6 +143,13 @@ _UNSUPPORTED_FEATURE_BITS: frozenset[str] = frozenset(
     }
 )
 
+# Devices known to lack DEFAULT_SETTING (DP 225).
+_UNSUPPORTED_DEFAULT_SETTING: frozenset[str] = frozenset(
+    {
+        "roborock.wm.a63",  # H1
+    }
+)
+
 # Series that support UV light (DP 228).
 _UV_LIGHT_SERIES: frozenset[str] = (
     _H1_LITE_SERIES  # a90, a91, a237
@@ -242,6 +249,13 @@ def supports_feature_bits(model: str | None) -> bool:
     return model not in _UNSUPPORTED_FEATURE_BITS
 
 
+def supports_default_setting(model: str | None) -> bool:
+    """H1 (a63) does not support DP 225 even though it has a softener compartment."""
+    if model is None:
+        return True  # conservative: assume yes
+    return model not in _UNSUPPORTED_DEFAULT_SETTING
+
+
 def supports_remote_control(model: str | None) -> bool:
     """Remote control (DP 232) is supported on all overseas models."""
     if model is None:
@@ -309,6 +323,10 @@ def build_force_load_dp_list(model: str | None) -> list[RoborockZeoProtocol]:
     if not supports_feature_bits(model):
         base = [dp for dp in base if dp != RoborockZeoProtocol.FEATURE_BITS]
 
+    # ── Strip unsupported DEFAULT_SETTING ──
+    if not supports_default_setting(model):
+        base = [dp for dp in base if dp != RoborockZeoProtocol.DEFAULT_SETTING]
+
     return base
 
 

{python_roborock-7.4.0 → python_roborock-7.4.2}/roborock/map/map_parser.py

@@ -2,7 +2,6 @@
 
 import io
 import logging
-import threading
 from dataclasses import dataclass, field
 
 from vacuum_map_parser_base.config.color import Color, ColorsPalette, SupportedColor
@@ -11,13 +10,10 @@ from vacuum_map_parser_base.config.image_config import ImageConfig
 from vacuum_map_parser_base.config.size import Size, Sizes
 from vacuum_map_parser_base.image_generator import ImageGenerator
 from vacuum_map_parser_base.map_data import MapData
-from vacuum_map_parser_roborock.image_parser import RoborockImageParser
 from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
 
 from roborock.exceptions import RoborockException
 
-from .room_colors import adjacency_aware_room_colors
-
 _LOGGER = logging.getLogger(__name__)
 
 DEFAULT_DRAWABLES = {
@@ -103,68 +99,16 @@ class MapParser:
         return ParsedMapData(image_content=img_byte_arr.getvalue(), map_data=parsed_map)
 
 
-class _AdjacencyAwareRoborockImageParser(RoborockImageParser):
-    """Apply the shared adjacency color policy to V1 room cells."""
-
-    def __init__(
-        self,
-        palette: ColorsPalette,
-        image_config: ImageConfig,
-        *,
-        recolor_rooms: bool = True,
-    ) -> None:
-        super().__init__(palette, image_config)
-        self._room_palette = palette
-        self._base_room_colors = palette.cached_room_colors.copy()
-        self._recolor_rooms = recolor_rooms
-        self._palette_lock = threading.Lock()
-
-    def parse(
-        self,
-        raw_data: bytes,
-        width: int,
-        height: int,
-        carpet_map: set[int] | None,
-        removed_map: set[int] | None = None,
-    ):
-        """Assign non-conflicting room colors before the V1 image pass."""
-        with self._palette_lock:
-            # cached_room_colors is a read-only property, so reset its dict in place.
-            cached_room_colors = self._room_palette.cached_room_colors
-            cached_room_colors.clear()
-            cached_room_colors.update(self._base_room_colors)
-
-            if self._recolor_rooms:
-
-                def room_id(value: int) -> int | None:
-                    if value in (self.MAP_OUTSIDE, self.MAP_WALL, self.MAP_INSIDE, self.MAP_SCAN):
-                        return None
-                    return self._get_room_number(value) if value & 0x07 == 0x07 else None
-
-                room_colors = adjacency_aware_room_colors(raw_data, width, self._room_palette, room_id)
-                for number, color in room_colors.items():
-                    # ColorsPalette caches both forms for get_room_color(str | int).
-                    cached_room_colors[number] = color
-                    cached_room_colors[str(number)] = color
-            return super().parse(raw_data, width, height, carpet_map, removed_map)
-
-
 def _create_map_data_parser(config: MapParserConfig) -> RoborockMapDataParser:
     """Create a RoborockMapDataParser based on the config entry."""
     palette, sizes, image_config = _create_rendering_components(config)
-    parser = RoborockMapDataParser(
+    return RoborockMapDataParser(
         palette,
         sizes,
         config.drawables,
         image_config,
         [],
     )
-    parser._image_parser = _AdjacencyAwareRoborockImageParser(
-        palette,
-        image_config,
-        recolor_rooms=config.show_rooms,
-    )
-    return parser
 
 
 def _create_image_generator(