Improve map validation (#73)

* Improve map validation

* Fix one comment

* Fix service_version condition

* Edit persistent map schema

pybotvac/account.py

@@ -71,10 +71,10 @@
         "delocalized": Any(bool, None),
         # Everything below this line is not documented, but still present
         "generated_at": Any(str, None),
-        "persistent_map_id": Any(str, None),
-        "cleaned_with_persistent_map_id": Any(str, None),
+        "persistent_map_id": Any(int, str, None),
+        "cleaned_with_persistent_map_id": Any(int, str, None),
         "valid_as_persistent_map": Any(bool, None),
-        "navigation_mode": Any(int, None),
+        "navigation_mode": Any(int, str, None),
     },
     extra=ALLOW_EXTRA,
 )
@@ -84,7 +84,7 @@
 )
 PERSISTENT_MAP_SCHEMA = Schema(
     {
-        Required("id"): str,
+        Required("id"): Any(int, str),
         Required("name"): str,
         Required("url"): Url,
         "raw_floor_map_url": Any(Url, None),
@@ -145,12 +145,13 @@ def refresh_maps(self):
         for robot in self.robots:
             url = f"users/me/robots/{robot.serial}/maps"
             resp2 = self._session.get(url)
+            resp2_json = resp2.json()
             try:
-                MAPS_SCHEMA(resp2.json())
-                self._maps.update({robot.serial: resp2.json()})
+                MAPS_SCHEMA(resp2_json)
+                self._maps.update({robot.serial: resp2_json})
             except MultipleInvalid as ex:
                 _LOGGER.warning(
-                    "Invalid response from %s: %s. Got: %s", url, ex, resp2.json()
+                    "Invalid response from %s: %s. Got: %s", url, ex, resp2_json
                 )
 
     def refresh_robots(self):

pybotvac/robot.py

@@ -218,7 +218,7 @@ def start_cleaning(
                 "cmd": "startCleaning",
                 "params": {"category": category, "mode": mode, "modifier": 1},
             }
-        elif self.service_version == "basic-3" or "basic-4":
+        elif self.service_version in ["basic-3", "basic-4"]:
             json = {
                 "reqId": "1",
                 "cmd": "startCleaning",

pybotvac/session.py

@@ -36,7 +36,7 @@ def urljoin(self, path):
     def generate_headers(
         self, custom_headers: Optional[Dict[str, str]] = None
     ) -> Dict[str, str]:
-        """"Merge self.headers with custom headers id necessary."""
+        """Merge self.headers with custom headers id necessary."""
         if not custom_headers:
             return self.headers