Fix device_state_attributes deprecation warning

Author: ha0y

custom_components/xiaomi_miot_raw/basic_dev_class.py

@@ -210,7 +210,7 @@ def available(self):
         return self._available
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes of the device."""
         return self._state_attrs
 
@@ -802,9 +802,9 @@ def available(self):
         return self._parent_device.available
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         try:
-            return self._parent_device.device_state_attributes or {}
+            return self._parent_device.extra_state_attributes or {}
         except:
             return None
 
@@ -826,7 +826,7 @@ async def async_update(self):
         if self._skip_update:
             self._skip_update = False
             return
-        attrs = self._parent_device.device_state_attributes or {}
+        attrs = self._parent_device.extra_state_attributes or {}
         self._state_attrs = attrs
         pass
 
@@ -862,7 +862,7 @@ def available(self):
     @property
     def state(self):
         try:
-            return STATE_ON if self.device_state_attributes.get(f"{self._did_prefix}switch_status") else STATE_OFF
+            return STATE_ON if self.extra_state_attributes.get(f"{self._did_prefix}switch_status") else STATE_OFF
         except:
             return STATE_UNKNOWN
 

custom_components/xiaomi_miot_raw/binary_sensor.py

@@ -101,7 +101,7 @@ def state(self):
     def is_on(self):
         """Return true if the binary sensor is on."""
         try:
-            return self._parent_device.device_state_attributes[self._sensor_property]
+            return self._parent_device.extra_state_attributes[self._sensor_property]
         except:
             return None
 

custom_components/xiaomi_miot_raw/fan.py

@@ -283,7 +283,7 @@ def speed(self):
         """Return the current speed."""
         if not NEW_FAN:
             try:
-                self._speed = self.get_key_by_value(self._ctrl_params['speed'],self.device_state_attributes[self._did_prefix + 'speed'])
+                self._speed = self.get_key_by_value(self._ctrl_params['speed'],self.extra_state_attributes[self._did_prefix + 'speed'])
             except KeyError:
                 self._speed = None
             return self._speed
@@ -294,7 +294,7 @@ def speed(self):
     def preset_mode(self):
         """Return the current speed."""
         try:
-            self._speed = self.get_key_by_value(self._ctrl_params['speed'],self.device_state_attributes[self._did_prefix + 'speed'])
+            self._speed = self.get_key_by_value(self._ctrl_params['speed'],self.extra_state_attributes[self._did_prefix + 'speed'])
         except KeyError:
             self._speed = None
         return self._speed
@@ -310,7 +310,7 @@ def speed_count(self):
     @property
     def oscillating(self):
         """Return the oscillation state."""
-        return self.device_state_attributes.get(self._did_prefix + 'oscillate')
+        return self.extra_state_attributes.get(self._did_prefix + 'oscillate')
 
     async def async_oscillate(self, oscillating: bool) -> None:
         """Set oscillation."""
@@ -416,7 +416,7 @@ def state(self):
         return self._state2
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         return {ATTR_ATTRIBUTION: "在上方列表选择动作。选择后会立即执行。\n操作成功后，开关会短暂回弹。"}
 
     async def async_update(self):
@@ -450,7 +450,7 @@ def speed_list(self) -> list:
     @property
     def speed(self):
         """Return the current speed."""
-        return self._parent_device.get_key_by_value(self._value_list, self._parent_device.device_state_attributes.get(self._did_prefix + self._field))
+        return self._parent_device.get_key_by_value(self._value_list, self._parent_device.extra_state_attributes.get(self._did_prefix + self._field))
 
     @property
     def percentage(self) -> str:
@@ -491,7 +491,7 @@ def state(self):
         return self._state2
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         return {ATTR_ATTRIBUTION: f"可在此设置“{self._parent_device.name}”的 {self._field}。开关仅用于反馈操作是否成功，无控制功能。"}
 
     async def async_update(self):

custom_components/xiaomi_miot_raw/light.py

@@ -235,7 +235,7 @@ def supported_features(self):
     def brightness(self):
         """Return the brightness of the light."""
         try:
-            return self.convert_value(self.device_state_attributes[self._did_prefix + 'brightness'],"brightness",False,self._ctrl_params['brightness']['value_range'])
+            return self.convert_value(self.extra_state_attributes[self._did_prefix + 'brightness'],"brightness",False,self._ctrl_params['brightness']['value_range'])
         except:
             return None
 
@@ -291,7 +291,7 @@ async def async_turn_off(self, **kwargs):
     def color_temp(self):
         """Return the color temperature in mired."""
         try:
-            self._color_temp = self.convert_value(self.device_state_attributes[self._did_prefix + 'color_temperature'], "color_temperature") or 100
+            self._color_temp = self.convert_value(self.extra_state_attributes[self._did_prefix + 'color_temperature'], "color_temperature") or 100
         except KeyError: pass
         return self._color_temp
 
@@ -318,7 +318,7 @@ def effect_list(self):
     def effect(self):
         """Return the current effect."""
         try:
-            self._effect = self.get_key_by_value(self._ctrl_params['mode'],self.device_state_attributes[self._did_prefix + 'mode'])
+            self._effect = self.get_key_by_value(self._ctrl_params['mode'],self.extra_state_attributes[self._did_prefix + 'mode'])
         except KeyError:
             self._effect = None
         return self._effect
@@ -327,7 +327,7 @@ def effect(self):
     def hs_color(self):
         """Return the hs color value."""
         try:
-            self._color = self.convert_value(self.device_state_attributes[self._did_prefix + 'color'],"color",False)
+            self._color = self.convert_value(self.extra_state_attributes[self._did_prefix + 'color'],"color",False)
         except KeyError:
             self._color = None
         return self._color

custom_components/xiaomi_miot_raw/lock.py

@@ -116,7 +116,7 @@ def __init__(self, parent_device, mapping, params, mitype):
 
     @property
     def is_locked(self):
-        return self.device_state_attributes.get(f"{self._did_prefix}physical_controls_locked") == True
+        return self.extra_state_attributes.get(f"{self._did_prefix}physical_controls_locked") == True
 
     async def async_lock(self, **kwargs):
         result = await self._parent_device.set_property_new(self._did_prefix + "physical_controls_locked", True)

custom_components/xiaomi_miot_raw/number.py

@@ -80,7 +80,7 @@ def name(self):
     def state(self):
         """Return the state of the device."""
         try:
-            return self._parent_device.device_state_attributes[self._full_did]
+            return self._parent_device.extra_state_attributes[self._full_did]
         except:
             return None
 

custom_components/xiaomi_miot_raw/select.py

@@ -103,7 +103,7 @@ def options(self):
     @property
     def current_option(self):
         """Return the selected entity option to represent the entity state."""
-        return self._parent_device.device_state_attributes[self._full_did]
+        return self._parent_device.extra_state_attributes[self._full_did]
 
     async def async_select_option(self, option: str):
         """Change the selected option."""

custom_components/xiaomi_miot_raw/sensor.py

@@ -165,7 +165,7 @@ def __init__(self, parent_device, mapping, params, mitype, others={}):
     def state(self):
         """Return the state of the device."""
         try:
-            return self._parent_device.device_state_attributes[self._sensor_property]
+            return self._parent_device.extra_state_attributes[self._sensor_property]
         except:
             return None
 
@@ -295,7 +295,7 @@ def state(self):
         return self.coordinator.data[0][0]
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes of the device."""
         return self._state_attrs
 
@@ -490,7 +490,7 @@ def icon(self):
         return self._icon
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         """Return the state attributes of the device."""
         return self._state_attrs
 

custom_components/xiaomi_miot_raw/switch.py

@@ -106,12 +106,12 @@ async def async_turn_off(self) -> None:
 
     @property
     def is_on(self):
-        return self._parent_device.device_state_attributes.get(self._did_prefix + self._field)
+        return self._parent_device.extra_state_attributes.get(self._did_prefix + self._field)
 
     @property
     def state(self):
         return self._state
 
     @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
         return {}

custom_components/xiaomi_miot_raw/translations/en.json

@@ -31,7 +31,7 @@
             },
             "xiaomi_account": {
 				"title": "Log in Xiaomi Account",
-				"description": "{hint}Enter your Xiaomi credentials.",
+				"description": "{hint}Enter your Xiaomi Credentials.",
 				"data": {
 					"username": "Email/Xiaomi ID",
 					"password": "Password",
@@ -60,7 +60,7 @@
                 "description": "{device_info}"
             },
             "cloudinfo": {
-                "title": "Account credentials",
+                "title": "Account Credentials",
                 "data": {
                     "did": "did",
                     "userId": "userId",
@@ -104,7 +104,7 @@
         "step": {
             "init": {
                 "data": {
-                    "async_step_update_xiaomi_account": "Update Xiaomi Account credential and Server Location",
+                    "async_step_update_xiaomi_account": "Update Xiaomi Account Credential and Server Location",
                     "async_step_select_devices": "Batch Adding Devices (Do not select with the one above)",
                     "async_step_light_and_lock": "Show or Hide Switch for Indicator Light and Child Lock",
                     "async_step_climate": "Attach a Sensor to Climate for Current Temperature",
@@ -117,7 +117,7 @@
                 "title": "Would you like to..."
             },
             "update_xiaomi_account": {
-				"title": "Update Xiaomi Account credential",
+				"title": "Update Xiaomi Account Credential",
 				"description": "{hint}Update password for “{username}”.",
 				"data": {
 					"username": "Email/Xiaomi ID",