Automatically set state after system change (#268)

Author: bachya

simplipy/system/__init__.py

@@ -67,15 +67,6 @@ class SystemStates(Enum):
     unknown = 99
 
 
-def coerce_state_from_raw_value(value: str) -> SystemStates:
-    """Return a proper state from a string input."""
-    try:
-        return SystemStates[convert_to_underscore(value)]
-    except KeyError:
-        LOGGER.error("Unknown raw system state: %s", value)
-        return SystemStates.unknown
-
-
 def get_device_type_from_data(device_data: dict[str, Any]) -> DeviceTypes:
     """Get the device type of a raw data payload."""
     try:
@@ -423,8 +414,12 @@ async def async_update(
         ]
 
         # Set the current state:
-        self._state = coerce_state_from_raw_value(
-            self._api.subscription_data[self._sid]["location"]["system"].get(
-                "alarmState"
-            )
+        raw_state = self._api.subscription_data[self._sid]["location"]["system"].get(
+            "alarmState"
         )
+
+        try:
+            self._state = SystemStates[convert_to_underscore(raw_state)]
+        except KeyError:
+            LOGGER.error("Unknown raw system state: %s", raw_state)
+            self._state = SystemStates.unknown

simplipy/system/v2.py

@@ -9,7 +9,6 @@
     DEFAULT_MAX_USER_PINS,
     System,
     SystemStates,
-    coerce_state_from_raw_value,
     get_device_type_from_data,
 )
 
@@ -43,14 +42,13 @@ class SystemV2(System):
 
     async def _async_set_state(self, value: SystemStates) -> None:
         """Set the state of the system."""
-        state_resp = await self._api.request(
+        await self._api.request(
             "post",
             f"subscriptions/{self.system_id}/state",
             params={"state": value.name},
         )
 
-        if state_resp["success"]:
-            self._state = coerce_state_from_raw_value(state_resp["requestedState"])
+        self._state = value
 
     async def _async_set_updated_pins(self, pins: dict) -> None:
         """Post new PINs."""

simplipy/system/v3.py

@@ -17,7 +17,6 @@
     DEFAULT_MAX_USER_PINS,
     System,
     SystemStates,
-    coerce_state_from_raw_value,
     get_device_type_from_data,
     guard_from_missing_data,
 )
@@ -345,11 +344,11 @@ def _generate_camera_data(self) -> dict[str, dict]:
 
     async def _async_set_state(self, value: SystemStates) -> None:
         """Set the state of the system."""
-        state_resp = await self._api.request(
+        await self._api.request(
             "post", f"ss3/subscriptions/{self.system_id}/state/{value.name}"
         )
 
-        self._state = coerce_state_from_raw_value(state_resp["state"])
+        self._state = value
         self._last_state_change_dt = datetime.utcnow()
 
     async def _async_set_updated_pins(self, pins: dict) -> None: