More rework on platforms

azerty9971 · Jan 22, 2025 · 56542b6 · 56542b6
1 parent 6b99b75
commit 56542b6
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 86 deletions.
diff --git a/custom_components/xtend_tuya/alarm_control_panel.py b/custom_components/xtend_tuya/alarm_control_panel.py
@@ -56,7 +56,7 @@ def async_discover_device(device_map) -> None:
             if device := hass_data.manager.device_map.get(device_id, None):
                 if descriptions := merged_descriptors.get(device.category):
                     entities.extend(
-                        XTAlarmEntity(device, hass_data.manager, description)
+                        XTAlarmEntity(device, hass_data.manager, XTAlarmEntityDescription(**description.__dict__))
                         for description in descriptions
                         if description.key in device.status
                     )

diff --git a/custom_components/xtend_tuya/button.py b/custom_components/xtend_tuya/button.py
@@ -107,7 +107,7 @@ def async_discover_device(device_map) -> None:
                             for reset_state in description.vf_reset_state:
                                 if reset_state in device.status:
                                     entities.extend(
-                                        [XTButtonEntity(device, hass_data.manager, description)]
+                                        [XTButtonEntity(device, hass_data.manager, XTButtonEntityDescription(**description.__dict__))]
                                     )
                                 break
 

diff --git a/custom_components/xtend_tuya/climate.py b/custom_components/xtend_tuya/climate.py
@@ -66,7 +66,7 @@ def async_discover_device(device_map) -> None:
                         XTClimateEntity(
                             device,
                             hass_data.manager,
-                            merged_descriptions[device.category],
+                            XTClimateEntityDescription(**merged_descriptions[device.category].__dict__),
                             hass.config.units.temperature_unit,
                         )
                     )

diff --git a/custom_components/xtend_tuya/cover.py b/custom_components/xtend_tuya/cover.py
@@ -113,7 +113,7 @@ def async_discover_device(device_map) -> None:
             if device := hass_data.manager.device_map.get(device_id):
                 if descriptions := merged_descriptors.get(device.category):
                     entities.extend(
-                        XTCoverEntity(device, hass_data.manager, description)
+                        XTCoverEntity(device, hass_data.manager, XTCoverEntityDescription(**description.__dict__))
                         for description in descriptions
                         if (
                             description.key in device.function

diff --git a/custom_components/xtend_tuya/humidifier.py b/custom_components/xtend_tuya/humidifier.py
@@ -56,7 +56,7 @@ def async_discover_device(device_map) -> None:
             if device := hass_data.manager.device_map.get(device_id):
                 if description := merged_categories.get(device.category):
                     entities.append(
-                        XTHumidifierEntity(device, hass_data.manager, description)
+                        XTHumidifierEntity(device, hass_data.manager, XTHumidifierEntityDescription(**description.__dict__))
                     )
         async_add_entities(entities)
 

diff --git a/custom_components/xtend_tuya/light.py b/custom_components/xtend_tuya/light.py
@@ -62,7 +62,7 @@ def async_discover_device(device_map):
             if device := hass_data.manager.device_map.get(device_id):
                 if descriptions := merged_descriptors.get(device.category):
                     entities.extend(
-                        XTLightEntity(device, hass_data.manager, description)
+                        XTLightEntity(device, hass_data.manager, XTLightEntityDescription(**description.__dict__))
                         for description in descriptions
                         if description.key in device.status
                     )

diff --git a/custom_components/xtend_tuya/number.py b/custom_components/xtend_tuya/number.py
@@ -366,7 +366,7 @@ def async_discover_device(device_map) -> None:
             if device := hass_data.manager.device_map.get(device_id):
                 if descriptions := merged_descriptors.get(device.category):
                     entities.extend(
-                        XTNumberEntity(device, hass_data.manager, description)
+                        XTNumberEntity(device, hass_data.manager, XTNumberEntityDescription(**description.__dict__))
                         for description in descriptions
                         if description.key in device.status
                     )

diff --git a/custom_components/xtend_tuya/scene.py b/custom_components/xtend_tuya/scene.py
@@ -23,7 +23,7 @@ async def async_setup_entry(
     """Set up Tuya scenes."""
     hass_data = entry.runtime_data
     scenes = await hass.async_add_executor_job(hass_data.manager.query_scenes)
-    async_add_entities(XTSceneEntity(hass_data.manager, scene) for scene in scenes)
+    async_add_entities(XTSceneEntity(hass_data.manager, XTScene(**scene.__dict__)) for scene in scenes)
 
 
 class XTSceneEntity(TuyaSceneEntity):