Bump python-roborock to 3.3.3

homeassistant/components/roborock/__init__.py

@@ -15,7 +15,7 @@
     RoborockInvalidUserAgreement,
     RoborockNoUserAgreement,
 )
-from roborock.containers import DeviceData, HomeDataDevice, HomeDataProduct, UserData
+from roborock.data import DeviceData, HomeDataDevice, HomeDataProduct, UserData
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.version_a01_apis import RoborockMqttClientA01
 from roborock.web_api import RoborockApiClient

homeassistant/components/roborock/binary_sensor.py

@@ -5,7 +5,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from roborock.containers import RoborockStateCode
+from roborock.data import RoborockStateCode
 from roborock.roborock_typing import DeviceProp
 
 from homeassistant.components.binary_sensor import (

homeassistant/components/roborock/config_flow.py

@@ -7,7 +7,7 @@
 import logging
 from typing import Any
 
-from roborock.containers import UserData
+from roborock.data import UserData
 from roborock.exceptions import (
     RoborockAccountDoesNotExist,
     RoborockException,

homeassistant/components/roborock/coordinator.py

@@ -10,13 +10,13 @@
 
 from propcache.api import cached_property
 from roborock import HomeDataRoom
-from roborock.code_mappings import RoborockCategory
-from roborock.containers import (
+from roborock.data import (
     DeviceData,
     HomeDataDevice,
     HomeDataProduct,
     HomeDataScene,
     NetworkInfo,
+    RoborockCategory,
     UserData,
 )
 from roborock.exceptions import RoborockException

homeassistant/components/roborock/entity.py

@@ -4,7 +4,7 @@
 
 from roborock.api import RoborockClient
 from roborock.command_cache import CacheableAttribute
-from roborock.containers import Consumable, Status
+from roborock.data import Consumable, Status
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import RoborockCommand

homeassistant/components/roborock/manifest.json

@@ -19,7 +19,7 @@
   "loggers": ["roborock"],
   "quality_scale": "silver",
   "requirements": [
-    "python-roborock==2.50.2",
+    "python-roborock==3.3.3",
     "vacuum-map-parser-roborock==0.1.4"
   ]
 }

homeassistant/components/roborock/models.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 from typing import Any
 
-from roborock.containers import HomeDataDevice, HomeDataProduct, NetworkInfo
+from roborock.data import HomeDataDevice, HomeDataProduct, NetworkInfo
 from roborock.roborock_typing import DeviceProp
 from vacuum_map_parser_base.map_data import MapData
 

homeassistant/components/roborock/select.py

@@ -4,7 +4,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from roborock.code_mappings import RoborockDockDustCollectionModeCode
+from roborock.data import RoborockDockDustCollectionModeCode
 from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import DeviceProp, RoborockCommand
 

homeassistant/components/roborock/sensor.py

@@ -6,12 +6,15 @@
 from dataclasses import dataclass
 import datetime
 
-from roborock.code_mappings import DyadError, RoborockDyadStateCode, ZeoError, ZeoState
-from roborock.containers import (
+from roborock.data import (
+    DyadError,
     RoborockDockErrorCode,
     RoborockDockTypeCode,
+    RoborockDyadStateCode,
     RoborockErrorCode,
     RoborockStateCode,
+    ZeoError,
+    ZeoState,
 )
 from roborock.roborock_message import (
     RoborockDataProtocol,

homeassistant/components/roborock/vacuum.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 
-from roborock.code_mappings import RoborockStateCode
+from roborock.data import RoborockStateCode
 from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import RoborockCommand
 import voluptuous as vol

script/hassfest/requirements.py

@@ -242,7 +242,6 @@
     },
     "ring": {"ring-doorbell": {"async-timeout"}},
     "rmvtransport": {"pyrmvtransport": {"async-timeout"}},
-    "roborock": {"python-roborock": {"async-timeout"}},
     "samsungtv": {"async-upnp-client": {"async-timeout"}},
     "screenlogic": {"screenlogicpy": {"async-timeout"}},
     "sense": {"sense-energy": {"async-timeout"}},

tests/components/roborock/conftest.py

@@ -10,7 +10,7 @@
 
 import pytest
 from roborock import RoborockCategory, RoomMapping
-from roborock.code_mappings import DyadError, RoborockDyadStateCode, ZeoError, ZeoState
+from roborock.data import DyadError, RoborockDyadStateCode, ZeoError, ZeoState
 from roborock.roborock_message import RoborockDyadDataProtocol, RoborockZeoProtocol
 from roborock.version_a01_apis import RoborockMqttClientA01
 

tests/components/roborock/mock_data.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from PIL import Image
-from roborock.containers import (
+from roborock.data import (
     CleanRecord,
     CleanSummary,
     Consumable,

tests/components/roborock/snapshots/test_diagnostics.ambr

@@ -213,40 +213,29 @@
                 1672543330,
                 1672458041,
               ]),
-              'squareMeterCleanArea': 1159.2,
             }),
             'consumable': dict({
-              'cleaningBrushTimeLeft': 235,
               'cleaningBrushWorkTimes': 65,
-              'dustCollectionTimeLeft': 65,
               'dustCollectionWorkTimes': 25,
               'filterElementWorkTime': 0,
-              'filterTimeLeft': 465618,
               'filterWorkTime': 74382,
-              'mainBrushTimeLeft': 1005618,
               'mainBrushWorkTime': 74382,
               'sensorDirtyTime': 74382,
-              'sensorTimeLeft': 33618,
-              'sideBrushTimeLeft': 645618,
               'sideBrushWorkTime': 74382,
-              'strainerTimeLeft': 85,
               'strainerWorkTimes': 65,
             }),
             'lastCleanRecord': dict({
               'area': 20965000,
               'avoidCount': 19,
               'begin': 1672543330,
-              'beginDatetime': '2023-01-01T03:22:10+00:00',
               'cleanType': 3,
               'complete': 1,
               'duration': 1176,
               'dustCollectionStatus': 1,
               'end': 1672544638,
-              'endDatetime': '2023-01-01T03:43:58+00:00',
               'error': 0,
               'finishReason': 56,
               'mapFlag': 0,
-              'squareMeterArea': 21.0,
               'startType': 2,
               'washCount': 2,
             }),
@@ -271,17 +260,7 @@
               'dockType': 3,
               'dustCollectionStatus': 0,
               'errorCode': 0,
-              'errorCodeName': 'none',
               'fanPower': 102,
-              'fanPowerName': 'balanced',
-              'fanPowerOptions': list([
-                'off',
-                'quiet',
-                'balanced',
-                'turbo',
-                'max',
-                'custom',
-              ]),
               'homeSecEnablePassword': 0,
               'homeSecStatus': 0,
               'inCleaning': 0,
@@ -295,20 +274,16 @@
               'mapStatus': 3,
               'mopForbiddenEnable': 1,
               'mopMode': 300,
-              'mopModeName': 'standard',
               'msgSeq': 458,
               'msgVer': 2,
-              'squareMeterCleanArea': 21.0,
               'state': 8,
-              'stateName': 'charging',
               'switchMapMode': 0,
               'unsaveMapFlag': 0,
               'unsaveMapReason': 0,
               'washPhase': 0,
               'washReady': 0,
               'waterBoxCarriageStatus': 1,
               'waterBoxMode': 203,
-              'waterBoxModeName': 'intense',
               'waterBoxStatus': 1,
               'waterShortageStatus': 0,
             }),
@@ -498,40 +473,29 @@
                 1672543330,
                 1672458041,
               ]),
-              'squareMeterCleanArea': 1159.2,
             }),
             'consumable': dict({
-              'cleaningBrushTimeLeft': 235,
               'cleaningBrushWorkTimes': 65,
-              'dustCollectionTimeLeft': 65,
               'dustCollectionWorkTimes': 25,
               'filterElementWorkTime': 0,
-              'filterTimeLeft': 465618,
               'filterWorkTime': 74382,
-              'mainBrushTimeLeft': 1005618,
               'mainBrushWorkTime': 74382,
               'sensorDirtyTime': 74382,
-              'sensorTimeLeft': 33618,
-              'sideBrushTimeLeft': 645618,
               'sideBrushWorkTime': 74382,
-              'strainerTimeLeft': 85,
               'strainerWorkTimes': 65,
             }),
             'lastCleanRecord': dict({
               'area': 20965000,
               'avoidCount': 19,
               'begin': 1672543330,
-              'beginDatetime': '2023-01-01T03:22:10+00:00',
               'cleanType': 3,
               'complete': 1,
               'duration': 1176,
               'dustCollectionStatus': 1,
               'end': 1672544638,
-              'endDatetime': '2023-01-01T03:43:58+00:00',
               'error': 0,
               'finishReason': 56,
               'mapFlag': 0,
-              'squareMeterArea': 21.0,
               'startType': 2,
               'washCount': 2,
             }),
@@ -556,17 +520,7 @@
               'dockType': 3,
               'dustCollectionStatus': 0,
               'errorCode': 0,
-              'errorCodeName': 'none',
               'fanPower': 102,
-              'fanPowerName': 'balanced',
-              'fanPowerOptions': list([
-                'off',
-                'quiet',
-                'balanced',
-                'turbo',
-                'max',
-                'custom',
-              ]),
               'homeSecEnablePassword': 0,
               'homeSecStatus': 0,
               'inCleaning': 0,
@@ -580,20 +534,16 @@
               'mapStatus': 3,
               'mopForbiddenEnable': 1,
               'mopMode': 300,
-              'mopModeName': 'standard',
               'msgSeq': 458,
               'msgVer': 2,
-              'squareMeterCleanArea': 21.0,
               'state': 8,
-              'stateName': 'charging',
               'switchMapMode': 0,
               'unsaveMapFlag': 0,
               'unsaveMapReason': 0,
               'washPhase': 0,
               'washReady': 0,
               'waterBoxCarriageStatus': 1,
               'waterBoxMode': 203,
-              'waterBoxModeName': 'intense',
               'waterBoxStatus': 1,
               'waterShortageStatus': 0,
             }),

tests/components/roborock/test_image.py

@@ -8,6 +8,7 @@
 from PIL import Image
 import pytest
 from roborock import RoborockException
+from roborock.data import RoborockStateCode
 from vacuum_map_parser_base.map_data import ImageConfig, ImageData
 
 from homeassistant.components.roborock import DOMAIN
@@ -317,7 +318,7 @@ async def test_map_status_change(
 
     # Copy the device prop so we don't override it
     prop = copy.deepcopy(PROP)
-    prop.status.state_name = "testing"
+    prop.status.state = RoborockStateCode.docking
     new_map_data = copy.deepcopy(MAP_DATA)
     new_map_data.image = ImageData(
         100, 10, 10, 10, 10, ImageConfig(), Image.new("RGB", (2, 2)), lambda p: p