[pull] dev from home-assistant:dev

homeassistant/components/avosdim/__init__.py

@@ -0,0 +1 @@
+"""Virtual integration: Avosdim."""

homeassistant/components/avosdim/manifest.json

@@ -0,0 +1,6 @@
+{
+  "domain": "avosdim",
+  "name": "Avosdim",
+  "integration_type": "virtual",
+  "supported_by": "motion_blinds"
+}

homeassistant/components/blebox/button.py

@@ -2,7 +2,7 @@
 
 import blebox_uniapi.button
 
-from homeassistant.components.button import ButtonEntity
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -13,6 +13,16 @@
 
 PARALLEL_UPDATES = 1
 
+BUTTON_TYPES: dict[str, ButtonEntityDescription] = {
+    "up": ButtonEntityDescription(key="up", translation_key="up"),
+    "down": ButtonEntityDescription(key="down", translation_key="down"),
+    "fav": ButtonEntityDescription(key="fav", translation_key="fav"),
+    "open": ButtonEntityDescription(key="open", translation_key="open"),
+    "close": ButtonEntityDescription(key="close", translation_key="close"),
+}
+
+_DEFAULT_BUTTON = ButtonEntityDescription(key="button")
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -35,22 +45,16 @@ def __init__(
         self, coordinator: BleBoxCoordinator, feature: blebox_uniapi.button.Button
     ) -> None:
         """Initialize a BleBox button feature."""
+
         super().__init__(coordinator, feature)
-        self._attr_icon = self.get_icon()
-
-    def get_icon(self) -> str | None:
-        """Return icon for endpoint."""
-        if "up" in self._feature.query_string:
-            return "mdi:arrow-up-circle"
-        if "down" in self._feature.query_string:
-            return "mdi:arrow-down-circle"
-        if "fav" in self._feature.query_string:
-            return "mdi:heart-circle"
-        if "open" in self._feature.query_string:
-            return "mdi:arrow-up-circle"
-        if "close" in self._feature.query_string:
-            return "mdi:arrow-down-circle"
-        return None
+        self.entity_description = self._get_description()
+
+    def _get_description(self) -> ButtonEntityDescription:
+        """Return the description matching this button's query string."""
+        for key, description in BUTTON_TYPES.items():
+            if key in self._feature.query_string:
+                return description
+        return _DEFAULT_BUTTON
 
     @blebox_command
     async def async_press(self) -> None:

homeassistant/components/blebox/coordinator.py

@@ -43,6 +43,6 @@ async def _async_update_data(self) -> None:
         except Error as err:
             raise UpdateFailed(
                 translation_domain=DOMAIN,
-                translation_key="update_failed",
+                translation_key="data_update_failed",
                 translation_placeholders={"error": str(err)},
             ) from err

homeassistant/components/blebox/icons.json

@@ -0,0 +1,26 @@
+{
+  "entity": {
+    "button": {
+      "close": {
+        "default": "mdi:arrow-down-circle"
+      },
+      "down": {
+        "default": "mdi:arrow-down-circle"
+      },
+      "fav": {
+        "default": "mdi:heart-circle"
+      },
+      "open": {
+        "default": "mdi:arrow-up-circle"
+      },
+      "up": {
+        "default": "mdi:arrow-up-circle"
+      }
+    },
+    "sensor": {
+      "power_consumption": {
+        "default": "mdi:lightning-bolt"
+      }
+    }
+  }
+}

homeassistant/components/blebox/light.py

@@ -19,10 +19,11 @@
     LightEntityFeature,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BleBoxConfigEntry
-from .const import LIGHT_MAX_KELVINS, LIGHT_MIN_KELVINS
+from .const import DOMAIN, LIGHT_MAX_KELVINS, LIGHT_MIN_KELVINS
 from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity
 from .util import blebox_command
@@ -215,18 +216,21 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         try:
             await self._feature.async_on(value)
         except ValueError as exc:
-            raise ValueError(
-                f"Turning on '{self.name}' failed: Bad value {value}"
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="bad_value",
+                translation_placeholders={"error": str(exc)},
             ) from exc
 
         if effect is not None:
             try:
                 effect_value = self.effect_list.index(effect)
                 await self._feature.async_api_command("effect", effect_value)
             except ValueError as exc:
-                raise ValueError(
-                    f"Turning on with effect '{self.name}' failed: {effect} not in"
-                    " effect list."
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="effect_not_found",
+                    translation_placeholders={"error": str(exc)},
                 ) from exc
 
     @blebox_command

homeassistant/components/blebox/sensor.py

@@ -57,9 +57,9 @@
     ),
     SensorEntityDescription(
         key="powerConsumption",
+        translation_key="power_consumption",
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
-        icon="mdi:lightning-bolt",
     ),
     SensorEntityDescription(
         key="humidity",

homeassistant/components/blebox/strings.json

@@ -36,8 +36,23 @@
     }
   },
   "exceptions": {
-    "update_failed": {
+    "bad_value": {
+      "message": "Turning on the light failed: {error}"
+    },
+    "command_failed": {
+      "message": "Failed to execute command on the BleBox device: {error}"
+    },
+    "data_update_failed": {
       "message": "An error occurred while communicating with the BleBox device: {error}"
+    },
+    "effect_not_found": {
+      "message": "The specified light effect is not available on this device: {error}"
+    },
+    "install_failed": {
+      "message": "Failed to install firmware update on the BleBox device: {error}"
+    },
+    "update_failed": {
+      "message": "Failed to fetch firmware update information from the BleBox device: {error}"
     }
   }
 }

homeassistant/components/blebox/update.py

@@ -18,6 +18,7 @@
 from homeassistant.helpers.event import async_call_later
 
 from . import BleBoxConfigEntry
+from .const import DOMAIN
 from .coordinator import BleBoxCoordinator
 from .entity import BleBoxEntity
 
@@ -86,7 +87,11 @@ async def async_update(self) -> None:
         try:
             await self._feature.async_update()
         except Error as ex:
-            raise HomeAssistantError(ex) from ex
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="update_failed",
+                translation_placeholders={"error": str(ex)},
+            ) from ex
         self._sync_sw_version()
 
     @property
@@ -121,7 +126,11 @@ async def async_install(
             await self._feature.async_install()
         except Error as ex:
             self._reset_progress()
-            raise HomeAssistantError(ex) from ex
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="install_failed",
+                translation_placeholders={"error": str(ex)},
+            ) from ex
         self._poll_cancel = async_call_later(
             self.hass, _POLL_INTERVAL_SECONDS, self._poll_until_updated
         )

homeassistant/components/blebox/util.py

@@ -7,6 +7,7 @@
 
 from homeassistant.exceptions import HomeAssistantError
 
+from .const import DOMAIN
 from .entity import BleBoxEntity
 
 
@@ -22,7 +23,11 @@ async def handler(self: _BleBoxEntityT, *args: _P.args, **kwargs: _P.kwargs) ->
         try:
             return await func(self, *args, **kwargs)
         except Error as err:
-            raise HomeAssistantError(str(err)) from err
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="command_failed",
+                translation_placeholders={"error": str(err)},
+            ) from err
         finally:
             await self.coordinator.async_refresh()
 

homeassistant/components/generic/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/generic",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["av==16.0.1", "Pillow==12.2.0"]
+  "requirements": ["av==17.0.1", "Pillow==12.2.0"]
 }

homeassistant/components/helty/__init__.py

@@ -7,7 +7,7 @@
 
 from .coordinator import HeltyConfigEntry, HeltyDataUpdateCoordinator
 
-PLATFORMS: list[Platform] = [Platform.FAN, Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.FAN, Platform.SENSOR]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: HeltyConfigEntry) -> bool:

homeassistant/components/helty/button.py

@@ -0,0 +1,47 @@
+"""Button platform for the Helty Flow integration."""
+
+from pyhelty import HeltyError
+
+from homeassistant.components.button import ButtonEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import HeltyConfigEntry, HeltyDataUpdateCoordinator
+from .entity import HeltyEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: HeltyConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Helty buttons."""
+    async_add_entities([HeltyResetFilterButton(entry.runtime_data)])
+
+
+class HeltyResetFilterButton(HeltyEntity, ButtonEntity):
+    """Resets the filter-life counter after the filter has been replaced."""
+
+    _attr_entity_category = EntityCategory.CONFIG
+    _attr_translation_key = "reset_filter"
+
+    def __init__(self, coordinator: HeltyDataUpdateCoordinator) -> None:
+        """Initialize the button."""
+        super().__init__(coordinator)
+        self._attr_unique_id = f"{self._device_id}_reset_filter"
+
+    async def async_press(self) -> None:
+        """Reset the filter-life counter."""
+        try:
+            await self.coordinator.client.async_reset_filter()
+        except HeltyError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="reset_filter_failed",
+            ) from err
+        await self.coordinator.async_request_refresh()

homeassistant/components/helty/fan.py

@@ -2,17 +2,18 @@
 
 from typing import Any
 
-from pyhelty import FanMode
+from pyhelty import FanMode, HeltyError
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     ordered_list_item_to_percentage,
     percentage_to_ordered_list_item,
 )
 
-from .const import PRESET_BOOST, PRESET_FREE_COOLING, PRESET_NIGHT
+from .const import DOMAIN, PRESET_BOOST, PRESET_FREE_COOLING, PRESET_NIGHT
 from .coordinator import HeltyConfigEntry, HeltyDataUpdateCoordinator
 from .entity import HeltyEntity
 
@@ -116,5 +117,11 @@ async def async_turn_off(self, **kwargs: Any) -> None:
         await self._async_set_mode(FanMode.OFF)
 
     async def _async_set_mode(self, mode: FanMode) -> None:
-        await self.coordinator.client.async_set_fan_mode(mode)
+        try:
+            await self.coordinator.client.async_set_fan_mode(mode)
+        except HeltyError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="set_fan_mode_failed",
+            ) from err
         await self.coordinator.async_request_refresh()

homeassistant/components/helty/quality_scale.yaml

@@ -26,9 +26,7 @@ rules:
   unique-config-entry: done
 
   # Silver
-  action-exceptions:
-    status: exempt
-    comment: This integration does not provide additional actions.
+  action-exceptions: done
   config-entry-unloading: done
   docs-configuration-parameters:
     status: exempt

homeassistant/components/helty/strings.json

@@ -20,6 +20,11 @@
     }
   },
   "entity": {
+    "button": {
+      "reset_filter": {
+        "name": "Reset filter"
+      }
+    },
     "sensor": {
       "indoor_humidity": {
         "name": "Indoor humidity"
@@ -31,5 +36,13 @@
         "name": "Outdoor temperature"
       }
     }
+  },
+  "exceptions": {
+    "reset_filter_failed": {
+      "message": "Failed to reset the filter."
+    },
+    "set_fan_mode_failed": {
+      "message": "Failed to set the ventilation mode."
+    }
   }
 }