Airzone select improvements

homeassistant/components/airzone/select.py

@@ -1,7 +1,7 @@
 """Support for the Airzone sensors."""
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import Any, Final
 
 from aioairzone.common import GrilleAngle, SleepTimeout
@@ -32,26 +32,27 @@ class AirzoneSelectDescriptionMixin:
     """Define an entity description mixin for select entities."""
 
     api_param: str
+    options_dict: dict[str, int]
 
 
 @dataclass
 class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescriptionMixin):
     """Class to describe an Airzone select entity."""
 
 
-GRILLE_ANGLE_OPTIONS: Final[list[str]] = [
-    str(GrilleAngle.DEG_90.value),
-    str(GrilleAngle.DEG_50.value),
-    str(GrilleAngle.DEG_45.value),
-    str(GrilleAngle.DEG_40.value),
-]
+GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
+    "90deg": GrilleAngle.DEG_90,
+    "50deg": GrilleAngle.DEG_50,
+    "45deg": GrilleAngle.DEG_45,
+    "40deg": GrilleAngle.DEG_40,
+}
 
-SLEEP_OPTIONS: Final[list[str]] = [
-    str(SleepTimeout.SLEEP_OFF.value),
-    str(SleepTimeout.SLEEP_30.value),
-    str(SleepTimeout.SLEEP_60.value),
-    str(SleepTimeout.SLEEP_90.value),
-]
+SLEEP_DICT: Final[dict[str, int]] = {
+    "off": SleepTimeout.SLEEP_OFF,
+    "30m": SleepTimeout.SLEEP_30,
+    "60m": SleepTimeout.SLEEP_60,
+    "90m": SleepTimeout.SLEEP_90,
+}
 
 
 ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
@@ -60,23 +61,23 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription
         entity_category=EntityCategory.CONFIG,
         key=AZD_COLD_ANGLE,
         name="Cold Angle",
-        options=GRILLE_ANGLE_OPTIONS,
+        options_dict=GRILLE_ANGLE_DICT,
         translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_HEAT_ANGLE,
         entity_category=EntityCategory.CONFIG,
         key=AZD_HEAT_ANGLE,
         name="Heat Angle",
-        options=GRILLE_ANGLE_OPTIONS,
+        options_dict=GRILLE_ANGLE_DICT,
         translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_SLEEP,
         entity_category=EntityCategory.CONFIG,
         key=AZD_SLEEP,
         name="Sleep",
-        options=SLEEP_OPTIONS,
+        options_dict=SLEEP_DICT,
         translation_key="sleep_times",
     ),
 )
@@ -93,10 +94,14 @@ async def async_setup_entry(
     for system_zone_id, zone_data in coordinator.data[AZD_ZONES].items():
         for description in ZONE_SELECT_TYPES:
             if description.key in zone_data:
+                _desc = replace(
+                    description,
+                    options=list(description.options_dict),
+                )
                 entities.append(
                     AirzoneZoneSelect(
                         coordinator,
-                        description,
+                        _desc,
                         entry,
                         system_zone_id,
                         zone_data,
@@ -110,20 +115,22 @@ class AirzoneBaseSelect(AirzoneEntity, SelectEntity):
     """Define an Airzone select."""
 
     entity_description: AirzoneSelectDescription
+    values_dict: dict[int, str]
 
     @callback
     def _handle_coordinator_update(self) -> None:
         """Update attributes when the coordinator updates."""
         self._async_update_attrs()
         super()._handle_coordinator_update()
 
+    def _get_current_option(self) -> str | None:
+        value = self.get_airzone_value(self.entity_description.key)
+        return self.values_dict.get(value)
+
     @callback
     def _async_update_attrs(self) -> None:
         """Update select attributes."""
-        value = self.get_airzone_value(self.entity_description.key)
-        if value is not None:
-            value = str(value.value)
-        self._attr_current_option = value
+        self._attr_current_option = self._get_current_option()
 
 
 class AirzoneZoneSelect(AirzoneZoneEntity, AirzoneBaseSelect):
@@ -145,12 +152,12 @@ def __init__(
             f"{self._attr_unique_id}_{system_zone_id}_{description.key}"
         )
         self.entity_description = description
+        self.values_dict = {v: k for k, v in description.options_dict.items()}
 
         self._async_update_attrs()
 
     async def async_select_option(self, option: str) -> None:
         """Change the selected option."""
-        params = {
-            self.entity_description.api_param: int(option),
-        }
-        await self._async_update_hvac_params(params)
+        param = self.entity_description.api_param
+        value = self.entity_description.options_dict[option]
+        await self._async_update_hvac_params({param: value})

homeassistant/components/airzone/strings.json

@@ -28,18 +28,18 @@
     "select": {
       "grille_angles": {
         "state": {
-          "0": "90º",
-          "1": "50º",
-          "2": "45º",
-          "3": "40º"
+          "90deg": "90º",
+          "50deg": "50º",
+          "45deg": "45º",
+          "40deg": "40º"
         }
       },
       "sleep_times": {
         "state": {
-          "0": "[%key:common::state::off%]",
-          "30": "30 minutes",
-          "60": "60 minutes",
-          "90": "90 minutes"
+          "off": "[%key:common::state::off%]",
+          "30m": "30 minutes",
+          "60m": "60 minutes",
+          "90m": "90 minutes"
         }
       }
     }

tests/components/airzone/test_select.py

@@ -2,7 +2,6 @@
 
 from unittest.mock import patch
 
-from aioairzone.common import GrilleAngle, SleepTimeout
 from aioairzone.const import (
     API_COLD_ANGLE,
     API_DATA,
@@ -26,49 +25,49 @@ async def test_airzone_create_selects(hass: HomeAssistant) -> None:
     await async_init_integration(hass)
 
     state = hass.states.get("select.despacho_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.despacho_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.despacho_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_OFF.value)
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_1_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_1_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_1_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_OFF.value)
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_2_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_2_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.dorm_2_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_OFF.value)
+    assert state.state == "off"
 
     state = hass.states.get("select.dorm_ppal_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_45.value)
+    assert state.state == "45deg"
 
     state = hass.states.get("select.dorm_ppal_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_50.value)
+    assert state.state == "50deg"
 
     state = hass.states.get("select.dorm_ppal_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_30.value)
+    assert state.state == "30m"
 
     state = hass.states.get("select.salon_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.salon_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_90.value)
+    assert state.state == "90deg"
 
     state = hass.states.get("select.salon_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_OFF.value)
+    assert state.state == "off"
 
 
 async def test_airzone_select_sleep(hass: HomeAssistant) -> None:
@@ -81,7 +80,7 @@ async def test_airzone_select_sleep(hass: HomeAssistant) -> None:
             {
                 API_SYSTEM_ID: 1,
                 API_ZONE_ID: 3,
-                API_SLEEP: SleepTimeout.SLEEP_30.value,
+                API_SLEEP: 30,
             }
         ]
     }
@@ -106,13 +105,13 @@ async def test_airzone_select_sleep(hass: HomeAssistant) -> None:
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: "select.dorm_1_sleep",
-                ATTR_OPTION: str(SleepTimeout.SLEEP_30.value),
+                ATTR_OPTION: "30m",
             },
             blocking=True,
         )
 
     state = hass.states.get("select.dorm_1_sleep")
-    assert state.state == str(SleepTimeout.SLEEP_30.value)
+    assert state.state == "30m"
 
 
 async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
@@ -127,7 +126,7 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             {
                 API_SYSTEM_ID: 1,
                 API_ZONE_ID: 3,
-                API_COLD_ANGLE: GrilleAngle.DEG_50.value,
+                API_COLD_ANGLE: 1,
             }
         ]
     }
@@ -141,13 +140,13 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: "select.dorm_1_cold_angle",
-                ATTR_OPTION: str(GrilleAngle.DEG_50.value),
+                ATTR_OPTION: "50deg",
             },
             blocking=True,
         )
 
     state = hass.states.get("select.dorm_1_cold_angle")
-    assert state.state == str(GrilleAngle.DEG_50.value)
+    assert state.state == "50deg"
 
     # Heat Angle
 
@@ -156,7 +155,7 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             {
                 API_SYSTEM_ID: 1,
                 API_ZONE_ID: 3,
-                API_HEAT_ANGLE: GrilleAngle.DEG_45.value,
+                API_HEAT_ANGLE: 2,
             }
         ]
     }
@@ -169,10 +168,10 @@ async def test_airzone_select_grille_angle(hass: HomeAssistant) -> None:
             SERVICE_SELECT_OPTION,
             {
                 ATTR_ENTITY_ID: "select.dorm_1_heat_angle",
-                ATTR_OPTION: str(GrilleAngle.DEG_45.value),
+                ATTR_OPTION: "45deg",
             },
             blocking=True,
         )
 
     state = hass.states.get("select.dorm_1_heat_angle")
-    assert state.state == str(GrilleAngle.DEG_45.value)
+    assert state.state == "45deg"