fix: address comments

Author: Lash-L

roborock/containers.py

@@ -226,6 +226,7 @@ class RRiot(RoborockBase):
 
 @dataclass
 class UserData(RoborockBase):
+    rriot: RRiot
     uid: int | None = None
     tokentype: str | None = None
     token: str | None = None
@@ -234,7 +235,6 @@ class UserData(RoborockBase):
     countrycode: str | None = None
     country: str | None = None
     nickname: str | None = None
-    rriot: RRiot | None = None
     tuya_device_state: int | None = None
     avatarurl: str | None = None
 

roborock/web_api.py

@@ -285,7 +285,7 @@ async def _get_home_id(self, user_data: UserData):
                 )
             raise RoborockException(f"{home_id_response.get('msg')} - response code: {home_id_response.get('code')}")
 
-        return home_id_response["data"].get("rrHomeId")
+        return home_id_response["data"]["rrHomeId"]
 
     async def get_home_data(self, user_data: UserData) -> HomeData:
         rriot = user_data.rriot
@@ -335,25 +335,22 @@ async def get_home_data_v2(self, user_data: UserData) -> HomeData:
     async def get_home_data_v3(self, user_data: UserData) -> HomeData:
         """This is the same as get_home_data, but uses a different endpoint and includes non-robotic vacuums."""
         rriot = user_data.rriot
-        if rriot is None:
-            raise RoborockException("rriot is none")
         home_id = await self._get_home_id(user_data)
         if rriot.r.a is None:
             raise RoborockException("Missing field 'a' in rriot reference")
         home_request = PreparedRequest(
             rriot.r.a,
             {
-                "Authorization": self._get_hawk_authentication(rriot, "/v3/user/homes/" + str(home_id)),
+                "Authorization": self._get_hawk_authentication(rriot, "/v3/user/homes/" + home_id),
             },
         )
-        home_response = await home_request.request("get", "/v3/user/homes/" + str(home_id))
+        home_response = await home_request.request("get", "/v3/user/homes/" + home_id)
         if not home_response.get("success"):
             raise RoborockException(home_response)
         home_data = home_response.get("result")
         if isinstance(home_data, dict):
             return HomeData.from_dict(home_data)
-        else:
-            raise RoborockException("home_response result was an unexpected type")
+        raise RoborockException(f"home_response result was an unexpected type: {home_data}")
 
     async def get_rooms(self, user_data: UserData, home_id: int | None = None) -> list[HomeDataRoom]:
         rriot = user_data.rriot