Use modern Python for OpenAI

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 4
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.9"
+  HA_SHORT_VERSION: "2025.8"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.29.5
+        uses: github/codeql-action/init@v3.29.4
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.29.5
+        uses: github/codeql-action/analyze@v3.29.4
         with:
           category: "/language:python"

.strict-typing

@@ -53,7 +53,6 @@ homeassistant.components.air_quality.*
 homeassistant.components.airgradient.*
 homeassistant.components.airly.*
 homeassistant.components.airnow.*
-homeassistant.components.airos.*
 homeassistant.components.airq.*
 homeassistant.components.airthings.*
 homeassistant.components.airthings_ble.*
@@ -502,7 +501,6 @@ homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tailwind.*
 homeassistant.components.tami4.*
-homeassistant.components.tankerkoenig.*
 homeassistant.components.tautulli.*
 homeassistant.components.tcp.*
 homeassistant.components.technove.*
@@ -548,7 +546,6 @@ homeassistant.components.valve.*
 homeassistant.components.velbus.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*
-homeassistant.components.volvo.*
 homeassistant.components.wake_on_lan.*
 homeassistant.components.wake_word.*
 homeassistant.components.wallbox.*

CODEOWNERS

@@ -67,8 +67,6 @@ build.json @home-assistant/supervisor
 /tests/components/airly/ @bieniu
 /homeassistant/components/airnow/ @asymworks
 /tests/components/airnow/ @asymworks
-/homeassistant/components/airos/ @CoMPaTech
-/tests/components/airos/ @CoMPaTech
 /homeassistant/components/airq/ @Sibgatulin @dl2080
 /tests/components/airq/ @Sibgatulin @dl2080
 /homeassistant/components/airthings/ @danielhiversen @LaStrada
@@ -1708,8 +1706,6 @@ build.json @home-assistant/supervisor
 /tests/components/voip/ @balloob @synesthesiam @jaminh
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
-/homeassistant/components/volvo/ @thomasddn
-/tests/components/volvo/ @thomasddn
 /homeassistant/components/volvooncall/ @molobrakos
 /tests/components/volvooncall/ @molobrakos
 /homeassistant/components/vulcan/ @Antoni-Czaplicki

homeassistant/auth/models.py

@@ -33,10 +33,7 @@ class AuthFlowContext(FlowContext, total=False):
     redirect_uri: str
 
 
-class AuthFlowResult(FlowResult[AuthFlowContext, tuple[str, str]], total=False):
+AuthFlowResult = FlowResult[AuthFlowContext, tuple[str, str]]
-    """Typed result dict for auth flow."""
-
-    result: Credentials  # Only present if type is CREATE_ENTRY
 
 
 @attr.s(slots=True)

homeassistant/brands/frient.json

@@ -1,5 +0,0 @@
-{
-  "domain": "frient",
-  "name": "Frient",
-  "iot_standards": ["zigbee"]
-}

homeassistant/brands/third_reality.json

@@ -1,5 +1,5 @@
 {
   "domain": "third_reality",
   "name": "Third Reality",
-  "iot_standards": ["matter", "zigbee"]
+  "iot_standards": ["zigbee"]
 }

homeassistant/brands/ubiquiti.json

@@ -1,5 +1,5 @@
 {
   "domain": "ubiquiti",
   "name": "Ubiquiti",
-  "integrations": ["airos", "unifi", "unifi_direct", "unifiled", "unifiprotect"]
+  "integrations": ["unifi", "unifi_direct", "unifiled", "unifiprotect"]
 }

homeassistant/components/airos/__init__.py

@@ -1,42 +0,0 @@
-"""The Ubiquiti airOS integration."""
-
-from __future__ import annotations
-
-from airos.airos8 import AirOS
-
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator
-
-_PLATFORMS: list[Platform] = [Platform.SENSOR]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
-    """Set up Ubiquiti airOS from a config entry."""
-
-    # By default airOS 8 comes with self-signed SSL certificates,
-    # with no option in the web UI to change or upload a custom certificate.
-    session = async_get_clientsession(hass, verify_ssl=False)
-
-    airos_device = AirOS(
-        host=entry.data[CONF_HOST],
-        username=entry.data[CONF_USERNAME],
-        password=entry.data[CONF_PASSWORD],
-        session=session,
-    )
-
-    coordinator = AirOSDataUpdateCoordinator(hass, entry, airos_device)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)

homeassistant/components/airos/config_flow.py

@@ -1,82 +0,0 @@
-"""Config flow for the Ubiquiti airOS integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
-    KeyDataMissingError,
-)
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import DOMAIN
-from .coordinator import AirOS
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_USERNAME, default="ubnt"): str,
-        vol.Required(CONF_PASSWORD): str,
-    }
-)
-
-
-class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Ubiquiti airOS."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self,
-        user_input: dict[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            # By default airOS 8 comes with self-signed SSL certificates,
-            # with no option in the web UI to change or upload a custom certificate.
-            session = async_get_clientsession(self.hass, verify_ssl=False)
-
-            airos_device = AirOS(
-                host=user_input[CONF_HOST],
-                username=user_input[CONF_USERNAME],
-                password=user_input[CONF_PASSWORD],
-                session=session,
-            )
-            try:
-                await airos_device.login()
-                airos_data = await airos_device.status()
-
-            except (
-                ConnectionSetupError,
-                DeviceConnectionError,
-            ):
-                errors["base"] = "cannot_connect"
-            except (ConnectionAuthenticationError, DataMissingError):
-                errors["base"] = "invalid_auth"
-            except KeyDataMissingError:
-                errors["base"] = "key_data_missing"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                await self.async_set_unique_id(airos_data.derived.mac)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(
-                    title=airos_data.host.hostname, data=user_input
-                )
-
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
-        )

homeassistant/components/airos/const.py

@@ -1,9 +0,0 @@
-"""Constants for the Ubiquiti airOS integration."""
-
-from datetime import timedelta
-
-DOMAIN = "airos"
-
-SCAN_INTERVAL = timedelta(minutes=1)
-
-MANUFACTURER = "Ubiquiti"

homeassistant/components/airos/coordinator.py

@@ -1,66 +0,0 @@
-"""DataUpdateCoordinator for AirOS."""
-
-from __future__ import annotations
-
-import logging
-
-from airos.airos8 import AirOS, AirOSData
-from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, SCAN_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]
-
-
-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
-    """Class to manage fetching AirOS data from single endpoint."""
-
-    config_entry: AirOSConfigEntry
-
-    def __init__(
-        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS
-    ) -> None:
-        """Initialize the coordinator."""
-        self.airos_device = airos_device
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-
-    async def _async_update_data(self) -> AirOSData:
-        """Fetch data from AirOS."""
-        try:
-            await self.airos_device.login()
-            return await self.airos_device.status()
-        except (ConnectionAuthenticationError,) as err:
-            _LOGGER.exception("Error authenticating with airOS device")
-            raise ConfigEntryError(
-                translation_domain=DOMAIN, translation_key="invalid_auth"
-            ) from err
-        except (ConnectionSetupError, DeviceConnectionError, TimeoutError) as err:
-            _LOGGER.error("Error connecting to airOS device: %s", err)
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect",
-            ) from err
-        except (DataMissingError,) as err:
-            _LOGGER.error("Expected data not returned by airOS device: %s", err)
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="error_data_missing",
-            ) from err

homeassistant/components/airos/entity.py

@@ -1,36 +0,0 @@
-"""Generic AirOS Entity Class."""
-
-from __future__ import annotations
-
-from homeassistant.const import CONF_HOST
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN, MANUFACTURER
-from .coordinator import AirOSDataUpdateCoordinator
-
-
-class AirOSEntity(CoordinatorEntity[AirOSDataUpdateCoordinator]):
-    """Represent a AirOS Entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: AirOSDataUpdateCoordinator) -> None:
-        """Initialise the gateway."""
-        super().__init__(coordinator)
-
-        airos_data = self.coordinator.data
-
-        configuration_url: str | None = (
-            f"https://{coordinator.config_entry.data[CONF_HOST]}"
-        )
-
-        self._attr_device_info = DeviceInfo(
-            connections={(CONNECTION_NETWORK_MAC, airos_data.derived.mac)},
-            configuration_url=configuration_url,
-            identifiers={(DOMAIN, str(airos_data.host.device_id))},
-            manufacturer=MANUFACTURER,
-            model=airos_data.host.devmodel,
-            name=airos_data.host.hostname,
-            sw_version=airos_data.host.fwversion,
-        )

homeassistant/components/airos/manifest.json

@@ -1,10 +0,0 @@
-{
-  "domain": "airos",
-  "name": "Ubiquiti airOS",
-  "codeowners": ["@CoMPaTech"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/airos",
-  "iot_class": "local_polling",
-  "quality_scale": "bronze",
-  "requirements": ["airos==0.2.1"]
-}

homeassistant/components/airos/quality_scale.yaml

@@ -1,72 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: airOS does not have actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: airOS does not have actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: local_polling without events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: airOS does not have actions
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: todo
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: todo
-  reauthentication-flow: todo
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info: todo
-  discovery: todo
-  docs-data-update: done
-  docs-examples: todo
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: todo
-  docs-troubleshooting: done
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: todo
-    comment: prepared binary_sensors will provide this
-  entity-translations: done
-  exception-translations: done
-  icon-translations:
-    status: exempt
-    comment: no (custom) icons used or envisioned
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: done

homeassistant/components/airos/sensor.py

@@ -1,152 +0,0 @@
-"""AirOS Sensor component for Home Assistant."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-
-from airos.data import NetRole, WirelessMode
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    PERCENTAGE,
-    SIGNAL_STRENGTH_DECIBELS,
-    UnitOfDataRate,
-    UnitOfFrequency,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType
-
-from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
-from .entity import AirOSEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-WIRELESS_MODE_OPTIONS = [mode.value.replace("-", "_").lower() for mode in WirelessMode]
-NETROLE_OPTIONS = [mode.value for mode in NetRole]
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirOSSensorEntityDescription(SensorEntityDescription):
-    """Describe an AirOS sensor."""
-
-    value_fn: Callable[[AirOSData], StateType]
-
-
-SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
-    AirOSSensorEntityDescription(
-        key="host_cpuload",
-        translation_key="host_cpuload",
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.host.cpuload,
-        entity_registry_enabled_default=False,
-    ),
-    AirOSSensorEntityDescription(
-        key="host_netrole",
-        translation_key="host_netrole",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: data.host.netrole.value,
-        options=NETROLE_OPTIONS,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_frequency",
-        translation_key="wireless_frequency",
-        native_unit_of_measurement=UnitOfFrequency.MEGAHERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.frequency,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_essid",
-        translation_key="wireless_essid",
-        value_fn=lambda data: data.wireless.essid,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_mode",
-        translation_key="wireless_mode",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: data.wireless.mode.value.replace("-", "_").lower(),
-        options=WIRELESS_MODE_OPTIONS,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_antenna_gain",
-        translation_key="wireless_antenna_gain",
-        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.antenna_gain,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_tx",
-        translation_key="wireless_throughput_tx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.throughput.tx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_rx",
-        translation_key="wireless_throughput_rx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.throughput.rx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_dl_capacity",
-        translation_key="wireless_polling_dl_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.polling.dl_capacity,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_ul_capacity",
-        translation_key="wireless_polling_ul_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.polling.ul_capacity,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirOSConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the AirOS sensors from a config entry."""
-    coordinator = config_entry.runtime_data
-
-    async_add_entities(AirOSSensor(coordinator, description) for description in SENSORS)
-
-
-class AirOSSensor(AirOSEntity, SensorEntity):
-    """Representation of a Sensor."""
-
-    entity_description: AirOSSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirOSDataUpdateCoordinator,
-        description: AirOSSensorEntityDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.derived.mac}_{description.key}"
-
-    @property
-    def native_value(self) -> StateType:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/airos/strings.json

@@ -1,87 +0,0 @@
-{
-  "config": {
-    "flow_title": "Ubiquiti airOS device",
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "host": "IP address or hostname of the airOS device",
-          "username": "Administrator username for the airOS device, normally 'ubnt'",
-          "password": "Password configured through the UISP app or web interface"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "entity": {
-    "sensor": {
-      "host_cpuload": {
-        "name": "CPU load"
-      },
-      "host_netrole": {
-        "name": "Network role",
-        "state": {
-          "bridge": "Bridge",
-          "router": "Router"
-        }
-      },
-      "wireless_frequency": {
-        "name": "Wireless frequency"
-      },
-      "wireless_essid": {
-        "name": "Wireless SSID"
-      },
-      "wireless_mode": {
-        "name": "Wireless mode",
-        "state": {
-          "ap_ptp": "Access point",
-          "sta_ptp": "Station"
-        }
-      },
-      "wireless_antenna_gain": {
-        "name": "Antenna gain"
-      },
-      "wireless_throughput_tx": {
-        "name": "Throughput transmit (actual)"
-      },
-      "wireless_throughput_rx": {
-        "name": "Throughput receive (actual)"
-      },
-      "wireless_polling_dl_capacity": {
-        "name": "Download capacity"
-      },
-      "wireless_polling_ul_capacity": {
-        "name": "Upload capacity"
-      },
-      "wireless_remote_hostname": {
-        "name": "Remote hostname"
-      }
-    }
-  },
-  "exceptions": {
-    "invalid_auth": {
-      "message": "[%key:common::config_flow::error::invalid_auth%]"
-    },
-    "cannot_connect": {
-      "message": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "key_data_missing": {
-      "message": "Key data not returned from device"
-    },
-    "error_data_missing": {
-      "message": "Data incomplete or missing"
-    }
-  }
-}

homeassistant/components/airzone_cloud/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.7.1"]
+  "requirements": ["aioairzone-cloud==0.7.0"]
 }

homeassistant/components/alexa_devices/__init__.py

@@ -2,12 +2,8 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, config_validation as cv
-from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
 from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
-from .services import async_setup_services
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -16,20 +12,11 @@ PLATFORMS = [
     Platform.SWITCH,
 ]
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Alexa Devices component."""
-    async_setup_services(hass)
-    return True
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
     """Set up Alexa Devices platform."""
 
-    session = aiohttp_client.async_create_clientsession(hass)
+    coordinator = AmazonDevicesCoordinator(hass, entry)
-    coordinator = AmazonDevicesCoordinator(hass, entry, session)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -42,4 +29,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
 
 async def async_unload_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    coordinator = entry.runtime_data
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        await coordinator.api.close()
+
+    return unload_ok

homeassistant/components/alexa_devices/config_flow.py

@@ -17,7 +17,6 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import CountrySelector
 
@@ -34,15 +33,18 @@ STEP_REAUTH_DATA_SCHEMA = vol.Schema(
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
     """Validate the user input allows us to connect."""
 
-    session = aiohttp_client.async_create_clientsession(hass)
     api = AmazonEchoApi(
-        session,
         data[CONF_COUNTRY],
         data[CONF_USERNAME],
         data[CONF_PASSWORD],
     )
 
-    return await api.login_mode_interactive(data[CONF_CODE])
+    try:
+        data = await api.login_mode_interactive(data[CONF_CODE])
+    finally:
+        await api.close()
+
+    return data
 
 
 class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):

homeassistant/components/alexa_devices/coordinator.py

@@ -8,7 +8,6 @@ from aioamazondevices.exceptions import (
     CannotConnect,
     CannotRetrieveData,
 )
-from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
@@ -32,7 +31,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
         self,
         hass: HomeAssistant,
         entry: AmazonConfigEntry,
-        session: ClientSession,
     ) -> None:
         """Initialize the scanner."""
         super().__init__(
@@ -43,7 +41,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
         self.api = AmazonEchoApi(
-            session,
             entry.data[CONF_COUNTRY],
             entry.data[CONF_USERNAME],
             entry.data[CONF_PASSWORD],

homeassistant/components/alexa_devices/icons.json

@@ -38,13 +38,5 @@
         }
       }
     }
-  },
-  "services": {
-    "send_sound": {
-      "service": "mdi:cast-audio"
-    },
-    "send_text_command": {
-      "service": "mdi:microphone-message"
-    }
   }
 }

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "silver",
-  "requirements": ["aioamazondevices==4.0.0"]
+  "requirements": ["aioamazondevices==3.5.1"]
 }

homeassistant/components/alexa_devices/quality_scale.yaml

@@ -48,17 +48,17 @@ rules:
     comment: There are a ton of mac address ranges in use, but also by kindles which are not supported by this integration
   docs-data-update: done
   docs-examples: done
-  docs-known-limitations: done
+  docs-known-limitations: todo
   docs-supported-devices: done
   docs-supported-functions: done
-  docs-troubleshooting: done
+  docs-troubleshooting: todo
   docs-use-cases: done
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: done
+  exception-translations: todo
   icon-translations: done
   reconfiguration-flow: todo
   repair-issues:
@@ -70,5 +70,5 @@ rules:
 
   # Platinum
   async-dependency: done
-  inject-websession: done
+  inject-websession: todo
   strict-typing: done

homeassistant/components/alexa_devices/services.py

@@ -1,121 +0,0 @@
-"""Support for services."""
-
-from aioamazondevices.sounds import SOUNDS_LIST
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_DEVICE_ID
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import config_validation as cv, device_registry as dr
-
-from .const import DOMAIN
-from .coordinator import AmazonConfigEntry
-
-ATTR_TEXT_COMMAND = "text_command"
-ATTR_SOUND = "sound"
-ATTR_SOUND_VARIANT = "sound_variant"
-SERVICE_TEXT_COMMAND = "send_text_command"
-SERVICE_SOUND_NOTIFICATION = "send_sound"
-
-SCHEMA_SOUND_SERVICE = vol.Schema(
-    {
-        vol.Required(ATTR_SOUND): cv.string,
-        vol.Required(ATTR_SOUND_VARIANT): cv.positive_int,
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-    },
-)
-SCHEMA_CUSTOM_COMMAND = vol.Schema(
-    {
-        vol.Required(ATTR_TEXT_COMMAND): cv.string,
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-    }
-)
-
-
-@callback
-def async_get_entry_id_for_service_call(
-    call: ServiceCall,
-) -> tuple[dr.DeviceEntry, AmazonConfigEntry]:
-    """Get the entry ID related to a service call (by device ID)."""
-    device_registry = dr.async_get(call.hass)
-    device_id = call.data[ATTR_DEVICE_ID]
-    if (device_entry := device_registry.async_get(device_id)) is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_device_id",
-            translation_placeholders={"device_id": device_id},
-        )
-
-    for entry_id in device_entry.config_entries:
-        if (entry := call.hass.config_entries.async_get_entry(entry_id)) is None:
-            continue
-        if entry.domain == DOMAIN:
-            if entry.state is not ConfigEntryState.LOADED:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="entry_not_loaded",
-                    translation_placeholders={"entry": entry.title},
-                )
-            return (device_entry, entry)
-
-    raise ServiceValidationError(
-        translation_domain=DOMAIN,
-        translation_key="config_entry_not_found",
-        translation_placeholders={"device_id": device_id},
-    )
-
-
-async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
-    """Execute action on the device."""
-    device, config_entry = async_get_entry_id_for_service_call(call)
-    assert device.serial_number
-    value: str = call.data[attribute]
-
-    coordinator = config_entry.runtime_data
-
-    if attribute == ATTR_SOUND:
-        variant: int = call.data[ATTR_SOUND_VARIANT]
-        pad = "_" if variant > 10 else "_0"
-        file = f"{value}{pad}{variant!s}"
-        if value not in SOUNDS_LIST or variant > SOUNDS_LIST[value]:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_sound_value",
-                translation_placeholders={"sound": value, "variant": str(variant)},
-            )
-        await coordinator.api.call_alexa_sound(
-            coordinator.data[device.serial_number], file
-        )
-    elif attribute == ATTR_TEXT_COMMAND:
-        await coordinator.api.call_alexa_text_command(
-            coordinator.data[device.serial_number], value
-        )
-
-
-async def async_send_sound_notification(call: ServiceCall) -> None:
-    """Send a sound notification to a AmazonDevice."""
-    await _async_execute_action(call, ATTR_SOUND)
-
-
-async def async_send_text_command(call: ServiceCall) -> None:
-    """Send a custom command to a AmazonDevice."""
-    await _async_execute_action(call, ATTR_TEXT_COMMAND)
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up the services for the Amazon Devices integration."""
-    for service_name, method, schema in (
-        (
-            SERVICE_SOUND_NOTIFICATION,
-            async_send_sound_notification,
-            SCHEMA_SOUND_SERVICE,
-        ),
-        (
-            SERVICE_TEXT_COMMAND,
-            async_send_text_command,
-            SCHEMA_CUSTOM_COMMAND,
-        ),
-    ):
-        hass.services.async_register(DOMAIN, service_name, method, schema=schema)

homeassistant/components/alexa_devices/services.yaml

@@ -1,504 +0,0 @@
-send_text_command:
-  fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: alexa_devices
-    text_command:
-      required: true
-      example: "Play B.B.C. on TuneIn"
-      selector:
-        text:
-
-send_sound:
-  fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: alexa_devices
-    sound_variant:
-      required: true
-      example: 1
-      default: 1
-      selector:
-        number:
-          min: 1
-          max: 50
-    sound:
-      required: true
-      example: amzn_sfx_doorbell_chime
-      default: amzn_sfx_doorbell_chime
-      selector:
-        select:
-          options:
-            - air_horn
-            - air_horns
-            - airboat
-            - airport
-            - aliens
-            - amzn_sfx_airplane_takeoff_whoosh
-            - amzn_sfx_army_march_clank_7x
-            - amzn_sfx_army_march_large_8x
-            - amzn_sfx_army_march_small_8x
-            - amzn_sfx_baby_big_cry
-            - amzn_sfx_baby_cry
-            - amzn_sfx_baby_fuss
-            - amzn_sfx_battle_group_clanks
-            - amzn_sfx_battle_man_grunts
-            - amzn_sfx_battle_men_grunts
-            - amzn_sfx_battle_men_horses
-            - amzn_sfx_battle_noisy_clanks
-            - amzn_sfx_battle_yells_men
-            - amzn_sfx_battle_yells_men_run
-            - amzn_sfx_bear_groan_roar
-            - amzn_sfx_bear_roar_grumble
-            - amzn_sfx_bear_roar_small
-            - amzn_sfx_beep_1x
-            - amzn_sfx_bell_med_chime
-            - amzn_sfx_bell_short_chime
-            - amzn_sfx_bell_timer
-            - amzn_sfx_bicycle_bell_ring
-            - amzn_sfx_bird_chickadee_chirp_1x
-            - amzn_sfx_bird_chickadee_chirps
-            - amzn_sfx_bird_forest
-            - amzn_sfx_bird_forest_short
-            - amzn_sfx_bird_robin_chirp_1x
-            - amzn_sfx_boing_long_1x
-            - amzn_sfx_boing_med_1x
-            - amzn_sfx_boing_short_1x
-            - amzn_sfx_bus_drive_past
-            - amzn_sfx_buzz_electronic
-            - amzn_sfx_buzzer_loud_alarm
-            - amzn_sfx_buzzer_small
-            - amzn_sfx_car_accelerate
-            - amzn_sfx_car_accelerate_noisy
-            - amzn_sfx_car_click_seatbelt
-            - amzn_sfx_car_close_door_1x
-            - amzn_sfx_car_drive_past
-            - amzn_sfx_car_honk_1x
-            - amzn_sfx_car_honk_2x
-            - amzn_sfx_car_honk_3x
-            - amzn_sfx_car_honk_long_1x
-            - amzn_sfx_car_into_driveway
-            - amzn_sfx_car_into_driveway_fast
-            - amzn_sfx_car_slam_door_1x
-            - amzn_sfx_car_undo_seatbelt
-            - amzn_sfx_cat_angry_meow_1x
-            - amzn_sfx_cat_angry_screech_1x
-            - amzn_sfx_cat_long_meow_1x
-            - amzn_sfx_cat_meow_1x
-            - amzn_sfx_cat_purr
-            - amzn_sfx_cat_purr_meow
-            - amzn_sfx_chicken_cluck
-            - amzn_sfx_church_bell_1x
-            - amzn_sfx_church_bells_ringing
-            - amzn_sfx_clear_throat_ahem
-            - amzn_sfx_clock_ticking
-            - amzn_sfx_clock_ticking_long
-            - amzn_sfx_copy_machine
-            - amzn_sfx_cough
-            - amzn_sfx_crow_caw_1x
-            - amzn_sfx_crowd_applause
-            - amzn_sfx_crowd_bar
-            - amzn_sfx_crowd_bar_rowdy
-            - amzn_sfx_crowd_boo
-            - amzn_sfx_crowd_cheer_med
-            - amzn_sfx_crowd_excited_cheer
-            - amzn_sfx_dog_med_bark_1x
-            - amzn_sfx_dog_med_bark_2x
-            - amzn_sfx_dog_med_bark_growl
-            - amzn_sfx_dog_med_growl_1x
-            - amzn_sfx_dog_med_woof_1x
-            - amzn_sfx_dog_small_bark_2x
-            - amzn_sfx_door_open
-            - amzn_sfx_door_shut
-            - amzn_sfx_doorbell
-            - amzn_sfx_doorbell_buzz
-            - amzn_sfx_doorbell_chime
-            - amzn_sfx_drinking_slurp
-            - amzn_sfx_drum_and_cymbal
-            - amzn_sfx_drum_comedy
-            - amzn_sfx_earthquake_rumble
-            - amzn_sfx_electric_guitar
-            - amzn_sfx_electronic_beep
-            - amzn_sfx_electronic_major_chord
-            - amzn_sfx_elephant
-            - amzn_sfx_elevator_bell_1x
-            - amzn_sfx_elevator_open_bell
-            - amzn_sfx_fairy_melodic_chimes
-            - amzn_sfx_fairy_sparkle_chimes
-            - amzn_sfx_faucet_drip
-            - amzn_sfx_faucet_running
-            - amzn_sfx_fireplace_crackle
-            - amzn_sfx_fireworks
-            - amzn_sfx_fireworks_firecrackers
-            - amzn_sfx_fireworks_launch
-            - amzn_sfx_fireworks_whistles
-            - amzn_sfx_food_frying
-            - amzn_sfx_footsteps
-            - amzn_sfx_footsteps_muffled
-            - amzn_sfx_ghost_spooky
-            - amzn_sfx_glass_on_table
-            - amzn_sfx_glasses_clink
-            - amzn_sfx_horse_gallop_4x
-            - amzn_sfx_horse_huff_whinny
-            - amzn_sfx_horse_neigh
-            - amzn_sfx_horse_neigh_low
-            - amzn_sfx_horse_whinny
-            - amzn_sfx_human_walking
-            - amzn_sfx_jar_on_table_1x
-            - amzn_sfx_kitchen_ambience
-            - amzn_sfx_large_crowd_cheer
-            - amzn_sfx_large_fire_crackling
-            - amzn_sfx_laughter
-            - amzn_sfx_laughter_giggle
-            - amzn_sfx_lightning_strike
-            - amzn_sfx_lion_roar
-            - amzn_sfx_magic_blast_1x
-            - amzn_sfx_monkey_calls_3x
-            - amzn_sfx_monkey_chimp
-            - amzn_sfx_monkeys_chatter
-            - amzn_sfx_motorcycle_accelerate
-            - amzn_sfx_motorcycle_engine_idle
-            - amzn_sfx_motorcycle_engine_rev
-            - amzn_sfx_musical_drone_intro
-            - amzn_sfx_oars_splashing_rowboat
-            - amzn_sfx_object_on_table_2x
-            - amzn_sfx_ocean_wave_1x
-            - amzn_sfx_ocean_wave_on_rocks_1x
-            - amzn_sfx_ocean_wave_surf
-            - amzn_sfx_people_walking
-            - amzn_sfx_person_running
-            - amzn_sfx_piano_note_1x
-            - amzn_sfx_punch
-            - amzn_sfx_rain
-            - amzn_sfx_rain_on_roof
-            - amzn_sfx_rain_thunder
-            - amzn_sfx_rat_squeak_2x
-            - amzn_sfx_rat_squeaks
-            - amzn_sfx_raven_caw_1x
-            - amzn_sfx_raven_caw_2x
-            - amzn_sfx_restaurant_ambience
-            - amzn_sfx_rooster_crow
-            - amzn_sfx_scifi_air_escaping
-            - amzn_sfx_scifi_alarm
-            - amzn_sfx_scifi_alien_voice
-            - amzn_sfx_scifi_boots_walking
-            - amzn_sfx_scifi_close_large_explosion
-            - amzn_sfx_scifi_door_open
-            - amzn_sfx_scifi_engines_on
-            - amzn_sfx_scifi_engines_on_large
-            - amzn_sfx_scifi_engines_on_short_burst
-            - amzn_sfx_scifi_explosion
-            - amzn_sfx_scifi_explosion_2x
-            - amzn_sfx_scifi_incoming_explosion
-            - amzn_sfx_scifi_laser_gun_battle
-            - amzn_sfx_scifi_laser_gun_fires
-            - amzn_sfx_scifi_laser_gun_fires_large
-            - amzn_sfx_scifi_long_explosion_1x
-            - amzn_sfx_scifi_missile
-            - amzn_sfx_scifi_motor_short_1x
-            - amzn_sfx_scifi_open_airlock
-            - amzn_sfx_scifi_radar_high_ping
-            - amzn_sfx_scifi_radar_low
-            - amzn_sfx_scifi_radar_medium
-            - amzn_sfx_scifi_run_away
-            - amzn_sfx_scifi_sheilds_up
-            - amzn_sfx_scifi_short_low_explosion
-            - amzn_sfx_scifi_small_whoosh_flyby
-            - amzn_sfx_scifi_small_zoom_flyby
-            - amzn_sfx_scifi_sonar_ping_3x
-            - amzn_sfx_scifi_sonar_ping_4x
-            - amzn_sfx_scifi_spaceship_flyby
-            - amzn_sfx_scifi_timer_beep
-            - amzn_sfx_scifi_zap_backwards
-            - amzn_sfx_scifi_zap_electric
-            - amzn_sfx_sheep_baa
-            - amzn_sfx_sheep_bleat
-            - amzn_sfx_silverware_clank
-            - amzn_sfx_sirens
-            - amzn_sfx_sleigh_bells
-            - amzn_sfx_small_stream
-            - amzn_sfx_sneeze
-            - amzn_sfx_stream
-            - amzn_sfx_strong_wind_desert
-            - amzn_sfx_strong_wind_whistling
-            - amzn_sfx_subway_leaving
-            - amzn_sfx_subway_passing
-            - amzn_sfx_subway_stopping
-            - amzn_sfx_swoosh_cartoon_fast
-            - amzn_sfx_swoosh_fast_1x
-            - amzn_sfx_swoosh_fast_6x
-            - amzn_sfx_test_tone
-            - amzn_sfx_thunder_rumble
-            - amzn_sfx_toilet_flush
-            - amzn_sfx_trumpet_bugle
-            - amzn_sfx_turkey_gobbling
-            - amzn_sfx_typing_medium
-            - amzn_sfx_typing_short
-            - amzn_sfx_typing_typewriter
-            - amzn_sfx_vacuum_off
-            - amzn_sfx_vacuum_on
-            - amzn_sfx_walking_in_mud
-            - amzn_sfx_walking_in_snow
-            - amzn_sfx_walking_on_grass
-            - amzn_sfx_water_dripping
-            - amzn_sfx_water_droplets
-            - amzn_sfx_wind_strong_gusting
-            - amzn_sfx_wind_whistling_desert
-            - amzn_sfx_wings_flap_4x
-            - amzn_sfx_wings_flap_fast
-            - amzn_sfx_wolf_howl
-            - amzn_sfx_wolf_young_howl
-            - amzn_sfx_wooden_door
-            - amzn_sfx_wooden_door_creaks_long
-            - amzn_sfx_wooden_door_creaks_multiple
-            - amzn_sfx_wooden_door_creaks_open
-            - amzn_ui_sfx_gameshow_bridge
-            - amzn_ui_sfx_gameshow_countdown_loop_32s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_minimal
-            - amzn_ui_sfx_gameshow_intro
-            - amzn_ui_sfx_gameshow_negative_response
-            - amzn_ui_sfx_gameshow_neutral_response
-            - amzn_ui_sfx_gameshow_outro
-            - amzn_ui_sfx_gameshow_player1
-            - amzn_ui_sfx_gameshow_player2
-            - amzn_ui_sfx_gameshow_player3
-            - amzn_ui_sfx_gameshow_player4
-            - amzn_ui_sfx_gameshow_positive_response
-            - amzn_ui_sfx_gameshow_tally_negative
-            - amzn_ui_sfx_gameshow_tally_positive
-            - amzn_ui_sfx_gameshow_waiting_loop_30s
-            - anchor
-            - answering_machines
-            - arcs_sparks
-            - arrows_bows
-            - baby
-            - back_up_beeps
-            - bars_restaurants
-            - baseball
-            - basketball
-            - battles
-            - beeps_tones
-            - bell
-            - bikes
-            - billiards
-            - board_games
-            - body
-            - boing
-            - books
-            - bow_wash
-            - box
-            - break_shatter_smash
-            - breaks
-            - brooms_mops
-            - bullets
-            - buses
-            - buzz
-            - buzz_hums
-            - buzzers
-            - buzzers_pistols
-            - cables_metal
-            - camera
-            - cannons
-            - car_alarm
-            - car_alarms
-            - car_cell_phones
-            - carnivals_fairs
-            - cars
-            - casino
-            - casinos
-            - cellar
-            - chimes
-            - chimes_bells
-            - chorus
-            - christmas
-            - church_bells
-            - clock
-            - cloth
-            - concrete
-            - construction
-            - construction_factory
-            - crashes
-            - crowds
-            - debris
-            - dining_kitchens
-            - dinosaurs
-            - dripping
-            - drops
-            - electric
-            - electrical
-            - elevator
-            - evolution_monsters
-            - explosions
-            - factory
-            - falls
-            - fax_scanner_copier
-            - feedback_mics
-            - fight
-            - fire
-            - fire_extinguisher
-            - fireballs
-            - fireworks
-            - fishing_pole
-            - flags
-            - football
-            - footsteps
-            - futuristic
-            - futuristic_ship
-            - gameshow
-            - gear
-            - ghosts_demons
-            - giant_monster
-            - glass
-            - glasses_clink
-            - golf
-            - gorilla
-            - grenade_lanucher
-            - griffen
-            - gyms_locker_rooms
-            - handgun_loading
-            - handgun_shot
-            - handle
-            - hands
-            - heartbeats_ekg
-            - helicopter
-            - high_tech
-            - hit_punch_slap
-            - hits
-            - horns
-            - horror
-            - hot_tub_filling_up
-            - human
-            - human_vocals
-            - hygene # codespell:ignore
-            - ice_skating
-            - ignitions
-            - infantry
-            - intro
-            - jet
-            - juggling
-            - key_lock
-            - kids
-            - knocks
-            - lab_equip
-            - lacrosse
-            - lamps_lanterns
-            - leather
-            - liquid_suction
-            - locker_doors
-            - machine_gun
-            - magic_spells
-            - medium_large_explosions
-            - metal
-            - modern_rings
-            - money_coins
-            - motorcycles
-            - movement
-            - moves
-            - nature
-            - oar_boat
-            - pagers
-            - paintball
-            - paper
-            - parachute
-            - pay_phones
-            - phone_beeps
-            - pigmy_bats
-            - pills
-            - pour_water
-            - power_up_down
-            - printers
-            - prison
-            - public_space
-            - racquetball
-            - radios_static
-            - rain
-            - rc_airplane
-            - rc_car
-            - refrigerators_freezers
-            - regular
-            - respirator
-            - rifle
-            - roller_coaster
-            - rollerskates_rollerblades
-            - room_tones
-            - ropes_climbing
-            - rotary_rings
-            - rowboat_canoe
-            - rubber
-            - running
-            - sails
-            - sand_gravel
-            - screen_doors
-            - screens
-            - seats_stools
-            - servos
-            - shoes_boots
-            - shotgun
-            - shower
-            - sink_faucet
-            - sink_filling_water
-            - sink_run_and_off
-            - sink_water_splatter
-            - sirens
-            - skateboards
-            - ski
-            - skids_tires
-            - sled
-            - slides
-            - small_explosions
-            - snow
-            - snowmobile
-            - soldiers
-            - splash_water
-            - splashes_sprays
-            - sports_whistles
-            - squeaks
-            - squeaky
-            - stairs
-            - steam
-            - submarine_diesel
-            - swing_doors
-            - switches_levers
-            - swords
-            - tape
-            - tape_machine
-            - televisions_shows
-            - tennis_pingpong
-            - textile
-            - throw
-            - thunder
-            - ticks
-            - timer
-            - toilet_flush
-            - tone
-            - tones_noises
-            - toys
-            - tractors
-            - traffic
-            - train
-            - trucks_vans
-            - turnstiles
-            - typing
-            - umbrella
-            - underwater
-            - vampires
-            - various
-            - video_tunes
-            - volcano_earthquake
-            - watches
-            - water
-            - water_running
-            - werewolves
-            - winches_gears
-            - wind
-            - wood
-            - wood_boat
-            - woosh
-            - zap
-            - zippers
-          translation_key: sound

homeassistant/components/alexa_devices/strings.json

@@ -4,8 +4,7 @@
     "data_description_country": "The country where your Amazon account is registered.",
     "data_description_username": "The email address of your Amazon account.",
     "data_description_password": "The password of your Amazon account.",
-    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
+    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported."
-    "device_id_description": "The ID of the device to send the command to."
   },
   "config": {
     "flow_title": "{username}",
@@ -85,532 +84,12 @@
       }
     }
   },
-  "services": {
-    "send_sound": {
-      "name": "Send sound",
-      "description": "Sends a sound to a device",
-      "fields": {
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        },
-        "sound": {
-          "name": "Alexa Skill sound file",
-          "description": "The sound file to play."
-        },
-        "sound_variant": {
-          "name": "Sound variant",
-          "description": "The variant of the sound to play."
-        }
-      }
-    },
-    "send_text_command": {
-      "name": "Send text command",
-      "description": "Sends a text command to a device",
-      "fields": {
-        "text_command": {
-          "name": "Alexa text command",
-          "description": "The text command to send."
-        },
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        }
-      }
-    }
-  },
-  "selector": {
-    "sound": {
-      "options": {
-        "air_horn": "Air Horn",
-        "air_horns": "Air Horns",
-        "airboat": "Airboat",
-        "airport": "Airport",
-        "aliens": "Aliens",
-        "amzn_sfx_airplane_takeoff_whoosh": "Airplane Takeoff Whoosh",
-        "amzn_sfx_army_march_clank_7x": "Army March Clank 7x",
-        "amzn_sfx_army_march_large_8x": "Army March Large 8x",
-        "amzn_sfx_army_march_small_8x": "Army March Small 8x",
-        "amzn_sfx_baby_big_cry": "Baby Big Cry",
-        "amzn_sfx_baby_cry": "Baby Cry",
-        "amzn_sfx_baby_fuss": "Baby Fuss",
-        "amzn_sfx_battle_group_clanks": "Battle Group Clanks",
-        "amzn_sfx_battle_man_grunts": "Battle Man Grunts",
-        "amzn_sfx_battle_men_grunts": "Battle Men Grunts",
-        "amzn_sfx_battle_men_horses": "Battle Men Horses",
-        "amzn_sfx_battle_noisy_clanks": "Battle Noisy Clanks",
-        "amzn_sfx_battle_yells_men": "Battle Yells Men",
-        "amzn_sfx_battle_yells_men_run": "Battle Yells Men Run",
-        "amzn_sfx_bear_groan_roar": "Bear Groan Roar",
-        "amzn_sfx_bear_roar_grumble": "Bear Roar Grumble",
-        "amzn_sfx_bear_roar_small": "Bear Roar Small",
-        "amzn_sfx_beep_1x": "Beep 1x",
-        "amzn_sfx_bell_med_chime": "Bell Med Chime",
-        "amzn_sfx_bell_short_chime": "Bell Short Chime",
-        "amzn_sfx_bell_timer": "Bell Timer",
-        "amzn_sfx_bicycle_bell_ring": "Bicycle Bell Ring",
-        "amzn_sfx_bird_chickadee_chirp_1x": "Bird Chickadee Chirp 1x",
-        "amzn_sfx_bird_chickadee_chirps": "Bird Chickadee Chirps",
-        "amzn_sfx_bird_forest": "Bird Forest",
-        "amzn_sfx_bird_forest_short": "Bird Forest Short",
-        "amzn_sfx_bird_robin_chirp_1x": "Bird Robin Chirp 1x",
-        "amzn_sfx_boing_long_1x": "Boing Long 1x",
-        "amzn_sfx_boing_med_1x": "Boing Med 1x",
-        "amzn_sfx_boing_short_1x": "Boing Short 1x",
-        "amzn_sfx_bus_drive_past": "Bus Drive Past",
-        "amzn_sfx_buzz_electronic": "Buzz Electronic",
-        "amzn_sfx_buzzer_loud_alarm": "Buzzer Loud Alarm",
-        "amzn_sfx_buzzer_small": "Buzzer Small",
-        "amzn_sfx_car_accelerate": "Car Accelerate",
-        "amzn_sfx_car_accelerate_noisy": "Car Accelerate Noisy",
-        "amzn_sfx_car_click_seatbelt": "Car Click Seatbelt",
-        "amzn_sfx_car_close_door_1x": "Car Close Door 1x",
-        "amzn_sfx_car_drive_past": "Car Drive Past",
-        "amzn_sfx_car_honk_1x": "Car Honk 1x",
-        "amzn_sfx_car_honk_2x": "Car Honk 2x",
-        "amzn_sfx_car_honk_3x": "Car Honk 3x",
-        "amzn_sfx_car_honk_long_1x": "Car Honk Long 1x",
-        "amzn_sfx_car_into_driveway": "Car Into Driveway",
-        "amzn_sfx_car_into_driveway_fast": "Car Into Driveway Fast",
-        "amzn_sfx_car_slam_door_1x": "Car Slam Door 1x",
-        "amzn_sfx_car_undo_seatbelt": "Car Undo Seatbelt",
-        "amzn_sfx_cat_angry_meow_1x": "Cat Angry Meow 1x",
-        "amzn_sfx_cat_angry_screech_1x": "Cat Angry Screech 1x",
-        "amzn_sfx_cat_long_meow_1x": "Cat Long Meow 1x",
-        "amzn_sfx_cat_meow_1x": "Cat Meow 1x",
-        "amzn_sfx_cat_purr": "Cat Purr",
-        "amzn_sfx_cat_purr_meow": "Cat Purr Meow",
-        "amzn_sfx_chicken_cluck": "Chicken Cluck",
-        "amzn_sfx_church_bell_1x": "Church Bell 1x",
-        "amzn_sfx_church_bells_ringing": "Church Bells Ringing",
-        "amzn_sfx_clear_throat_ahem": "Clear Throat Ahem",
-        "amzn_sfx_clock_ticking": "Clock Ticking",
-        "amzn_sfx_clock_ticking_long": "Clock Ticking Long",
-        "amzn_sfx_copy_machine": "Copy Machine",
-        "amzn_sfx_cough": "Cough",
-        "amzn_sfx_crow_caw_1x": "Crow Caw 1x",
-        "amzn_sfx_crowd_applause": "Crowd Applause",
-        "amzn_sfx_crowd_bar": "Crowd Bar",
-        "amzn_sfx_crowd_bar_rowdy": "Crowd Bar Rowdy",
-        "amzn_sfx_crowd_boo": "Crowd Boo",
-        "amzn_sfx_crowd_cheer_med": "Crowd Cheer Med",
-        "amzn_sfx_crowd_excited_cheer": "Crowd Excited Cheer",
-        "amzn_sfx_dog_med_bark_1x": "Dog Med Bark 1x",
-        "amzn_sfx_dog_med_bark_2x": "Dog Med Bark 2x",
-        "amzn_sfx_dog_med_bark_growl": "Dog Med Bark Growl",
-        "amzn_sfx_dog_med_growl_1x": "Dog Med Growl 1x",
-        "amzn_sfx_dog_med_woof_1x": "Dog Med Woof 1x",
-        "amzn_sfx_dog_small_bark_2x": "Dog Small Bark 2x",
-        "amzn_sfx_door_open": "Door Open",
-        "amzn_sfx_door_shut": "Door Shut",
-        "amzn_sfx_doorbell": "Doorbell",
-        "amzn_sfx_doorbell_buzz": "Doorbell Buzz",
-        "amzn_sfx_doorbell_chime": "Doorbell Chime",
-        "amzn_sfx_drinking_slurp": "Drinking Slurp",
-        "amzn_sfx_drum_and_cymbal": "Drum And Cymbal",
-        "amzn_sfx_drum_comedy": "Drum Comedy",
-        "amzn_sfx_earthquake_rumble": "Earthquake Rumble",
-        "amzn_sfx_electric_guitar": "Electric Guitar",
-        "amzn_sfx_electronic_beep": "Electronic Beep",
-        "amzn_sfx_electronic_major_chord": "Electronic Major Chord",
-        "amzn_sfx_elephant": "Elephant",
-        "amzn_sfx_elevator_bell_1x": "Elevator Bell 1x",
-        "amzn_sfx_elevator_open_bell": "Elevator Open Bell",
-        "amzn_sfx_fairy_melodic_chimes": "Fairy Melodic Chimes",
-        "amzn_sfx_fairy_sparkle_chimes": "Fairy Sparkle Chimes",
-        "amzn_sfx_faucet_drip": "Faucet Drip",
-        "amzn_sfx_faucet_running": "Faucet Running",
-        "amzn_sfx_fireplace_crackle": "Fireplace Crackle",
-        "amzn_sfx_fireworks": "Fireworks",
-        "amzn_sfx_fireworks_firecrackers": "Fireworks Firecrackers",
-        "amzn_sfx_fireworks_launch": "Fireworks Launch",
-        "amzn_sfx_fireworks_whistles": "Fireworks Whistles",
-        "amzn_sfx_food_frying": "Food Frying",
-        "amzn_sfx_footsteps": "Footsteps",
-        "amzn_sfx_footsteps_muffled": "Footsteps Muffled",
-        "amzn_sfx_ghost_spooky": "Ghost Spooky",
-        "amzn_sfx_glass_on_table": "Glass On Table",
-        "amzn_sfx_glasses_clink": "Glasses Clink",
-        "amzn_sfx_horse_gallop_4x": "Horse Gallop 4x",
-        "amzn_sfx_horse_huff_whinny": "Horse Huff Whinny",
-        "amzn_sfx_horse_neigh": "Horse Neigh",
-        "amzn_sfx_horse_neigh_low": "Horse Neigh Low",
-        "amzn_sfx_horse_whinny": "Horse Whinny",
-        "amzn_sfx_human_walking": "Human Walking",
-        "amzn_sfx_jar_on_table_1x": "Jar On Table 1x",
-        "amzn_sfx_kitchen_ambience": "Kitchen Ambience",
-        "amzn_sfx_large_crowd_cheer": "Large Crowd Cheer",
-        "amzn_sfx_large_fire_crackling": "Large Fire Crackling",
-        "amzn_sfx_laughter": "Laughter",
-        "amzn_sfx_laughter_giggle": "Laughter Giggle",
-        "amzn_sfx_lightning_strike": "Lightning Strike",
-        "amzn_sfx_lion_roar": "Lion Roar",
-        "amzn_sfx_magic_blast_1x": "Magic Blast 1x",
-        "amzn_sfx_monkey_calls_3x": "Monkey Calls 3x",
-        "amzn_sfx_monkey_chimp": "Monkey Chimp",
-        "amzn_sfx_monkeys_chatter": "Monkeys Chatter",
-        "amzn_sfx_motorcycle_accelerate": "Motorcycle Accelerate",
-        "amzn_sfx_motorcycle_engine_idle": "Motorcycle Engine Idle",
-        "amzn_sfx_motorcycle_engine_rev": "Motorcycle Engine Rev",
-        "amzn_sfx_musical_drone_intro": "Musical Drone Intro",
-        "amzn_sfx_oars_splashing_rowboat": "Oars Splashing Rowboat",
-        "amzn_sfx_object_on_table_2x": "Object On Table 2x",
-        "amzn_sfx_ocean_wave_1x": "Ocean Wave 1x",
-        "amzn_sfx_ocean_wave_on_rocks_1x": "Ocean Wave On Rocks 1x",
-        "amzn_sfx_ocean_wave_surf": "Ocean Wave Surf",
-        "amzn_sfx_people_walking": "People Walking",
-        "amzn_sfx_person_running": "Person Running",
-        "amzn_sfx_piano_note_1x": "Piano Note 1x",
-        "amzn_sfx_punch": "Punch",
-        "amzn_sfx_rain": "Rain",
-        "amzn_sfx_rain_on_roof": "Rain On Roof",
-        "amzn_sfx_rain_thunder": "Rain Thunder",
-        "amzn_sfx_rat_squeak_2x": "Rat Squeak 2x",
-        "amzn_sfx_rat_squeaks": "Rat Squeaks",
-        "amzn_sfx_raven_caw_1x": "Raven Caw 1x",
-        "amzn_sfx_raven_caw_2x": "Raven Caw 2x",
-        "amzn_sfx_restaurant_ambience": "Restaurant Ambience",
-        "amzn_sfx_rooster_crow": "Rooster Crow",
-        "amzn_sfx_scifi_air_escaping": "Scifi Air Escaping",
-        "amzn_sfx_scifi_alarm": "Scifi Alarm",
-        "amzn_sfx_scifi_alien_voice": "Scifi Alien Voice",
-        "amzn_sfx_scifi_boots_walking": "Scifi Boots Walking",
-        "amzn_sfx_scifi_close_large_explosion": "Scifi Close Large Explosion",
-        "amzn_sfx_scifi_door_open": "Scifi Door Open",
-        "amzn_sfx_scifi_engines_on": "Scifi Engines On",
-        "amzn_sfx_scifi_engines_on_large": "Scifi Engines On Large",
-        "amzn_sfx_scifi_engines_on_short_burst": "Scifi Engines On Short Burst",
-        "amzn_sfx_scifi_explosion": "Scifi Explosion",
-        "amzn_sfx_scifi_explosion_2x": "Scifi Explosion 2x",
-        "amzn_sfx_scifi_incoming_explosion": "Scifi Incoming Explosion",
-        "amzn_sfx_scifi_laser_gun_battle": "Scifi Laser Gun Battle",
-        "amzn_sfx_scifi_laser_gun_fires": "Scifi Laser Gun Fires",
-        "amzn_sfx_scifi_laser_gun_fires_large": "Scifi Laser Gun Fires Large",
-        "amzn_sfx_scifi_long_explosion_1x": "Scifi Long Explosion 1x",
-        "amzn_sfx_scifi_missile": "Scifi Missile",
-        "amzn_sfx_scifi_motor_short_1x": "Scifi Motor Short 1x",
-        "amzn_sfx_scifi_open_airlock": "Scifi Open Airlock",
-        "amzn_sfx_scifi_radar_high_ping": "Scifi Radar High Ping",
-        "amzn_sfx_scifi_radar_low": "Scifi Radar Low",
-        "amzn_sfx_scifi_radar_medium": "Scifi Radar Medium",
-        "amzn_sfx_scifi_run_away": "Scifi Run Away",
-        "amzn_sfx_scifi_sheilds_up": "Scifi Sheilds Up",
-        "amzn_sfx_scifi_short_low_explosion": "Scifi Short Low Explosion",
-        "amzn_sfx_scifi_small_whoosh_flyby": "Scifi Small Whoosh Flyby",
-        "amzn_sfx_scifi_small_zoom_flyby": "Scifi Small Zoom Flyby",
-        "amzn_sfx_scifi_sonar_ping_3x": "Scifi Sonar Ping 3x",
-        "amzn_sfx_scifi_sonar_ping_4x": "Scifi Sonar Ping 4x",
-        "amzn_sfx_scifi_spaceship_flyby": "Scifi Spaceship Flyby",
-        "amzn_sfx_scifi_timer_beep": "Scifi Timer Beep",
-        "amzn_sfx_scifi_zap_backwards": "Scifi Zap Backwards",
-        "amzn_sfx_scifi_zap_electric": "Scifi Zap Electric",
-        "amzn_sfx_sheep_baa": "Sheep Baa",
-        "amzn_sfx_sheep_bleat": "Sheep Bleat",
-        "amzn_sfx_silverware_clank": "Silverware Clank",
-        "amzn_sfx_sirens": "Sirens",
-        "amzn_sfx_sleigh_bells": "Sleigh Bells",
-        "amzn_sfx_small_stream": "Small Stream",
-        "amzn_sfx_sneeze": "Sneeze",
-        "amzn_sfx_stream": "Stream",
-        "amzn_sfx_strong_wind_desert": "Strong Wind Desert",
-        "amzn_sfx_strong_wind_whistling": "Strong Wind Whistling",
-        "amzn_sfx_subway_leaving": "Subway Leaving",
-        "amzn_sfx_subway_passing": "Subway Passing",
-        "amzn_sfx_subway_stopping": "Subway Stopping",
-        "amzn_sfx_swoosh_cartoon_fast": "Swoosh Cartoon Fast",
-        "amzn_sfx_swoosh_fast_1x": "Swoosh Fast 1x",
-        "amzn_sfx_swoosh_fast_6x": "Swoosh Fast 6x",
-        "amzn_sfx_test_tone": "Test Tone",
-        "amzn_sfx_thunder_rumble": "Thunder Rumble",
-        "amzn_sfx_toilet_flush": "Toilet Flush",
-        "amzn_sfx_trumpet_bugle": "Trumpet Bugle",
-        "amzn_sfx_turkey_gobbling": "Turkey Gobbling",
-        "amzn_sfx_typing_medium": "Typing Medium",
-        "amzn_sfx_typing_short": "Typing Short",
-        "amzn_sfx_typing_typewriter": "Typing Typewriter",
-        "amzn_sfx_vacuum_off": "Vacuum Off",
-        "amzn_sfx_vacuum_on": "Vacuum On",
-        "amzn_sfx_walking_in_mud": "Walking In Mud",
-        "amzn_sfx_walking_in_snow": "Walking In Snow",
-        "amzn_sfx_walking_on_grass": "Walking On Grass",
-        "amzn_sfx_water_dripping": "Water Dripping",
-        "amzn_sfx_water_droplets": "Water Droplets",
-        "amzn_sfx_wind_strong_gusting": "Wind Strong Gusting",
-        "amzn_sfx_wind_whistling_desert": "Wind Whistling Desert",
-        "amzn_sfx_wings_flap_4x": "Wings Flap 4x",
-        "amzn_sfx_wings_flap_fast": "Wings Flap Fast",
-        "amzn_sfx_wolf_howl": "Wolf Howl",
-        "amzn_sfx_wolf_young_howl": "Wolf Young Howl",
-        "amzn_sfx_wooden_door": "Wooden Door",
-        "amzn_sfx_wooden_door_creaks_long": "Wooden Door Creaks Long",
-        "amzn_sfx_wooden_door_creaks_multiple": "Wooden Door Creaks Multiple",
-        "amzn_sfx_wooden_door_creaks_open": "Wooden Door Creaks Open",
-        "amzn_ui_sfx_gameshow_bridge": "Gameshow Bridge",
-        "amzn_ui_sfx_gameshow_countdown_loop_32s_full": "Gameshow Countdown Loop 32s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_full": "Gameshow Countdown Loop 64s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_minimal": "Gameshow Countdown Loop 64s Minimal",
-        "amzn_ui_sfx_gameshow_intro": "Gameshow Intro",
-        "amzn_ui_sfx_gameshow_negative_response": "Gameshow Negative Response",
-        "amzn_ui_sfx_gameshow_neutral_response": "Gameshow Neutral Response",
-        "amzn_ui_sfx_gameshow_outro": "Gameshow Outro",
-        "amzn_ui_sfx_gameshow_player1": "Gameshow Player1",
-        "amzn_ui_sfx_gameshow_player2": "Gameshow Player2",
-        "amzn_ui_sfx_gameshow_player3": "Gameshow Player3",
-        "amzn_ui_sfx_gameshow_player4": "Gameshow Player4",
-        "amzn_ui_sfx_gameshow_positive_response": "Gameshow Positive Response",
-        "amzn_ui_sfx_gameshow_tally_negative": "Gameshow Tally Negative",
-        "amzn_ui_sfx_gameshow_tally_positive": "Gameshow Tally Positive",
-        "amzn_ui_sfx_gameshow_waiting_loop_30s": "Gameshow Waiting Loop 30s",
-        "anchor": "Anchor",
-        "answering_machines": "Answering Machines",
-        "arcs_sparks": "Arcs Sparks",
-        "arrows_bows": "Arrows Bows",
-        "baby": "Baby",
-        "back_up_beeps": "Back Up Beeps",
-        "bars_restaurants": "Bars Restaurants",
-        "baseball": "Baseball",
-        "basketball": "Basketball",
-        "battles": "Battles",
-        "beeps_tones": "Beeps Tones",
-        "bell": "Bell",
-        "bikes": "Bikes",
-        "billiards": "Billiards",
-        "board_games": "Board Games",
-        "body": "Body",
-        "boing": "Boing",
-        "books": "Books",
-        "bow_wash": "Bow Wash",
-        "box": "Box",
-        "break_shatter_smash": "Break Shatter Smash",
-        "breaks": "Breaks",
-        "brooms_mops": "Brooms Mops",
-        "bullets": "Bullets",
-        "buses": "Buses",
-        "buzz": "Buzz",
-        "buzz_hums": "Buzz Hums",
-        "buzzers": "Buzzers",
-        "buzzers_pistols": "Buzzers Pistols",
-        "cables_metal": "Cables Metal",
-        "camera": "Camera",
-        "cannons": "Cannons",
-        "car_alarm": "Car Alarm",
-        "car_alarms": "Car Alarms",
-        "car_cell_phones": "Car Cell Phones",
-        "carnivals_fairs": "Carnivals Fairs",
-        "cars": "Cars",
-        "casino": "Casino",
-        "casinos": "Casinos",
-        "cellar": "Cellar",
-        "chimes": "Chimes",
-        "chimes_bells": "Chimes Bells",
-        "chorus": "Chorus",
-        "christmas": "Christmas",
-        "church_bells": "Church Bells",
-        "clock": "Clock",
-        "cloth": "Cloth",
-        "concrete": "Concrete",
-        "construction": "Construction",
-        "construction_factory": "Construction Factory",
-        "crashes": "Crashes",
-        "crowds": "Crowds",
-        "debris": "Debris",
-        "dining_kitchens": "Dining Kitchens",
-        "dinosaurs": "Dinosaurs",
-        "dripping": "Dripping",
-        "drops": "Drops",
-        "electric": "Electric",
-        "electrical": "Electrical",
-        "elevator": "Elevator",
-        "evolution_monsters": "Evolution Monsters",
-        "explosions": "Explosions",
-        "factory": "Factory",
-        "falls": "Falls",
-        "fax_scanner_copier": "Fax Scanner Copier",
-        "feedback_mics": "Feedback Mics",
-        "fight": "Fight",
-        "fire": "Fire",
-        "fire_extinguisher": "Fire Extinguisher",
-        "fireballs": "Fireballs",
-        "fireworks": "Fireworks",
-        "fishing_pole": "Fishing Pole",
-        "flags": "Flags",
-        "football": "Football",
-        "footsteps": "Footsteps",
-        "futuristic": "Futuristic",
-        "futuristic_ship": "Futuristic Ship",
-        "gameshow": "Gameshow",
-        "gear": "Gear",
-        "ghosts_demons": "Ghosts Demons",
-        "giant_monster": "Giant Monster",
-        "glass": "Glass",
-        "glasses_clink": "Glasses Clink",
-        "golf": "Golf",
-        "gorilla": "Gorilla",
-        "grenade_lanucher": "Grenade Lanucher",
-        "griffen": "Griffen",
-        "gyms_locker_rooms": "Gyms Locker Rooms",
-        "handgun_loading": "Handgun Loading",
-        "handgun_shot": "Handgun Shot",
-        "handle": "Handle",
-        "hands": "Hands",
-        "heartbeats_ekg": "Heartbeats EKG",
-        "helicopter": "Helicopter",
-        "high_tech": "High Tech",
-        "hit_punch_slap": "Hit Punch Slap",
-        "hits": "Hits",
-        "horns": "Horns",
-        "horror": "Horror",
-        "hot_tub_filling_up": "Hot Tub Filling Up",
-        "human": "Human",
-        "human_vocals": "Human Vocals",
-        "hygene": "Hygene",
-        "ice_skating": "Ice Skating",
-        "ignitions": "Ignitions",
-        "infantry": "Infantry",
-        "intro": "Intro",
-        "jet": "Jet",
-        "juggling": "Juggling",
-        "key_lock": "Key Lock",
-        "kids": "Kids",
-        "knocks": "Knocks",
-        "lab_equip": "Lab Equip",
-        "lacrosse": "Lacrosse",
-        "lamps_lanterns": "Lamps Lanterns",
-        "leather": "Leather",
-        "liquid_suction": "Liquid Suction",
-        "locker_doors": "Locker Doors",
-        "machine_gun": "Machine Gun",
-        "magic_spells": "Magic Spells",
-        "medium_large_explosions": "Medium Large Explosions",
-        "metal": "Metal",
-        "modern_rings": "Modern Rings",
-        "money_coins": "Money Coins",
-        "motorcycles": "Motorcycles",
-        "movement": "Movement",
-        "moves": "Moves",
-        "nature": "Nature",
-        "oar_boat": "Oar Boat",
-        "pagers": "Pagers",
-        "paintball": "Paintball",
-        "paper": "Paper",
-        "parachute": "Parachute",
-        "pay_phones": "Pay Phones",
-        "phone_beeps": "Phone Beeps",
-        "pigmy_bats": "Pigmy Bats",
-        "pills": "Pills",
-        "pour_water": "Pour Water",
-        "power_up_down": "Power Up Down",
-        "printers": "Printers",
-        "prison": "Prison",
-        "public_space": "Public Space",
-        "racquetball": "Racquetball",
-        "radios_static": "Radios Static",
-        "rain": "Rain",
-        "rc_airplane": "RC Airplane",
-        "rc_car": "RC Car",
-        "refrigerators_freezers": "Refrigerators Freezers",
-        "regular": "Regular",
-        "respirator": "Respirator",
-        "rifle": "Rifle",
-        "roller_coaster": "Roller Coaster",
-        "rollerskates_rollerblades": "RollerSkates RollerBlades",
-        "room_tones": "Room Tones",
-        "ropes_climbing": "Ropes Climbing",
-        "rotary_rings": "Rotary Rings",
-        "rowboat_canoe": "Rowboat Canoe",
-        "rubber": "Rubber",
-        "running": "Running",
-        "sails": "Sails",
-        "sand_gravel": "Sand Gravel",
-        "screen_doors": "Screen Doors",
-        "screens": "Screens",
-        "seats_stools": "Seats Stools",
-        "servos": "Servos",
-        "shoes_boots": "Shoes Boots",
-        "shotgun": "Shotgun",
-        "shower": "Shower",
-        "sink_faucet": "Sink Faucet",
-        "sink_filling_water": "Sink Filling Water",
-        "sink_run_and_off": "Sink Run And Off",
-        "sink_water_splatter": "Sink Water Splatter",
-        "sirens": "Sirens",
-        "skateboards": "Skateboards",
-        "ski": "Ski",
-        "skids_tires": "Skids Tires",
-        "sled": "Sled",
-        "slides": "Slides",
-        "small_explosions": "Small Explosions",
-        "snow": "Snow",
-        "snowmobile": "Snowmobile",
-        "soldiers": "Soldiers",
-        "splash_water": "Splash Water",
-        "splashes_sprays": "Splashes Sprays",
-        "sports_whistles": "Sports Whistles",
-        "squeaks": "Squeaks",
-        "squeaky": "Squeaky",
-        "stairs": "Stairs",
-        "steam": "Steam",
-        "submarine_diesel": "Submarine Diesel",
-        "swing_doors": "Swing Doors",
-        "switches_levers": "Switches Levers",
-        "swords": "Swords",
-        "tape": "Tape",
-        "tape_machine": "Tape Machine",
-        "televisions_shows": "Televisions Shows",
-        "tennis_pingpong": "Tennis PingPong",
-        "textile": "Textile",
-        "throw": "Throw",
-        "thunder": "Thunder",
-        "ticks": "Ticks",
-        "timer": "Timer",
-        "toilet_flush": "Toilet Flush",
-        "tone": "Tone",
-        "tones_noises": "Tones Noises",
-        "toys": "Toys",
-        "tractors": "Tractors",
-        "traffic": "Traffic",
-        "train": "Train",
-        "trucks_vans": "Trucks Vans",
-        "turnstiles": "Turnstiles",
-        "typing": "Typing",
-        "umbrella": "Umbrella",
-        "underwater": "Underwater",
-        "vampires": "Vampires",
-        "various": "Various",
-        "video_tunes": "Video Tunes",
-        "volcano_earthquake": "Volcano Earthquake",
-        "watches": "Watches",
-        "water": "Water",
-        "water_running": "Water Running",
-        "werewolves": "Werewolves",
-        "winches_gears": "Winches Gears",
-        "wind": "Wind",
-        "wood": "Wood",
-        "wood_boat": "Wood Boat",
-        "woosh": "Woosh",
-        "zap": "Zap",
-        "zippers": "Zippers"
-      }
-    }
-  },
   "exceptions": {
     "cannot_connect_with_error": {
       "message": "Error connecting: {error}"
     },
     "cannot_retrieve_data_with_error": {
       "message": "Error retrieving data: {error}"
-    },
-    "device_serial_number_missing": {
-      "message": "Device serial number missing: {device_id}"
-    },
-    "invalid_device_id": {
-      "message": "Invalid device ID specified: {device_id}"
-    },
-    "invalid_sound_value": {
-      "message": "Invalid sound {sound} with variant {variant} specified"
-    },
-    "entry_not_loaded": {
-      "message": "Entry not loaded: {entry}"
     }
   }
 }

homeassistant/components/auth/login_flow.py

@@ -268,7 +268,7 @@ class LoginFlowBaseView(HomeAssistantView):
         result.pop("data")
         result.pop("context")
 
-        result_obj = result.pop("result")
+        result_obj: Credentials = result.pop("result")
 
         # Result can be None if credential was never linked to a user before.
         user = await hass.auth.async_get_user_by_credentials(result_obj)
@@ -281,8 +281,7 @@ class LoginFlowBaseView(HomeAssistantView):
             )
 
         process_success_login(request)
-        # We overwrite the Credentials object with the string code to retrieve it.
+        result["result"] = self._store_result(client_id, result_obj)
-        result["result"] = self._store_result(client_id, result_obj)  # type: ignore[typeddict-item]
 
         return self.json(result)
 

homeassistant/components/backup/manager.py

@@ -1119,7 +1119,7 @@ class BackupManager:
             )
         if unavailable_agents:
             LOGGER.warning(
-                "Backup agents %s are not available, will backup to %s",
+                "Backup agents %s are not available, will backupp to %s",
                 unavailable_agents,
                 available_agents,
             )

homeassistant/components/bang_olufsen/strings.json

@@ -93,7 +93,7 @@
         }
       },
       "preset1": {
-        "name": "Favorite 1",
+        "name": "Favourite 1",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -107,7 +107,7 @@
         }
       },
       "preset2": {
-        "name": "Favorite 2",
+        "name": "Favourite 2",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -121,7 +121,7 @@
         }
       },
       "preset3": {
-        "name": "Favorite 3",
+        "name": "Favourite 3",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -135,7 +135,7 @@
         }
       },
       "preset4": {
-        "name": "Favorite 4",
+        "name": "Favourite 4",
         "state_attributes": {
           "event_type": {
             "state": {

homeassistant/components/bluesound/manifest.json

@@ -6,7 +6,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
   "iot_class": "local_polling",
-  "requirements": ["pyblu==2.0.4"],
+  "requirements": ["pyblu==2.0.1"],
   "zeroconf": [
     {
       "type": "_musc._tcp.local."

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==0.110.0"],
+  "requirements": ["hass-nabucasa==0.108.0"],
   "single_config_entry": true
 }

homeassistant/components/compensation/manifest.json

@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/compensation",
   "iot_class": "calculated",
   "quality_scale": "legacy",
-  "requirements": ["numpy==2.3.2"]
+  "requirements": ["numpy==2.3.0"]
 }

homeassistant/components/config/config_entries.py

@@ -146,9 +146,8 @@ def _prepare_config_flow_result_json(
         return prepare_result_json(result)
 
     data = result.copy()
-    entry: config_entries.ConfigEntry = data["result"]  # type: ignore[typeddict-item]
+    entry: config_entries.ConfigEntry = data["result"]
-    # We overwrite the ConfigEntry object with its json representation.
+    data["result"] = entry.as_json_fragment
-    data["result"] = entry.as_json_fragment  # type: ignore[typeddict-unknown-key]
     data.pop("data")
     data.pop("context")
     return data

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==2.2.3", "home-assistant-intents==2025.7.30"]
+  "requirements": ["hassil==2.2.3", "home-assistant-intents==2025.6.23"]
 }

homeassistant/components/datadog/__init__.py

@@ -75,9 +75,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DatadogConfigEntry) -> b
     prefix = options[CONF_PREFIX]
     sample_rate = options[CONF_RATE]
 
-    statsd_client = DogStatsd(
+    statsd_client = DogStatsd(host=host, port=port, namespace=prefix)
-        host=host, port=port, namespace=prefix, disable_telemetry=True
-    )
     entry.runtime_data = statsd_client
 
     initialize(statsd_host=host, statsd_port=port)

homeassistant/components/datadog/config_flow.py

@@ -36,14 +36,14 @@ class DatadogConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle user config flow."""
         errors: dict[str, str] = {}
         if user_input:
-            self._async_abort_entries_match(
-                {CONF_HOST: user_input[CONF_HOST], CONF_PORT: user_input[CONF_PORT]}
-            )
             # Validate connection to Datadog Agent
             success = await validate_datadog_connection(
                 self.hass,
                 user_input,
             )
+            self._async_abort_entries_match(
+                {CONF_HOST: user_input[CONF_HOST], CONF_PORT: user_input[CONF_PORT]}
+            )
             if not success:
                 errors["base"] = "cannot_connect"
             else:
@@ -58,6 +58,7 @@ class DatadogConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_RATE: user_input[CONF_RATE],
                     },
                 )
+
         return self.async_show_form(
             step_id="user",
             data_schema=vol.Schema(
@@ -106,26 +107,7 @@ class DatadogOptionsFlowHandler(OptionsFlow):
         options = self.config_entry.options
 
         if user_input is None:
-            return self.async_show_form(
+            user_input = {}
-                step_id="init",
-                data_schema=vol.Schema(
-                    {
-                        vol.Required(
-                            CONF_PREFIX,
-                            default=options.get(
-                                CONF_PREFIX, data.get(CONF_PREFIX, DEFAULT_PREFIX)
-                            ),
-                        ): str,
-                        vol.Required(
-                            CONF_RATE,
-                            default=options.get(
-                                CONF_RATE, data.get(CONF_RATE, DEFAULT_RATE)
-                            ),
-                        ): int,
-                    }
-                ),
-                errors={},
-            )
 
         success = await validate_datadog_connection(
             self.hass,

homeassistant/components/datadog/const.py

@@ -4,7 +4,7 @@ DOMAIN = "datadog"
 
 CONF_RATE = "rate"
 
-DEFAULT_HOST = "127.0.0.1"
+DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 8125
 DEFAULT_PREFIX = "hass"
 DEFAULT_RATE = 1

homeassistant/components/datadog/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "loggers": ["datadog"],
   "quality_scale": "legacy",
-  "requirements": ["datadog==0.52.0"]
+  "requirements": ["datadog==0.15.0"]
 }

homeassistant/components/devolo_home_control/config_flow.py

@@ -7,39 +7,45 @@ from typing import Any
 
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import (
+    SOURCE_REAUTH,
+    ConfigEntry,
+    ConfigFlow,
+    ConfigFlowResult,
+)
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import callback
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from . import configure_mydevolo
 from .const import DOMAIN, SUPPORTED_MODEL_TYPES
 from .exceptions import CredentialsInvalid, UuidChanged
 
-DATA_SCHEMA = vol.Schema(
-    {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
-)
-
 
 class DevoloHomeControlFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a devolo HomeControl config flow."""
 
     VERSION = 1
 
+    _reauth_entry: ConfigEntry
+
+    def __init__(self) -> None:
+        """Initialize devolo Home Control flow."""
+        self.data_schema = {
+            vol.Required(CONF_USERNAME): str,
+            vol.Required(CONF_PASSWORD): str,
+        }
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
-        errors: dict[str, str] = {}
+        if user_input is None:
-
+            return self._show_form(step_id="user")
-        if user_input is not None:
+        try:
-            try:
+            return await self._connect_mydevolo(user_input)
-                return await self._connect_mydevolo(user_input)
+        except CredentialsInvalid:
-            except CredentialsInvalid:
+            return self._show_form(step_id="user", errors={"base": "invalid_auth"})
-                errors["base"] = "invalid_auth"
-
-        return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
-        )
 
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
@@ -55,47 +61,42 @@ class DevoloHomeControlFlowHandler(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by zeroconf."""
-        errors: dict[str, str] = {}
+        if user_input is None:
-
+            return self._show_form(step_id="zeroconf_confirm")
-        if user_input is not None:
+        try:
-            try:
+            return await self._connect_mydevolo(user_input)
-                return await self._connect_mydevolo(user_input)
+        except CredentialsInvalid:
-            except CredentialsInvalid:
+            return self._show_form(
-                errors["base"] = "invalid_auth"
+                step_id="zeroconf_confirm", errors={"base": "invalid_auth"}
-
+            )
-        return self.async_show_form(
-            step_id="zeroconf_confirm", data_schema=DATA_SCHEMA, errors=errors
-        )
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Handle reauthentication."""
+        self._reauth_entry = self._get_reauth_entry()
+        self.data_schema = {
+            vol.Required(CONF_USERNAME, default=entry_data[CONF_USERNAME]): str,
+            vol.Required(CONF_PASSWORD): str,
+        }
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by reauthentication."""
-        errors: dict[str, str] = {}
+        if user_input is None:
-        data_schema = vol.Schema(
+            return self._show_form(step_id="reauth_confirm")
-            {
+        try:
-                vol.Required(CONF_USERNAME, default=self.init_data[CONF_USERNAME]): str,
+            return await self._connect_mydevolo(user_input)
-                vol.Required(CONF_PASSWORD): str,
+        except CredentialsInvalid:
-            }
+            return self._show_form(
-        )
+                step_id="reauth_confirm", errors={"base": "invalid_auth"}
-
+            )
-        if user_input is not None:
+        except UuidChanged:
-            try:
+            return self._show_form(
-                return await self._connect_mydevolo(user_input)
+                step_id="reauth_confirm", errors={"base": "reauth_failed"}
-            except CredentialsInvalid:
+            )
-                errors["base"] = "invalid_auth"
-            except UuidChanged:
-                errors["base"] = "reauth_failed"
-
-        return self.async_show_form(
-            step_id="reauth_confirm", data_schema=data_schema, errors=errors
-        )
 
     async def _connect_mydevolo(self, user_input: dict[str, Any]) -> ConfigFlowResult:
         """Connect to mydevolo."""
@@ -118,11 +119,21 @@ class DevoloHomeControlFlowHandler(ConfigFlow, domain=DOMAIN):
                 },
             )
 
-        if self.unique_id != uuid:
+        if self._reauth_entry.unique_id != uuid:
             # The old user and the new user are not the same. This could mess-up everything as all unique IDs might change.
             raise UuidChanged
 
-        reauth_entry = self._get_reauth_entry()
         return self.async_update_reload_and_abort(
-            reauth_entry, data=user_input, unique_id=uuid
+            self._reauth_entry, data=user_input, unique_id=uuid
+        )
+
+    @callback
+    def _show_form(
+        self, step_id: str, errors: dict[str, str] | None = None
+    ) -> ConfigFlowResult:
+        """Show the form to the user."""
+        return self.async_show_form(
+            step_id=step_id,
+            data_schema=vol.Schema(self.data_schema),
+            errors=errors if errors else {},
         )

homeassistant/components/devolo_home_network/manifest.json

@@ -8,7 +8,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["devolo_plc_api"],
-  "quality_scale": "silver",
   "requirements": ["devolo-plc-api==1.5.1"],
   "zeroconf": [
     {

homeassistant/components/devolo_home_network/quality_scale.yaml

@@ -1,84 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: |
-      This integration does not provide additional actions.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: |
-      This integration does not provide additional actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: |
-      Entities of this integration does not explicitly subscribe to events.
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: |
-      This integration does not provide additional actions.
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: |
-      This integration does not have an options flow.
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: done
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: done
-  discovery-update-info: done
-  discovery: done
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: done
-  dynamic-devices: done
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations: done
-  icon-translations: done
-  reconfiguration-flow:
-    status: exempt
-    comment: |
-      A change of the IP address is covered by discovery-update-info and a change of the password is covered by reauthentication-flow. No other configuration options are available.
-  repair-issues:
-    status: exempt
-    comment: |
-      This integration doesn't have any cases where raising an issue is needed.
-  stale-devices:
-    status: todo
-    comment: |
-      The tracked devices could be own devices with a manual delete option as the API cannot distinguish between stale devices and devices that are not home.
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: done

homeassistant/components/ecovacs/binary_sensor.py

@@ -4,12 +4,10 @@ from collections.abc import Callable
 from dataclasses import dataclass
 
 from deebot_client.capabilities import CapabilityEvent
-from deebot_client.events import Event
+from deebot_client.events.base import Event
 from deebot_client.events.water_info import MopAttachedEvent
-from sucks import VacBot
 
 from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
@@ -18,11 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import EcovacsConfigEntry
-from .entity import (
+from .entity import EcovacsCapabilityEntityDescription, EcovacsDescriptionEntity
-    EcovacsCapabilityEntityDescription,
-    EcovacsDescriptionEntity,
-    EcovacsLegacyEntity,
-)
 from .util import get_supported_entities
 
 
@@ -53,23 +47,12 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Add entities for passed config_entry in HA."""
-    controller = config_entry.runtime_data
-
     async_add_entities(
         get_supported_entities(
             config_entry.runtime_data, EcovacsBinarySensor, ENTITY_DESCRIPTIONS
         )
     )
 
-    legacy_entities = []
-    for device in controller.legacy_devices:
-        if not controller.legacy_entity_is_added(device, "battery_charging"):
-            controller.add_legacy_entity(device, "battery_charging")
-            legacy_entities.append(EcovacsLegacyBatteryChargingSensor(device))
-
-    if legacy_entities:
-        async_add_entities(legacy_entities)
-
 
 class EcovacsBinarySensor[EventT: Event](
     EcovacsDescriptionEntity[CapabilityEvent[EventT]],
@@ -88,33 +71,3 @@ class EcovacsBinarySensor[EventT: Event](
             self.async_write_ha_state()
 
         self._subscribe(self._capability.event, on_event)
-
-
-class EcovacsLegacyBatteryChargingSensor(EcovacsLegacyEntity, BinarySensorEntity):
-    """Legacy battery charging sensor."""
-
-    _attr_device_class = BinarySensorDeviceClass.BATTERY_CHARGING
-    _attr_entity_category = EntityCategory.DIAGNOSTIC
-
-    def __init__(
-        self,
-        device: VacBot,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(device)
-        self._attr_unique_id = f"{device.vacuum['did']}_battery_charging"
-
-    async def async_added_to_hass(self) -> None:
-        """Set up the event listeners now that hass is ready."""
-        self._event_listeners.append(
-            self.device.statusEvents.subscribe(
-                lambda _: self.schedule_update_ha_state()
-            )
-        )
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return true if the binary sensor is on."""
-        if self.device.charge_status is None:
-            return None
-        return bool(self.device.is_charging)

homeassistant/components/ecovacs/sensor.py

@@ -37,7 +37,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.helpers.typing import StateType
 
 from . import EcovacsConfigEntry
@@ -226,7 +225,7 @@ async def async_setup_entry(
 
     async_add_entities(entities)
 
-    async def _add_legacy_lifespan_entities() -> None:
+    async def _add_legacy_entities() -> None:
         entities = []
         for device in controller.legacy_devices:
             for description in LEGACY_LIFESPAN_SENSORS:
@@ -243,21 +242,14 @@ async def async_setup_entry(
             async_add_entities(entities)
 
     def _fire_ecovacs_legacy_lifespan_event(_: Any) -> None:
-        hass.create_task(_add_legacy_lifespan_entities())
+        hass.create_task(_add_legacy_entities())
 
-    legacy_entities = []
     for device in controller.legacy_devices:
         config_entry.async_on_unload(
             device.lifespanEvents.subscribe(
                 _fire_ecovacs_legacy_lifespan_event
             ).unsubscribe
         )
-        if not controller.legacy_entity_is_added(device, "battery_status"):
-            controller.add_legacy_entity(device, "battery_status")
-            legacy_entities.append(EcovacsLegacyBatterySensor(device))
-
-    if legacy_entities:
-        async_add_entities(legacy_entities)
 
 
 class EcovacsSensor(
@@ -352,44 +344,6 @@ class EcovacsErrorSensor(
         self._subscribe(self._capability.event, on_event)
 
 
-class EcovacsLegacyBatterySensor(EcovacsLegacyEntity, SensorEntity):
-    """Legacy battery sensor."""
-
-    _attr_native_unit_of_measurement = PERCENTAGE
-    _attr_device_class = SensorDeviceClass.BATTERY
-    _attr_entity_category = EntityCategory.DIAGNOSTIC
-
-    def __init__(
-        self,
-        device: VacBot,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(device)
-        self._attr_unique_id = f"{device.vacuum['did']}_battery_status"
-
-    async def async_added_to_hass(self) -> None:
-        """Set up the event listeners now that hass is ready."""
-        self._event_listeners.append(
-            self.device.batteryEvents.subscribe(
-                lambda _: self.schedule_update_ha_state()
-            )
-        )
-
-    @property
-    def native_value(self) -> StateType:
-        """Return the value reported by the sensor."""
-        if (status := self.device.battery_status) is not None:
-            return status * 100  # type: ignore[no-any-return]
-        return None
-
-    @property
-    def icon(self) -> str | None:
-        """Return the icon to use in the frontend, if any."""
-        return icon_for_battery_level(
-            battery_level=self.native_value, charging=self.device.is_charging
-        )
-
-
 class EcovacsLegacyLifespanSensor(EcovacsLegacyEntity, SensorEntity):
     """Legacy Lifespan sensor."""
 

homeassistant/components/ecovacs/vacuum.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any
 
 from deebot_client.capabilities import Capabilities, DeviceType
 from deebot_client.device import Device
-from deebot_client.events import FanSpeedEvent, RoomsEvent, StateEvent
+from deebot_client.events import BatteryEvent, FanSpeedEvent, RoomsEvent, StateEvent
 from deebot_client.models import CleanAction, CleanMode, Room, State
 import sucks
 
@@ -22,6 +22,7 @@ from homeassistant.core import HomeAssistant, SupportsResponse
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.icon import icon_for_battery_level
 from homeassistant.util import slugify
 
 from . import EcovacsConfigEntry
@@ -70,7 +71,8 @@ class EcovacsLegacyVacuum(EcovacsLegacyEntity, StateVacuumEntity):
 
     _attr_fan_speed_list = [sucks.FAN_SPEED_NORMAL, sucks.FAN_SPEED_HIGH]
     _attr_supported_features = (
-        VacuumEntityFeature.RETURN_HOME
+        VacuumEntityFeature.BATTERY
+        | VacuumEntityFeature.RETURN_HOME
         | VacuumEntityFeature.CLEAN_SPOT
         | VacuumEntityFeature.STOP
         | VacuumEntityFeature.START
@@ -87,6 +89,11 @@ class EcovacsLegacyVacuum(EcovacsLegacyEntity, StateVacuumEntity):
                 lambda _: self.schedule_update_ha_state()
             )
         )
+        self._event_listeners.append(
+            self.device.batteryEvents.subscribe(
+                lambda _: self.schedule_update_ha_state()
+            )
+        )
         self._event_listeners.append(
             self.device.lifespanEvents.subscribe(
                 lambda _: self.schedule_update_ha_state()
@@ -130,6 +137,21 @@ class EcovacsLegacyVacuum(EcovacsLegacyEntity, StateVacuumEntity):
 
         return None
 
+    @property
+    def battery_level(self) -> int | None:
+        """Return the battery level of the vacuum cleaner."""
+        if self.device.battery_status is not None:
+            return self.device.battery_status * 100  # type: ignore[no-any-return]
+
+        return None
+
+    @property
+    def battery_icon(self) -> str:
+        """Return the battery icon for the vacuum cleaner."""
+        return icon_for_battery_level(
+            battery_level=self.battery_level, charging=self.device.is_charging
+        )
+
     @property
     def fan_speed(self) -> str | None:
         """Return the fan speed of the vacuum cleaner."""
@@ -216,6 +238,7 @@ class EcovacsVacuum(
         VacuumEntityFeature.PAUSE
         | VacuumEntityFeature.STOP
         | VacuumEntityFeature.RETURN_HOME
+        | VacuumEntityFeature.BATTERY
         | VacuumEntityFeature.SEND_COMMAND
         | VacuumEntityFeature.LOCATE
         | VacuumEntityFeature.STATE
@@ -242,6 +265,10 @@ class EcovacsVacuum(
         """Set up the event listeners now that hass is ready."""
         await super().async_added_to_hass()
 
+        async def on_battery(event: BatteryEvent) -> None:
+            self._attr_battery_level = event.value
+            self.async_write_ha_state()
+
         async def on_rooms(event: RoomsEvent) -> None:
             self._rooms = event.rooms
             self.async_write_ha_state()
@@ -250,6 +277,7 @@ class EcovacsVacuum(
             self._attr_activity = _STATE_TO_VACUUM_STATE[event.state]
             self.async_write_ha_state()
 
+        self._subscribe(self._capability.battery.event, on_battery)
         self._subscribe(self._capability.state.event, on_status)
 
         if self._capability.fan_speed:

homeassistant/components/enphase_envoy/manifest.json

@@ -7,7 +7,7 @@
   "iot_class": "local_polling",
   "loggers": ["pyenphase"],
   "quality_scale": "platinum",
-  "requirements": ["pyenphase==2.2.3"],
+  "requirements": ["pyenphase==2.2.2"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."

homeassistant/components/esphome/config_flow.py

@@ -51,7 +51,6 @@ from .const import (
     DOMAIN,
 )
 from .dashboard import async_get_or_create_dashboard_manager, async_set_dashboard_info
-from .encryption_key_storage import async_get_encryption_key_storage
 from .entry_data import ESPHomeConfigEntry
 from .manager import async_replace_device
 
@@ -160,10 +159,7 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         """Handle reauthorization flow."""
         errors = {}
 
-        if (
+        if await self._retrieve_encryption_key_from_dashboard():
-            await self._retrieve_encryption_key_from_storage()
-            or await self._retrieve_encryption_key_from_dashboard()
-        ):
             error = await self.fetch_device_info()
             if error is None:
                 return await self._async_authenticate_or_add()
@@ -230,12 +226,9 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
                 response = await self.fetch_device_info()
                 self._noise_psk = None
 
-            # Try to retrieve an existing key from dashboard or storage.
             if (
                 self._device_name
                 and await self._retrieve_encryption_key_from_dashboard()
-            ) or (
-                self._device_mac and await self._retrieve_encryption_key_from_storage()
             ):
                 response = await self.fetch_device_info()
 
@@ -291,7 +284,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         self._name = discovery_info.properties.get("friendly_name", device_name)
         self._host = discovery_info.host
         self._port = discovery_info.port
-        self._device_mac = mac_address
         self._noise_required = bool(discovery_info.properties.get("api_encryption"))
 
         # Check if already configured
@@ -316,11 +308,10 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             # Don't call _fetch_device_info() for ignored entries
             raise AbortFlow("already_configured")
         configured_host: str | None = entry.data.get(CONF_HOST)
-        configured_port: int = entry.data.get(CONF_PORT, DEFAULT_PORT)
+        configured_port: int | None = entry.data.get(CONF_PORT)
-        # When port is None (from DHCP discovery), only compare hosts
+        if configured_host == host and configured_port == port:
-        if configured_host == host and (port is None or configured_port == port):
             # Don't probe to verify the mac is correct since
-            # the host matches (and port matches if provided).
+            # the host and port matches.
             raise AbortFlow("already_configured")
         configured_psk: str | None = entry.data.get(CONF_NOISE_PSK)
         await self._fetch_device_info(host, port or configured_port, configured_psk)
@@ -781,26 +772,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
         self._noise_psk = noise_psk
         return True
 
-    async def _retrieve_encryption_key_from_storage(self) -> bool:
-        """Try to retrieve the encryption key from storage.
-
-        Return boolean if a key was retrieved.
-        """
-        # Try to get MAC address from current flow state or reauth entry
-        mac_address = self._device_mac
-        if mac_address is None and self._reauth_entry is not None:
-            # In reauth flow, get MAC from the existing entry's unique_id
-            mac_address = self._reauth_entry.unique_id
-
-        assert mac_address is not None
-
-        storage = await async_get_encryption_key_storage(self.hass)
-        if stored_key := await storage.async_get_key(mac_address):
-            self._noise_psk = stored_key
-            return True
-
-        return False
-
     @staticmethod
     @callback
     def async_get_options_flow(

homeassistant/components/esphome/encryption_key_storage.py

@@ -1,94 +0,0 @@
-"""Encryption key storage for ESPHome devices."""
-
-from __future__ import annotations
-
-import logging
-from typing import TypedDict
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.json import JSONEncoder
-from homeassistant.helpers.singleton import singleton
-from homeassistant.helpers.storage import Store
-from homeassistant.util.hass_dict import HassKey
-
-_LOGGER = logging.getLogger(__name__)
-
-ENCRYPTION_KEY_STORAGE_VERSION = 1
-ENCRYPTION_KEY_STORAGE_KEY = "esphome.encryption_keys"
-
-
-class EncryptionKeyData(TypedDict):
-    """Encryption key storage data."""
-
-    keys: dict[str, str]  # MAC address -> base64 encoded key
-
-
-KEY_ENCRYPTION_STORAGE: HassKey[ESPHomeEncryptionKeyStorage] = HassKey(
-    "esphome_encryption_key_storage"
-)
-
-
-class ESPHomeEncryptionKeyStorage:
-    """Storage for ESPHome encryption keys."""
-
-    def __init__(self, hass: HomeAssistant) -> None:
-        """Initialize the encryption key storage."""
-        self.hass = hass
-        self._store = Store[EncryptionKeyData](
-            hass,
-            ENCRYPTION_KEY_STORAGE_VERSION,
-            ENCRYPTION_KEY_STORAGE_KEY,
-            encoder=JSONEncoder,
-        )
-        self._data: EncryptionKeyData | None = None
-
-    async def async_load(self) -> None:
-        """Load encryption keys from storage."""
-        if self._data is None:
-            data = await self._store.async_load()
-            self._data = data or {"keys": {}}
-
-    async def async_save(self) -> None:
-        """Save encryption keys to storage."""
-        if self._data is not None:
-            await self._store.async_save(self._data)
-
-    async def async_get_key(self, mac_address: str) -> str | None:
-        """Get encryption key for a MAC address."""
-        await self.async_load()
-        assert self._data is not None
-        return self._data["keys"].get(mac_address.lower())
-
-    async def async_store_key(self, mac_address: str, key: str) -> None:
-        """Store encryption key for a MAC address."""
-        await self.async_load()
-        assert self._data is not None
-        self._data["keys"][mac_address.lower()] = key
-        await self.async_save()
-        _LOGGER.debug(
-            "Stored encryption key for device with MAC %s",
-            mac_address,
-        )
-
-    async def async_remove_key(self, mac_address: str) -> None:
-        """Remove encryption key for a MAC address."""
-        await self.async_load()
-        assert self._data is not None
-        lower_mac_address = mac_address.lower()
-        if lower_mac_address in self._data["keys"]:
-            del self._data["keys"][lower_mac_address]
-            await self.async_save()
-            _LOGGER.debug(
-                "Removed encryption key for device with MAC %s",
-                mac_address,
-            )
-
-
-@singleton(KEY_ENCRYPTION_STORAGE, async_=True)
-async def async_get_encryption_key_storage(
-    hass: HomeAssistant,
-) -> ESPHomeEncryptionKeyStorage:
-    """Get the encryption key storage instance."""
-    storage = ESPHomeEncryptionKeyStorage(hass)
-    await storage.async_load()
-    return storage

homeassistant/components/esphome/manager.py

@@ -3,10 +3,8 @@
 from __future__ import annotations
 
 import asyncio
-import base64
 from functools import partial
 import logging
-import secrets
 from typing import TYPE_CHECKING, Any, NamedTuple
 
 from aioesphomeapi import (
@@ -70,7 +68,6 @@ from .const import (
     CONF_ALLOW_SERVICE_CALLS,
     CONF_BLUETOOTH_MAC_ADDRESS,
     CONF_DEVICE_NAME,
-    CONF_NOISE_PSK,
     CONF_SUBSCRIBE_LOGS,
     DEFAULT_ALLOW_SERVICE_CALLS,
     DEFAULT_URL,
@@ -81,7 +78,6 @@ from .const import (
 )
 from .dashboard import async_get_dashboard
 from .domain_data import DomainData
-from .encryption_key_storage import async_get_encryption_key_storage
 
 # Import config flow so that it's added to the registry
 from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
@@ -89,7 +85,9 @@ from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
 DEVICE_CONFLICT_ISSUE_FORMAT = "device_conflict-{}"
 
 if TYPE_CHECKING:
-    from aioesphomeapi.api_pb2 import SubscribeLogsResponse  # type: ignore[attr-defined]  # noqa: I001
+    from aioesphomeapi.api_pb2 import (  # type: ignore[attr-defined]
+        SubscribeLogsResponse,
+    )
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -517,8 +515,6 @@ class ESPHomeManager:
         assert api_version is not None, "API version must be set"
         entry_data.async_on_connect(device_info, api_version)
 
-        await self._handle_dynamic_encryption_key(device_info)
-
         if device_info.name:
             reconnect_logic.name = device_info.name
 
@@ -622,7 +618,6 @@ class ESPHomeManager:
             ),
         ):
             return
-
         if isinstance(err, InvalidEncryptionKeyAPIError):
             if (
                 (received_name := err.received_name)
@@ -653,93 +648,6 @@ class ESPHomeManager:
                     return
         self.entry.async_start_reauth(self.hass)
 
-    async def _handle_dynamic_encryption_key(
-        self, device_info: EsphomeDeviceInfo
-    ) -> None:
-        """Handle dynamic encryption keys.
-
-        If a device reports it supports encryption, but we connected without a key,
-        we need to generate and store one.
-        """
-        noise_psk: str | None = self.entry.data.get(CONF_NOISE_PSK)
-        if noise_psk:
-            # we're already connected with a noise PSK - nothing to do
-            return
-
-        if not device_info.api_encryption_supported:
-            # device does not support encryption - nothing to do
-            return
-
-        # Connected to device without key and the device supports encryption
-        storage = await async_get_encryption_key_storage(self.hass)
-
-        # First check if we have a key in storage for this device
-        from_storage: bool = False
-        if self.entry.unique_id and (
-            stored_key := await storage.async_get_key(self.entry.unique_id)
-        ):
-            _LOGGER.debug(
-                "Retrieved encryption key from storage for device %s",
-                self.entry.unique_id,
-            )
-            # Use the stored key
-            new_key = stored_key.encode()
-            new_key_str = stored_key
-            from_storage = True
-        else:
-            # No stored key found, generate a new one
-            _LOGGER.debug(
-                "Generating new encryption key for device %s", self.entry.unique_id
-            )
-            new_key = base64.b64encode(secrets.token_bytes(32))
-            new_key_str = new_key.decode()
-
-        try:
-            # Store the key on the device using the existing connection
-            result = await self.cli.noise_encryption_set_key(new_key)
-        except APIConnectionError as ex:
-            _LOGGER.error(
-                "Connection error while storing encryption key for device %s (%s): %s",
-                self.entry.data.get(CONF_DEVICE_NAME, self.host),
-                self.entry.unique_id,
-                ex,
-            )
-            return
-        else:
-            if not result:
-                _LOGGER.error(
-                    "Failed to set dynamic encryption key on device %s (%s)",
-                    self.entry.data.get(CONF_DEVICE_NAME, self.host),
-                    self.entry.unique_id,
-                )
-                return
-
-        # Key stored successfully on device
-        assert self.entry.unique_id is not None
-
-        # Only store in storage if it was newly generated
-        if not from_storage:
-            await storage.async_store_key(self.entry.unique_id, new_key_str)
-
-        # Always update config entry
-        self.hass.config_entries.async_update_entry(
-            self.entry,
-            data={**self.entry.data, CONF_NOISE_PSK: new_key_str},
-        )
-
-        if from_storage:
-            _LOGGER.info(
-                "Set encryption key from storage on device %s (%s)",
-                self.entry.data.get(CONF_DEVICE_NAME, self.host),
-                self.entry.unique_id,
-            )
-        else:
-            _LOGGER.info(
-                "Generated and stored encryption key for device %s (%s)",
-                self.entry.data.get(CONF_DEVICE_NAME, self.host),
-                self.entry.unique_id,
-            )
-
     @callback
     def _async_handle_logging_changed(self, _event: Event) -> None:
         """Handle when the logging level changes."""

homeassistant/components/esphome/manifest.json

@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==37.2.0",
+    "aioesphomeapi==37.0.2",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==3.1.0"
   ],

homeassistant/components/frontend/manifest.json

@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250730.0"]
+  "requirements": ["home-assistant-frontend==20250702.3"]
 }

homeassistant/components/garages_amsterdam/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/garages_amsterdam",
   "iot_class": "cloud_polling",
-  "requirements": ["odp-amsterdam==6.1.2"]
+  "requirements": ["odp-amsterdam==6.1.1"]
 }

homeassistant/components/goalzero/strings.json

@@ -12,7 +12,7 @@
         }
       },
       "confirm_discovery": {
-        "description": "DHCP reservation on your router is recommended. If not set up, the device may become unavailable until Home Assistant detects the new IP address. Refer to your router's user manual."
+        "description": "DHCP reservation on your router is recommended. If not set up, the device may become unavailable until Home Assistant detects the new ip address. Refer to your router's user manual."
       }
     },
     "error": {

homeassistant/components/google/calendar.py

@@ -230,7 +230,7 @@ async def async_setup_entry(
             calendar_info = calendars[calendar_id]
         else:
             calendar_info = get_calendar_info(
-                hass, calendar_item.model_dump(exclude_unset=True)
+                hass, calendar_item.dict(exclude_unset=True)
             )
             new_calendars.append(calendar_info)
 
@@ -467,7 +467,7 @@ class GoogleCalendarEntity(
         else:
             start = DateOrDatetime(date=dtstart)
             end = DateOrDatetime(date=dtend)
-        event = Event.model_validate(
+        event = Event.parse_obj(
             {
                 EVENT_SUMMARY: kwargs[EVENT_SUMMARY],
                 "start": start,
@@ -538,7 +538,7 @@ async def async_create_event(entity: GoogleCalendarEntity, call: ServiceCall) ->
 
     if EVENT_IN in call.data:
         if EVENT_IN_DAYS in call.data[EVENT_IN]:
-            now = datetime.now().date()
+            now = datetime.now()
 
             start_in = now + timedelta(days=call.data[EVENT_IN][EVENT_IN_DAYS])
             end_in = start_in + timedelta(days=1)
@@ -547,7 +547,7 @@ async def async_create_event(entity: GoogleCalendarEntity, call: ServiceCall) ->
             end = DateOrDatetime(date=end_in)
 
         elif EVENT_IN_WEEKS in call.data[EVENT_IN]:
-            now = datetime.now().date()
+            now = datetime.now()
 
             start_in = now + timedelta(weeks=call.data[EVENT_IN][EVENT_IN_WEEKS])
             end_in = start_in + timedelta(days=1)

homeassistant/components/google/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==8.0.0", "oauth2client==4.1.3", "ical==11.0.0"]
+  "requirements": ["gcal-sync==7.1.0", "oauth2client==4.1.3", "ical==10.0.4"]
 }

homeassistant/components/group/config_flow.py

@@ -56,12 +56,12 @@ async def basic_group_options_schema(
     entity_selector: selector.Selector[Any] | vol.Schema
     if handler is None:
         entity_selector = selector.selector(
-            {"entity": {"domain": domain, "multiple": True, "reorder": True}}
+            {"entity": {"domain": domain, "multiple": True}}
         )
     else:
         entity_selector = entity_selector_without_own_entities(
             cast(SchemaOptionsFlowHandler, handler.parent_handler),
-            selector.EntitySelectorConfig(domain=domain, multiple=True, reorder=True),
+            selector.EntitySelectorConfig(domain=domain, multiple=True),
         )
 
     return vol.Schema(
@@ -78,9 +78,7 @@ def basic_group_config_schema(domain: str | list[str]) -> vol.Schema:
         {
             vol.Required("name"): selector.TextSelector(),
             vol.Required(CONF_ENTITIES): selector.EntitySelector(
-                selector.EntitySelectorConfig(
+                selector.EntitySelectorConfig(domain=domain, multiple=True),
-                    domain=domain, multiple=True, reorder=True
-                ),
             ),
             vol.Required(CONF_HIDE_MEMBERS, default=False): selector.BooleanSelector(),
         }
@@ -141,7 +139,9 @@ async def light_switch_options_schema(
     """Generate options schema."""
     return (await basic_group_options_schema(domain, handler)).extend(
         {
-            vol.Required(CONF_ALL, default=False): selector.BooleanSelector(),
+            vol.Required(
+                CONF_ALL, default=False, description={"advanced": True}
+            ): selector.BooleanSelector(),
         }
     )
 

homeassistant/components/group/strings.json

@@ -21,14 +21,12 @@
       },
       "binary_sensor": {
         "title": "[%key:component::group::config::step::user::title%]",
+        "description": "If \"all entities\" is enabled, the group's state is on only if all members are on. If \"all entities\" is disabled, the group's state is on if any member is on.",
         "data": {
           "all": "All entities",
           "entities": "Members",
           "hide_members": "Hide members",
           "name": "[%key:common::config_flow::data::name%]"
-        },
-        "data_description": {
-          "all": "If enabled, the group's state is on only if all members are on. If disabled, the group's state is on if any member is on."
         }
       },
       "button": {
@@ -107,9 +105,6 @@
           "device_class": "Device class",
           "state_class": "State class",
           "unit_of_measurement": "Unit of measurement"
-        },
-        "data_description": {
-          "ignore_non_numeric": "If enabled, the group's state is calculated if at least one member has a numerical value. If disabled, the group's state is calculated only if all group members have numerical values."
         }
       },
       "switch": {
@@ -125,13 +120,11 @@
   "options": {
     "step": {
       "binary_sensor": {
+        "description": "[%key:component::group::config::step::binary_sensor::description%]",
         "data": {
           "all": "[%key:component::group::config::step::binary_sensor::data::all%]",
           "entities": "[%key:component::group::config::step::binary_sensor::data::entities%]",
           "hide_members": "[%key:component::group::config::step::binary_sensor::data::hide_members%]"
-        },
-        "data_description": {
-          "all": "[%key:component::group::config::step::binary_sensor::data_description::all%]"
         }
       },
       "button": {
@@ -153,13 +146,11 @@
         }
       },
       "light": {
+        "description": "[%key:component::group::config::step::binary_sensor::description%]",
         "data": {
           "all": "[%key:component::group::config::step::binary_sensor::data::all%]",
           "entities": "[%key:component::group::config::step::binary_sensor::data::entities%]",
           "hide_members": "[%key:component::group::config::step::binary_sensor::data::hide_members%]"
-        },
-        "data_description": {
-          "all": "[%key:component::group::config::step::binary_sensor::data_description::all%]"
         }
       },
       "lock": {
@@ -181,6 +172,7 @@
         }
       },
       "sensor": {
+        "description": "If \"ignore non-numeric\" is enabled, the group's state is calculated if at least one member has a numerical value. If \"ignore non-numeric\" is disabled, the group's state is calculated only if all group members have numerical values.",
         "data": {
           "ignore_non_numeric": "[%key:component::group::config::step::sensor::data::ignore_non_numeric%]",
           "entities": "[%key:component::group::config::step::binary_sensor::data::entities%]",
@@ -190,19 +182,14 @@
           "device_class": "[%key:component::group::config::step::sensor::data::device_class%]",
           "state_class": "[%key:component::group::config::step::sensor::data::state_class%]",
           "unit_of_measurement": "[%key:component::group::config::step::sensor::data::unit_of_measurement%]"
-        },
-        "data_description": {
-          "ignore_non_numeric": "[%key:component::group::config::step::sensor::data_description::ignore_non_numeric%]"
         }
       },
       "switch": {
+        "description": "[%key:component::group::config::step::binary_sensor::description%]",
         "data": {
           "all": "[%key:component::group::config::step::binary_sensor::data::all%]",
           "entities": "[%key:component::group::config::step::binary_sensor::data::entities%]",
           "hide_members": "[%key:component::group::config::step::binary_sensor::data::hide_members%]"
-        },
-        "data_description": {
-          "all": "[%key:component::group::config::step::binary_sensor::data_description::all%]"
         }
       }
     }

homeassistant/components/growatt_server/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/growatt_server",
   "iot_class": "cloud_polling",
   "loggers": ["growattServer"],
-  "requirements": ["growattServer==1.7.1"]
+  "requirements": ["growattServer==1.6.0"]
 }

homeassistant/components/habitica/button.py

@@ -7,7 +7,15 @@ from dataclasses import dataclass
 from enum import StrEnum
 from typing import Any
 
-from habiticalib import Habitica, HabiticaClass, Skill, TaskType
+from aiohttp import ClientError
+from habiticalib import (
+    HabiticaClass,
+    HabiticaException,
+    NotAuthorizedError,
+    Skill,
+    TaskType,
+    TooManyRequestsError,
+)
 
 from homeassistant.components.button import (
     DOMAIN as BUTTON_DOMAIN,
@@ -15,11 +23,16 @@ from homeassistant.components.button import (
     ButtonEntityDescription,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import ASSETS_URL, DOMAIN
-from .coordinator import HabiticaConfigEntry, HabiticaData
+from .coordinator import (
+    HabiticaConfigEntry,
+    HabiticaData,
+    HabiticaDataUpdateCoordinator,
+)
 from .entity import HabiticaBase
 
 PARALLEL_UPDATES = 1
@@ -29,7 +42,7 @@ PARALLEL_UPDATES = 1
 class HabiticaButtonEntityDescription(ButtonEntityDescription):
     """Describes Habitica button entity."""
 
-    press_fn: Callable[[Habitica], Any]
+    press_fn: Callable[[HabiticaDataUpdateCoordinator], Any]
     available_fn: Callable[[HabiticaData], bool]
     class_needed: HabiticaClass | None = None
     entity_picture: str | None = None
@@ -60,13 +73,13 @@ BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.RUN_CRON,
         translation_key=HabiticaButtonEntity.RUN_CRON,
-        press_fn=lambda habitica: habitica.run_cron(),
+        press_fn=lambda coordinator: coordinator.habitica.run_cron(),
         available_fn=lambda data: data.user.needsCron is True,
     ),
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.BUY_HEALTH_POTION,
         translation_key=HabiticaButtonEntity.BUY_HEALTH_POTION,
-        press_fn=lambda habitica: habitica.buy_health_potion(),
+        press_fn=lambda coordinator: coordinator.habitica.buy_health_potion(),
         available_fn=(
             lambda data: (data.user.stats.gp or 0) >= 25
             and (data.user.stats.hp or 0) < 50
@@ -76,7 +89,7 @@ BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.ALLOCATE_ALL_STAT_POINTS,
         translation_key=HabiticaButtonEntity.ALLOCATE_ALL_STAT_POINTS,
-        press_fn=lambda habitica: habitica.allocate_stat_points(),
+        press_fn=lambda coordinator: coordinator.habitica.allocate_stat_points(),
         available_fn=(
             lambda data: data.user.preferences.automaticAllocation is True
             and (data.user.stats.points or 0) > 0
@@ -85,7 +98,7 @@ BUTTON_DESCRIPTIONS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.REVIVE,
         translation_key=HabiticaButtonEntity.REVIVE,
-        press_fn=lambda habitica: habitica.revive(),
+        press_fn=lambda coordinator: coordinator.habitica.revive(),
         available_fn=lambda data: data.user.stats.hp == 0,
     ),
 )
@@ -95,7 +108,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.MPHEAL,
         translation_key=HabiticaButtonEntity.MPHEAL,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.ETHEREAL_SURGE),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.ETHEREAL_SURGE)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 12
             and (data.user.stats.mp or 0) >= 30
@@ -106,7 +121,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.EARTH,
         translation_key=HabiticaButtonEntity.EARTH,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.EARTHQUAKE),
+        press_fn=lambda coordinator: coordinator.habitica.cast_skill(Skill.EARTHQUAKE),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 13
             and (data.user.stats.mp or 0) >= 35
@@ -117,7 +132,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.FROST,
         translation_key=HabiticaButtonEntity.FROST,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.CHILLING_FROST),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.CHILLING_FROST)
+        ),
         # chilling frost can only be cast once per day (streaks buff is false)
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 14
@@ -130,7 +147,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.DEFENSIVE_STANCE,
         translation_key=HabiticaButtonEntity.DEFENSIVE_STANCE,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.DEFENSIVE_STANCE),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.DEFENSIVE_STANCE)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 12
             and (data.user.stats.mp or 0) >= 25
@@ -141,7 +160,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.VALOROUS_PRESENCE,
         translation_key=HabiticaButtonEntity.VALOROUS_PRESENCE,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.VALOROUS_PRESENCE),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.VALOROUS_PRESENCE)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 13
             and (data.user.stats.mp or 0) >= 20
@@ -152,7 +173,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.INTIMIDATE,
         translation_key=HabiticaButtonEntity.INTIMIDATE,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.INTIMIDATING_GAZE),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.INTIMIDATING_GAZE)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 14
             and (data.user.stats.mp or 0) >= 15
@@ -163,7 +186,11 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.TOOLS_OF_TRADE,
         translation_key=HabiticaButtonEntity.TOOLS_OF_TRADE,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.TOOLS_OF_THE_TRADE),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(
+                Skill.TOOLS_OF_THE_TRADE
+            )
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 13
             and (data.user.stats.mp or 0) >= 25
@@ -174,7 +201,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.STEALTH,
         translation_key=HabiticaButtonEntity.STEALTH,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.STEALTH),
+        press_fn=lambda coordinator: coordinator.habitica.cast_skill(Skill.STEALTH),
         # Stealth buffs stack and it can only be cast if the amount of
         # buffs is smaller than the amount of unfinished dailies
         available_fn=(
@@ -197,7 +224,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.HEAL,
         translation_key=HabiticaButtonEntity.HEAL,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.HEALING_LIGHT),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.HEALING_LIGHT)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 11
             and (data.user.stats.mp or 0) >= 15
@@ -209,7 +238,11 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.BRIGHTNESS,
         translation_key=HabiticaButtonEntity.BRIGHTNESS,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.SEARING_BRIGHTNESS),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(
+                Skill.SEARING_BRIGHTNESS
+            )
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 12
             and (data.user.stats.mp or 0) >= 15
@@ -220,7 +253,9 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.PROTECT_AURA,
         translation_key=HabiticaButtonEntity.PROTECT_AURA,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.PROTECTIVE_AURA),
+        press_fn=(
+            lambda coordinator: coordinator.habitica.cast_skill(Skill.PROTECTIVE_AURA)
+        ),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 13
             and (data.user.stats.mp or 0) >= 30
@@ -231,7 +266,7 @@ CLASS_SKILLS: tuple[HabiticaButtonEntityDescription, ...] = (
     HabiticaButtonEntityDescription(
         key=HabiticaButtonEntity.HEAL_ALL,
         translation_key=HabiticaButtonEntity.HEAL_ALL,
-        press_fn=lambda habitica: habitica.cast_skill(Skill.BLESSING),
+        press_fn=lambda coordinator: coordinator.habitica.cast_skill(Skill.BLESSING),
         available_fn=(
             lambda data: (data.user.stats.lvl or 0) >= 14
             and (data.user.stats.mp or 0) >= 25
@@ -297,9 +332,33 @@ class HabiticaButton(HabiticaBase, ButtonEntity):
 
     async def async_press(self) -> None:
         """Handle the button press."""
-
+        try:
-        await self.coordinator.execute(self.entity_description.press_fn)
+            await self.entity_description.press_fn(self.coordinator)
-        await self.coordinator.async_request_refresh()
+        except TooManyRequestsError as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="setup_rate_limit_exception",
+                translation_placeholders={"retry_after": str(e.retry_after)},
+            ) from e
+        except NotAuthorizedError as e:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_unallowed",
+            ) from e
+        except HabiticaException as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_exception",
+                translation_placeholders={"reason": e.error.message},
+            ) from e
+        except ClientError as e:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="service_call_exception",
+                translation_placeholders={"reason": str(e)},
+            ) from e
+        else:
+            await self.coordinator.async_request_refresh()
 
     @property
     def available(self) -> bool:

homeassistant/components/habitica/config_flow.py

@@ -164,6 +164,7 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
                     data={
                         CONF_API_USER: str(login.id),
                         CONF_API_KEY: login.apiToken,
+                        CONF_NAME: user.profile.name,  # needed for api_call action
                         CONF_URL: DEFAULT_URL,
                         CONF_VERIFY_SSL: True,
                     },
@@ -199,6 +200,7 @@ class HabiticaConfigFlow(ConfigFlow, domain=DOMAIN):
                     data={
                         **user_input,
                         CONF_URL: user_input.get(CONF_URL, DEFAULT_URL),
+                        CONF_NAME: user.profile.name,  # needed for api_call action
                     },
                 )
 

homeassistant/components/habitica/coordinator.py

@@ -23,12 +23,12 @@ from habiticalib import (
 )
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
     ConfigEntryNotReady,
     HomeAssistantError,
-    ServiceValidationError,
 )
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -106,6 +106,12 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
                 translation_placeholders={"reason": str(e)},
             ) from e
 
+        if not self.config_entry.data.get(CONF_NAME):
+            self.hass.config_entries.async_update_entry(
+                self.config_entry,
+                data={**self.config_entry.data, CONF_NAME: user.data.profile.name},
+            )
+
     async def _async_update_data(self) -> HabiticaData:
         try:
             user = (await self.habitica.get_user()).data
@@ -131,22 +137,19 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
         else:
             return HabiticaData(user=user, tasks=tasks + completed_todos)
 
-    async def execute(self, func: Callable[[Habitica], Any]) -> None:
+    async def execute(
+        self, func: Callable[[HabiticaDataUpdateCoordinator], Any]
+    ) -> None:
         """Execute an API call."""
 
         try:
-            await func(self.habitica)
+            await func(self)
         except TooManyRequestsError as e:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="setup_rate_limit_exception",
                 translation_placeholders={"retry_after": str(e.retry_after)},
             ) from e
-        except NotAuthorizedError as e:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="service_call_unallowed",
-            ) from e
         except HabiticaException as e:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,

homeassistant/components/habitica/entity.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 
 from yarl import URL
 
-from homeassistant.const import CONF_URL
+from homeassistant.const import CONF_NAME, CONF_URL
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -37,7 +37,7 @@ class HabiticaBase(CoordinatorEntity[HabiticaDataUpdateCoordinator]):
             entry_type=DeviceEntryType.SERVICE,
             manufacturer=MANUFACTURER,
             model=NAME,
-            name=coordinator.data.user.profile.name,
+            name=coordinator.config_entry.data[CONF_NAME],
             configuration_url=(
                 URL(coordinator.config_entry.data[CONF_URL])
                 / "profile"

homeassistant/components/habitica/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["habiticalib"],
   "quality_scale": "platinum",
-  "requirements": ["habiticalib==0.4.1"]
+  "requirements": ["habiticalib==0.4.0"]
 }

homeassistant/components/habitica/switch.py

@@ -7,8 +7,6 @@ from dataclasses import dataclass
 from enum import StrEnum
 from typing import Any
 
-from habiticalib import Habitica
-
 from homeassistant.components.switch import (
     SwitchDeviceClass,
     SwitchEntity,
@@ -17,7 +15,11 @@ from homeassistant.components.switch import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import HabiticaConfigEntry, HabiticaData
+from .coordinator import (
+    HabiticaConfigEntry,
+    HabiticaData,
+    HabiticaDataUpdateCoordinator,
+)
 from .entity import HabiticaBase
 
 PARALLEL_UPDATES = 1
@@ -27,8 +29,8 @@ PARALLEL_UPDATES = 1
 class HabiticaSwitchEntityDescription(SwitchEntityDescription):
     """Describes Habitica switch entity."""
 
-    turn_on_fn: Callable[[Habitica], Any]
+    turn_on_fn: Callable[[HabiticaDataUpdateCoordinator], Any]
-    turn_off_fn: Callable[[Habitica], Any]
+    turn_off_fn: Callable[[HabiticaDataUpdateCoordinator], Any]
     is_on_fn: Callable[[HabiticaData], bool | None]
 
 
@@ -43,8 +45,8 @@ SWTICH_DESCRIPTIONS: tuple[HabiticaSwitchEntityDescription, ...] = (
         key=HabiticaSwitchEntity.SLEEP,
         translation_key=HabiticaSwitchEntity.SLEEP,
         device_class=SwitchDeviceClass.SWITCH,
-        turn_on_fn=lambda habitica: habitica.toggle_sleep(),
+        turn_on_fn=lambda coordinator: coordinator.habitica.toggle_sleep(),
-        turn_off_fn=lambda habitica: habitica.toggle_sleep(),
+        turn_off_fn=lambda coordinator: coordinator.habitica.toggle_sleep(),
         is_on_fn=lambda data: data.user.preferences.sleep,
     ),
 )

homeassistant/components/here_travel_time/__init__.py

@@ -2,13 +2,11 @@
 
 from __future__ import annotations
 
-import logging
-
 from homeassistant.const import CONF_API_KEY, CONF_MODE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.start import async_at_started
 
-from .const import CONF_TRAFFIC_MODE, TRAVEL_MODE_PUBLIC
+from .const import TRAVEL_MODE_PUBLIC
 from .coordinator import (
     HereConfigEntry,
     HERERoutingDataUpdateCoordinator,
@@ -17,8 +15,6 @@ from .coordinator import (
 
 PLATFORMS = [Platform.SENSOR]
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: HereConfigEntry) -> bool:
     """Set up HERE Travel Time from a config entry."""
@@ -47,28 +43,3 @@ async def async_unload_entry(
 ) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
-
-
-async def async_migrate_entry(
-    hass: HomeAssistant, config_entry: HereConfigEntry
-) -> bool:
-    """Migrate an old config entry."""
-
-    if config_entry.version == 1 and config_entry.minor_version == 1:
-        _LOGGER.debug(
-            "Migrating from version %s.%s",
-            config_entry.version,
-            config_entry.minor_version,
-        )
-        options = dict(config_entry.options)
-        options[CONF_TRAFFIC_MODE] = True
-
-        hass.config_entries.async_update_entry(
-            config_entry, options=options, version=1, minor_version=2
-        )
-        _LOGGER.debug(
-            "Migration to version %s.%s successful",
-            config_entry.version,
-            config_entry.minor_version,
-        )
-    return True

homeassistant/components/here_travel_time/config_flow.py

@@ -33,7 +33,6 @@ from homeassistant.const import (
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
-    BooleanSelector,
     EntitySelector,
     LocationSelector,
     TimeSelector,
@@ -51,7 +50,6 @@ from .const import (
     CONF_ORIGIN_LATITUDE,
     CONF_ORIGIN_LONGITUDE,
     CONF_ROUTE_MODE,
-    CONF_TRAFFIC_MODE,
     DEFAULT_NAME,
     DOMAIN,
     ROUTE_MODE_FASTEST,
@@ -67,7 +65,6 @@ DEFAULT_OPTIONS = {
     CONF_ROUTE_MODE: ROUTE_MODE_FASTEST,
     CONF_ARRIVAL_TIME: None,
     CONF_DEPARTURE_TIME: None,
-    CONF_TRAFFIC_MODE: True,
 }
 
 
@@ -105,7 +102,6 @@ class HERETravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for HERE Travel Time."""
 
     VERSION = 1
-    MINOR_VERSION = 2
 
     def __init__(self) -> None:
         """Init Config Flow."""
@@ -311,9 +307,7 @@ class HERETravelTimeOptionsFlow(OptionsFlow):
         """Manage the HERE Travel Time options."""
         if user_input is not None:
             self._config = user_input
-            if self._config[CONF_TRAFFIC_MODE]:
+            return await self.async_step_time_menu()
-                return await self.async_step_time_menu()
-            return self.async_create_entry(title="", data=self._config)
 
         schema = self.add_suggested_values_to_schema(
             vol.Schema(
@@ -324,21 +318,12 @@ class HERETravelTimeOptionsFlow(OptionsFlow):
                             CONF_ROUTE_MODE, DEFAULT_OPTIONS[CONF_ROUTE_MODE]
                         ),
                     ): vol.In(ROUTE_MODES),
-                    vol.Optional(
-                        CONF_TRAFFIC_MODE,
-                        default=self.config_entry.options.get(
-                            CONF_TRAFFIC_MODE, DEFAULT_OPTIONS[CONF_TRAFFIC_MODE]
-                        ),
-                    ): BooleanSelector(),
                 }
             ),
             {
                 CONF_ROUTE_MODE: self.config_entry.options.get(
                     CONF_ROUTE_MODE, DEFAULT_OPTIONS[CONF_ROUTE_MODE]
                 ),
-                CONF_TRAFFIC_MODE: self.config_entry.options.get(
-                    CONF_TRAFFIC_MODE, DEFAULT_OPTIONS[CONF_TRAFFIC_MODE]
-                ),
             },
         )
 

homeassistant/components/here_travel_time/const.py

@@ -19,7 +19,6 @@ CONF_ARRIVAL = "arrival"
 CONF_DEPARTURE = "departure"
 CONF_ARRIVAL_TIME = "arrival_time"
 CONF_DEPARTURE_TIME = "departure_time"
-CONF_TRAFFIC_MODE = "traffic_mode"
 
 DEFAULT_NAME = "HERE Travel Time"
 

homeassistant/components/here_travel_time/coordinator.py

@@ -13,7 +13,6 @@ from here_routing import (
     Return,
     RoutingMode,
     Spans,
-    TrafficMode,
     TransportMode,
 )
 import here_transit
@@ -45,7 +44,6 @@ from .const import (
     CONF_ORIGIN_LATITUDE,
     CONF_ORIGIN_LONGITUDE,
     CONF_ROUTE_MODE,
-    CONF_TRAFFIC_MODE,
     DEFAULT_SCAN_INTERVAL,
     DOMAIN,
     ROUTE_MODE_FASTEST,
@@ -89,7 +87,7 @@ class HERERoutingDataUpdateCoordinator(DataUpdateCoordinator[HERETravelTimeData]
         _LOGGER.debug(
             (
                 "Requesting route for origin: %s, destination: %s, route_mode: %s,"
-                " mode: %s, arrival: %s, departure: %s, traffic_mode: %s"
+                " mode: %s, arrival: %s, departure: %s"
             ),
             params.origin,
             params.destination,
@@ -97,7 +95,6 @@ class HERERoutingDataUpdateCoordinator(DataUpdateCoordinator[HERETravelTimeData]
             TransportMode(params.travel_mode),
             params.arrival,
             params.departure,
-            params.traffic_mode,
         )
 
         try:
@@ -112,7 +109,6 @@ class HERERoutingDataUpdateCoordinator(DataUpdateCoordinator[HERETravelTimeData]
                 routing_mode=params.route_mode,
                 arrival_time=params.arrival,
                 departure_time=params.departure,
-                traffic_mode=params.traffic_mode,
                 return_values=[Return.POLYINE, Return.SUMMARY],
                 spans=[Spans.NAMES],
             )
@@ -354,11 +350,6 @@ def prepare_parameters(
         if config_entry.options[CONF_ROUTE_MODE] == ROUTE_MODE_FASTEST
         else RoutingMode.SHORT
     )
-    traffic_mode = (
-        TrafficMode.DISABLED
-        if config_entry.options[CONF_TRAFFIC_MODE] is False
-        else TrafficMode.DEFAULT
-    )
 
     return HERETravelTimeAPIParams(
         destination=destination,
@@ -367,7 +358,6 @@ def prepare_parameters(
         route_mode=route_mode,
         arrival=arrival,
         departure=departure,
-        traffic_mode=traffic_mode,
     )
 
 

homeassistant/components/here_travel_time/model.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import TypedDict
 
-from here_routing import RoutingMode, TrafficMode
+from here_routing import RoutingMode
 
 
 class HERETravelTimeData(TypedDict):
@@ -32,4 +32,3 @@ class HERETravelTimeAPIParams:
     route_mode: RoutingMode
     arrival: datetime | None
     departure: datetime | None
-    traffic_mode: TrafficMode

homeassistant/components/here_travel_time/strings.json

@@ -60,11 +60,8 @@
     "step": {
       "init": {
         "data": {
-          "traffic_mode": "Use traffic and time-aware routing",
+          "traffic_mode": "Traffic mode",
           "route_mode": "Route mode"
-        },
-        "data_description": {
-          "traffic_mode": "Needed for defining arrival/departure times"
         }
       },
       "time_menu": {

homeassistant/components/home_connect/strings.json

@@ -193,11 +193,11 @@
         "consumer_products_coffee_maker_program_beverage_caffe_latte": "Caffe latte",
         "consumer_products_coffee_maker_program_beverage_milk_froth": "Milk froth",
         "consumer_products_coffee_maker_program_beverage_warm_milk": "Warm milk",
-        "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "Kleiner Brauner",
+        "consumer_products_coffee_maker_program_coffee_world_kleiner_brauner": "Kleiner brauner",
-        "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "Grosser Brauner",
+        "consumer_products_coffee_maker_program_coffee_world_grosser_brauner": "Grosser brauner",
         "consumer_products_coffee_maker_program_coffee_world_verlaengerter": "Verlaengerter",
         "consumer_products_coffee_maker_program_coffee_world_verlaengerter_braun": "Verlaengerter braun",
-        "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "Wiener Melange",
+        "consumer_products_coffee_maker_program_coffee_world_wiener_melange": "Wiener melange",
         "consumer_products_coffee_maker_program_coffee_world_flat_white": "Flat white",
         "consumer_products_coffee_maker_program_coffee_world_cortado": "Cortado",
         "consumer_products_coffee_maker_program_coffee_world_cafe_cortado": "Cafe cortado",
@@ -279,7 +279,7 @@
         "cooking_oven_program_heating_mode_intensive_heat": "Intensive heat",
         "cooking_oven_program_heating_mode_keep_warm": "Keep warm",
         "cooking_oven_program_heating_mode_preheat_ovenware": "Preheat ovenware",
-        "cooking_oven_program_heating_mode_frozen_heatup_special": "Special heat-up for frozen products",
+        "cooking_oven_program_heating_mode_frozen_heatup_special": "Special Heat-Up for frozen products",
         "cooking_oven_program_heating_mode_desiccation": "Desiccation",
         "cooking_oven_program_heating_mode_defrost": "Defrost",
         "cooking_oven_program_heating_mode_proof": "Proof",
@@ -316,8 +316,8 @@
         "laundry_care_washer_program_monsoon": "Monsoon",
         "laundry_care_washer_program_outdoor": "Outdoor",
         "laundry_care_washer_program_plush_toy": "Plush toy",
-        "laundry_care_washer_program_shirts_blouses": "Shirts/blouses",
+        "laundry_care_washer_program_shirts_blouses": "Shirts blouses",
-        "laundry_care_washer_program_sport_fitness": "Sport/fitness",
+        "laundry_care_washer_program_sport_fitness": "Sport fitness",
         "laundry_care_washer_program_towels": "Towels",
         "laundry_care_washer_program_water_proof": "Water proof",
         "laundry_care_washer_program_power_speed_59": "Power speed <59 min",
@@ -582,7 +582,7 @@
         },
         "consumer_products_cleaning_robot_option_cleaning_mode": {
           "name": "Cleaning mode",
-          "description": "Defines the favored cleaning mode."
+          "description": "Defines the favoured cleaning mode."
         },
         "consumer_products_coffee_maker_option_bean_amount": {
           "name": "Bean amount",
@@ -670,7 +670,7 @@
         },
         "cooking_oven_option_setpoint_temperature": {
           "name": "Setpoint temperature",
-          "description": "Defines the target cavity temperature, which will be held by the oven."
+          "description": "Defines the target cavity temperature, which will be hold by the oven."
         },
         "b_s_h_common_option_duration": {
           "name": "Duration",
@@ -1291,9 +1291,9 @@
         "state": {
           "cooking_hood_enum_type_color_temperature_custom": "Custom",
           "cooking_hood_enum_type_color_temperature_warm": "Warm",
-          "cooking_hood_enum_type_color_temperature_warm_to_neutral": "Warm to neutral",
+          "cooking_hood_enum_type_color_temperature_warm_to_neutral": "Warm to Neutral",
           "cooking_hood_enum_type_color_temperature_neutral": "Neutral",
-          "cooking_hood_enum_type_color_temperature_neutral_to_cold": "Neutral to cold",
+          "cooking_hood_enum_type_color_temperature_neutral_to_cold": "Neutral to Cold",
           "cooking_hood_enum_type_color_temperature_cold": "Cold"
         }
       },

homeassistant/components/homeassistant_hardware/coordinator.py

@@ -12,7 +12,6 @@ from ha_silabs_firmware_client import (
     ManifestMissing,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -25,20 +24,13 @@ FIRMWARE_REFRESH_INTERVAL = timedelta(hours=8)
 class FirmwareUpdateCoordinator(DataUpdateCoordinator[FirmwareManifest]):
     """Coordinator to manage firmware updates."""
 
-    def __init__(
+    def __init__(self, hass: HomeAssistant, session: ClientSession, url: str) -> None:
-        self,
-        hass: HomeAssistant,
-        config_entry: ConfigEntry,
-        session: ClientSession,
-        url: str,
-    ) -> None:
         """Initialize the firmware update coordinator."""
         super().__init__(
             hass,
             _LOGGER,
             name="firmware update coordinator",
             update_interval=FIRMWARE_REFRESH_INTERVAL,
-            config_entry=config_entry,
         )
         self.hass = hass
         self.session = session

homeassistant/components/homeassistant_sky_connect/update.py

@@ -124,7 +124,6 @@ def _async_create_update_entity(
         config_entry=config_entry,
         update_coordinator=FirmwareUpdateCoordinator(
             hass,
-            config_entry,
             session,
             NABU_CASA_FIRMWARE_RELEASES_URL,
         ),

homeassistant/components/homeassistant_yellow/update.py

@@ -129,7 +129,6 @@ def _async_create_update_entity(
         config_entry=config_entry,
         update_coordinator=FirmwareUpdateCoordinator(
             hass,
-            config_entry,
             session,
             NABU_CASA_FIRMWARE_RELEASES_URL,
         ),

homeassistant/components/homee/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["homee"],
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["pyHomee==1.2.10"]
 }

homeassistant/components/homee/quality_scale.yaml

@@ -28,19 +28,16 @@ rules:
   unique-config-entry: done
 
   # Silver
-  action-exceptions: done
+  action-exceptions: todo
   config-entry-unloading: done
-  docs-configuration-parameters:
+  docs-configuration-parameters: todo
-    status: exempt
+  docs-installation-parameters: todo
-    comment: |
-      The integration does not have options.
-  docs-installation-parameters: done
   entity-unavailable: done
   integration-owner: done
   log-when-unavailable: done
   parallel-updates: done
-  reauthentication-flow: done
+  reauthentication-flow: todo
-  test-coverage: done
+  test-coverage: todo
 
   # Gold
   devices: done
@@ -52,16 +49,16 @@ rules:
   docs-known-limitations: todo
   docs-supported-devices: todo
   docs-supported-functions: todo
-  docs-troubleshooting: done
+  docs-troubleshooting: todo
   docs-use-cases: todo
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: done
+  exception-translations: todo
   icon-translations: done
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
   repair-issues: todo
   stale-devices: todo
 

homeassistant/components/husqvarna_automower/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aioautomower"],
   "quality_scale": "silver",
-  "requirements": ["aioautomower==2.1.1"]
+  "requirements": ["aioautomower==2.0.1"]
 }

homeassistant/components/husqvarna_automower/sensor.py

@@ -8,7 +8,6 @@ from operator import attrgetter
 from typing import TYPE_CHECKING, Any
 
 from aioautomower.model import (
-    ExternalReasons,
     InactiveReasons,
     MowerAttributes,
     MowerModes,
@@ -191,37 +190,11 @@ RESTRICTED_REASONS: list = [
     RestrictedReasons.PARK_OVERRIDE,
     RestrictedReasons.SENSOR,
     RestrictedReasons.WEEK_SCHEDULE,
-    ExternalReasons.AMAZON_ALEXA,
-    ExternalReasons.DEVELOPER_PORTAL,
-    ExternalReasons.GARDENA_SMART_SYSTEM,
-    ExternalReasons.GOOGLE_ASSISTANT,
-    ExternalReasons.HOME_ASSISTANT,
-    ExternalReasons.IFTTT,
-    ExternalReasons.IFTTT_APPLETS,
-    ExternalReasons.IFTTT_CALENDAR_CONNECTION,
-    ExternalReasons.SMART_ROUTINE,
-    ExternalReasons.SMART_ROUTINE_FROST_GUARD,
-    ExternalReasons.SMART_ROUTINE_RAIN_GUARD,
-    ExternalReasons.SMART_ROUTINE_WILDLIFE_PROTECTION,
 ]
 
 STATE_NO_WORK_AREA_ACTIVE = "no_work_area_active"
 
 
-@callback
-def _get_restricted_reason(data: MowerAttributes) -> str:
-    """Return the restricted reason.
-
-    If there is an external reason, return that instead, if it's available.
-    """
-    if (
-        data.planner.restricted_reason == RestrictedReasons.EXTERNAL
-        and data.planner.external_reason is not None
-    ):
-        return data.planner.external_reason
-    return data.planner.restricted_reason
-
-
 @callback
 def _get_work_area_names(data: MowerAttributes) -> list[str]:
     """Return a list with all work area names."""
@@ -427,7 +400,7 @@ MOWER_SENSOR_TYPES: tuple[AutomowerSensorEntityDescription, ...] = (
         translation_key="restricted_reason",
         device_class=SensorDeviceClass.ENUM,
         option_fn=lambda data: RESTRICTED_REASONS,
-        value_fn=_get_restricted_reason,
+        value_fn=attrgetter("planner.restricted_reason"),
     ),
     AutomowerSensorEntityDescription(
         key="inactive_reason",

homeassistant/components/husqvarna_automower/strings.json

@@ -242,28 +242,16 @@
       "restricted_reason": {
         "name": "Restricted reason",
         "state": {
-          "all_work_areas_completed": "All work areas completed",
-          "amazon_alexa": "Amazon Alexa",
-          "daily_limit": "Daily limit",
-          "developer_portal": "Developer Portal",
-          "external": "External",
-          "fota": "Firmware Over-the-Air update running",
-          "frost": "Frost",
-          "gardena_smart_system": "Gardena Smart System",
-          "google_assistant": "Google Assistant",
-          "home_assistant": "Home Assistant",
-          "ifttt_applets": "IFTTT applets",
-          "ifttt_calendar_connection": "IFTTT calendar connection",
-          "ifttt": "IFTTT",
           "none": "No restrictions",
-          "not_applicable": "Not applicable",
+          "week_schedule": "Week schedule",
           "park_override": "Park override",
           "sensor": "Weather timer",
-          "smart_routine_frost_guard": "Frost guard",
+          "daily_limit": "Daily limit",
-          "smart_routine_rain_guard": "Rain guard",
+          "fota": "Firmware Over-the-Air update running",
-          "smart_routine_wildlife_protection": "Wildlife protection",
+          "frost": "Frost",
-          "smart_routine": "Generic smart routine",
+          "all_work_areas_completed": "All work areas completed",
-          "week_schedule": "Week schedule"
+          "external": "External",
+          "not_applicable": "Not applicable"
         }
       },
       "total_charging_time": {

homeassistant/components/husqvarna_automower_ble/__init__.py

@@ -19,7 +19,6 @@ type HusqvarnaConfigEntry = ConfigEntry[HusqvarnaCoordinator]
 
 PLATFORMS = [
     Platform.LAWN_MOWER,
-    Platform.SENSOR,
 ]
 
 

homeassistant/components/husqvarna_automower_ble/coordinator.py

@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 SCAN_INTERVAL = timedelta(seconds=60)
 
 
-class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, str | int]]):
+class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, bytes]]):
     """Class to manage fetching data."""
 
     def __init__(
@@ -67,11 +67,11 @@ class HusqvarnaCoordinator(DataUpdateCoordinator[dict[str, str | int]]):
         except BleakError as err:
             raise UpdateFailed("Failed to connect") from err
 
-    async def _async_update_data(self) -> dict[str, str | int]:
+    async def _async_update_data(self) -> dict[str, bytes]:
         """Poll the device."""
         LOGGER.debug("Polling device")
 
-        data: dict[str, str | int] = {}
+        data: dict[str, bytes] = {}
 
         try:
             if not self.mower.is_connected():

homeassistant/components/husqvarna_automower_ble/entity.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -29,18 +28,3 @@ class HusqvarnaAutomowerBleEntity(CoordinatorEntity[HusqvarnaCoordinator]):
     def available(self) -> bool:
         """Return if entity is available."""
         return super().available and self.coordinator.mower.is_connected()
-
-
-class HusqvarnaAutomowerBleDescriptorEntity(HusqvarnaAutomowerBleEntity):
-    """Coordinator entity for entities with entity description."""
-
-    def __init__(
-        self, coordinator: HusqvarnaCoordinator, description: EntityDescription
-    ) -> None:
-        """Initialize description entity."""
-        super().__init__(coordinator)
-
-        self._attr_unique_id = (
-            f"{coordinator.address}_{coordinator.channel_id}_{description.key}"
-        )
-        self.entity_description = description

homeassistant/components/husqvarna_automower_ble/sensor.py

@@ -1,51 +0,0 @@
-"""Support for sensor entities."""
-
-from __future__ import annotations
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import PERCENTAGE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import HusqvarnaConfigEntry
-from .entity import HusqvarnaAutomowerBleDescriptorEntity
-
-DESCRIPTIONS = (
-    SensorEntityDescription(
-        key="battery_level",
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.BATTERY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: HusqvarnaConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Husqvarna Automower Ble sensor based on a config entry."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        HusqvarnaAutomowerBleSensor(coordinator, description)
-        for description in DESCRIPTIONS
-        if description.key in coordinator.data
-    )
-
-
-class HusqvarnaAutomowerBleSensor(HusqvarnaAutomowerBleDescriptorEntity, SensorEntity):
-    """Representation of a sensor."""
-
-    entity_description: SensorEntityDescription
-
-    @property
-    def native_value(self) -> str | int:
-        """Return the previously fetched value."""
-        return self.coordinator.data[self.entity_description.key]

homeassistant/components/hydrawise/binary_sensor.py

@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable
+from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
 
-from pydrawise import Controller, Zone
+from pydrawise import Zone
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -81,46 +81,31 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Hydrawise binary_sensor platform."""
     coordinators = config_entry.runtime_data
-
+    entities: list[HydrawiseBinarySensor] = []
-    def _add_new_controllers(controllers: Iterable[Controller]) -> None:
+    for controller in coordinators.main.data.controllers.values():
-        entities: list[HydrawiseBinarySensor] = []
+        entities.extend(
-        for controller in controllers:
+            HydrawiseBinarySensor(coordinators.main, description, controller)
-            entities.extend(
+            for description in CONTROLLER_BINARY_SENSORS
-                HydrawiseBinarySensor(coordinators.main, description, controller)
+        )
-                for description in CONTROLLER_BINARY_SENSORS
+        entities.extend(
+            HydrawiseBinarySensor(
+                coordinators.main,
+                description,
+                controller,
+                sensor_id=sensor.id,
             )
-            entities.extend(
+            for sensor in controller.sensors
-                HydrawiseBinarySensor(
+            for description in RAIN_SENSOR_BINARY_SENSOR
-                    coordinators.main,
+            if "rain sensor" in sensor.model.name.lower()
-                    description,
+        )
-                    controller,
+        entities.extend(
-                    sensor_id=sensor.id,
-                )
-                for sensor in controller.sensors
-                for description in RAIN_SENSOR_BINARY_SENSOR
-                if "rain sensor" in sensor.model.name.lower()
-            )
-        async_add_entities(entities)
-
-    def _add_new_zones(zones: Iterable[tuple[Zone, Controller]]) -> None:
-        async_add_entities(
             HydrawiseZoneBinarySensor(
                 coordinators.main, description, controller, zone_id=zone.id
             )
-            for zone, controller in zones
+            for zone in controller.zones
             for description in ZONE_BINARY_SENSORS
         )
-
+    async_add_entities(entities)
-    _add_new_controllers(coordinators.main.data.controllers.values())
-    _add_new_zones(
-        [
-            (zone, coordinators.main.data.zone_id_to_controller[zone.id])
-            for zone in coordinators.main.data.zones.values()
-        ]
-    )
-    coordinators.main.new_controllers_callbacks.append(_add_new_controllers)
-    coordinators.main.new_zones_callbacks.append(_add_new_zones)
-
     platform = entity_platform.async_get_current_platform()
     platform.async_register_entity_service(SERVICE_RESUME, None, "resume")
     platform.async_register_entity_service(

homeassistant/components/hydrawise/const.py

@@ -13,7 +13,6 @@ DOMAIN = "hydrawise"
 DEFAULT_WATERING_TIME = timedelta(minutes=15)
 
 MANUFACTURER = "Hydrawise"
-MODEL_ZONE = "Zone"
 
 MAIN_SCAN_INTERVAL = timedelta(minutes=5)
 WATER_USE_SCAN_INTERVAL = timedelta(minutes=60)

homeassistant/components/hydrawise/coordinator.py

@@ -2,26 +2,17 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable
 from dataclasses import dataclass, field
 
 from pydrawise import HydrawiseBase
 from pydrawise.schema import Controller, ControllerWaterUseSummary, Sensor, User, Zone
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import DeviceEntry
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.dt import now
 
-from .const import (
+from .const import DOMAIN, LOGGER, MAIN_SCAN_INTERVAL, WATER_USE_SCAN_INTERVAL
-    DOMAIN,
-    LOGGER,
-    MAIN_SCAN_INTERVAL,
-    MODEL_ZONE,
-    WATER_USE_SCAN_INTERVAL,
-)
 
 type HydrawiseConfigEntry = ConfigEntry[HydrawiseUpdateCoordinators]
 
@@ -33,7 +24,6 @@ class HydrawiseData:
     user: User
     controllers: dict[int, Controller] = field(default_factory=dict)
     zones: dict[int, Zone] = field(default_factory=dict)
-    zone_id_to_controller: dict[int, Controller] = field(default_factory=dict)
     sensors: dict[int, Sensor] = field(default_factory=dict)
     daily_water_summary: dict[int, ControllerWaterUseSummary] = field(
         default_factory=dict
@@ -78,13 +68,6 @@ class HydrawiseMainDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
             update_interval=MAIN_SCAN_INTERVAL,
         )
         self.api = api
-        self.new_controllers_callbacks: list[
-            Callable[[Iterable[Controller]], None]
-        ] = []
-        self.new_zones_callbacks: list[
-            Callable[[Iterable[tuple[Zone, Controller]]], None]
-        ] = []
-        self.async_add_listener(self._add_remove_zones)
 
     async def _async_update_data(self) -> HydrawiseData:
         """Fetch the latest data from Hydrawise."""
@@ -97,81 +80,10 @@ class HydrawiseMainDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
             controller.zones = await self.api.get_zones(controller)
             for zone in controller.zones:
                 data.zones[zone.id] = zone
-                data.zone_id_to_controller[zone.id] = controller
             for sensor in controller.sensors:
                 data.sensors[sensor.id] = sensor
         return data
 
-    @callback
-    def _add_remove_zones(self) -> None:
-        """Add newly discovered zones and remove nonexistent ones."""
-        if self.data is None:
-            # Likely a setup error; ignore.
-            # Despite what mypy thinks, this is still reachable. Without this check,
-            # the test_connect_retry test in test_init.py fails.
-            return  # type: ignore[unreachable]
-
-        device_registry = dr.async_get(self.hass)
-        devices = dr.async_entries_for_config_entry(
-            device_registry, self.config_entry.entry_id
-        )
-        previous_zones: set[str] = set()
-        previous_zones_by_id: dict[str, DeviceEntry] = {}
-        previous_controllers: set[str] = set()
-        previous_controllers_by_id: dict[str, DeviceEntry] = {}
-        for device in devices:
-            for domain, identifier in device.identifiers:
-                if domain == DOMAIN:
-                    if device.model == MODEL_ZONE:
-                        previous_zones.add(identifier)
-                        previous_zones_by_id[identifier] = device
-                    else:
-                        previous_controllers.add(identifier)
-                        previous_controllers_by_id[identifier] = device
-                    continue
-
-        current_zones = {str(zone_id) for zone_id in self.data.zones}
-        current_controllers = {
-            str(controller_id) for controller_id in self.data.controllers
-        }
-
-        if removed_zones := previous_zones - current_zones:
-            LOGGER.debug("Removed zones: %s", ", ".join(removed_zones))
-            for zone_id in removed_zones:
-                device_registry.async_update_device(
-                    device_id=previous_zones_by_id[zone_id].id,
-                    remove_config_entry_id=self.config_entry.entry_id,
-                )
-
-        if removed_controllers := previous_controllers - current_controllers:
-            LOGGER.debug("Removed controllers: %s", ", ".join(removed_controllers))
-            for controller_id in removed_controllers:
-                device_registry.async_update_device(
-                    device_id=previous_controllers_by_id[controller_id].id,
-                    remove_config_entry_id=self.config_entry.entry_id,
-                )
-
-        if new_controller_ids := current_controllers - previous_controllers:
-            LOGGER.debug("New controllers found: %s", ", ".join(new_controller_ids))
-            new_controllers = [
-                self.data.controllers[controller_id]
-                for controller_id in map(int, new_controller_ids)
-            ]
-            for new_controller_callback in self.new_controllers_callbacks:
-                new_controller_callback(new_controllers)
-
-        if new_zone_ids := current_zones - previous_zones:
-            LOGGER.debug("New zones found: %s", ", ".join(new_zone_ids))
-            new_zones = [
-                (
-                    self.data.zones[zone_id],
-                    self.data.zone_id_to_controller[zone_id],
-                )
-                for zone_id in map(int, new_zone_ids)
-            ]
-            for new_zone_callback in self.new_zones_callbacks:
-                new_zone_callback(new_zones)
-
 
 class HydrawiseWaterUseDataUpdateCoordinator(HydrawiseDataUpdateCoordinator):
     """Data Update Coordinator for Hydrawise Water Use.

homeassistant/components/hydrawise/entity.py

@@ -9,7 +9,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, MANUFACTURER, MODEL_ZONE
+from .const import DOMAIN, MANUFACTURER
 from .coordinator import HydrawiseDataUpdateCoordinator
 
 
@@ -40,9 +40,7 @@ class HydrawiseEntity(CoordinatorEntity[HydrawiseDataUpdateCoordinator]):
             identifiers={(DOMAIN, self._device_id)},
             name=self.zone.name if zone_id is not None else controller.name,
             model=(
-                MODEL_ZONE
+                "Zone" if zone_id is not None else controller.hardware.model.description
-                if zone_id is not None
-                else controller.hardware.model.description
             ),
             manufacturer=MANUFACTURER,
         )

homeassistant/components/hydrawise/sensor.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable
+from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any
 
-from pydrawise.schema import Controller, ControllerWaterUseSummary, Zone
+from pydrawise.schema import ControllerWaterUseSummary
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -31,9 +31,7 @@ class HydrawiseSensorEntityDescription(SensorEntityDescription):
 
 
 def _get_water_use(sensor: HydrawiseSensor) -> ControllerWaterUseSummary:
-    return sensor.coordinator.data.daily_water_summary.get(
+    return sensor.coordinator.data.daily_water_summary[sensor.controller.id]
-        sensor.controller.id, ControllerWaterUseSummary()
-    )
 
 
 WATER_USE_CONTROLLER_SENSORS: tuple[HydrawiseSensorEntityDescription, ...] = (
@@ -135,65 +133,44 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Hydrawise sensor platform."""
     coordinators = config_entry.runtime_data
-
+    entities: list[HydrawiseSensor] = []
-    def _has_flow_sensor(controller: Controller) -> bool:
+    for controller in coordinators.main.data.controllers.values():
-        daily_water_use_summary = coordinators.water_use.data.daily_water_summary.get(
+        entities.extend(
-            controller.id, ControllerWaterUseSummary()
+            HydrawiseSensor(coordinators.water_use, description, controller)
+            for description in WATER_USE_CONTROLLER_SENSORS
         )
-        return daily_water_use_summary.total_use is not None
+        entities.extend(
-
+            HydrawiseSensor(
-    def _add_new_controllers(controllers: Iterable[Controller]) -> None:
+                coordinators.water_use, description, controller, zone_id=zone.id
-        entities: list[HydrawiseSensor] = []
+            )
-        for controller in controllers:
+            for zone in controller.zones
+            for description in WATER_USE_ZONE_SENSORS
+        )
+        entities.extend(
+            HydrawiseSensor(coordinators.main, description, controller, zone_id=zone.id)
+            for zone in controller.zones
+            for description in ZONE_SENSORS
+        )
+        if (
+            coordinators.water_use.data.daily_water_summary[controller.id].total_use
+            is not None
+        ):
+            # we have a flow sensor for this controller
             entities.extend(
                 HydrawiseSensor(coordinators.water_use, description, controller)
-                for description in WATER_USE_CONTROLLER_SENSORS
+                for description in FLOW_CONTROLLER_SENSORS
             )
-            if _has_flow_sensor(controller):
+            entities.extend(
-                entities.extend(
-                    HydrawiseSensor(coordinators.water_use, description, controller)
-                    for description in FLOW_CONTROLLER_SENSORS
-                )
-        async_add_entities(entities)
-
-    def _add_new_zones(zones: Iterable[tuple[Zone, Controller]]) -> None:
-        async_add_entities(
-            [
-                HydrawiseSensor(
-                    coordinators.water_use, description, controller, zone_id=zone.id
-                )
-                for zone, controller in zones
-                for description in WATER_USE_ZONE_SENSORS
-            ]
-            + [
-                HydrawiseSensor(
-                    coordinators.main, description, controller, zone_id=zone.id
-                )
-                for zone, controller in zones
-                for description in ZONE_SENSORS
-            ]
-            + [
                 HydrawiseSensor(
                     coordinators.water_use,
                     description,
                     controller,
                     zone_id=zone.id,
                 )
-                for zone, controller in zones
+                for zone in controller.zones
                 for description in FLOW_ZONE_SENSORS
-                if _has_flow_sensor(controller)
+            )
-            ]
+    async_add_entities(entities)
-        )
-
-    _add_new_controllers(coordinators.main.data.controllers.values())
-    _add_new_zones(
-        [
-            (zone, coordinators.main.data.zone_id_to_controller[zone.id])
-            for zone in coordinators.main.data.zones.values()
-        ]
-    )
-    coordinators.main.new_controllers_callbacks.append(_add_new_controllers)
-    coordinators.main.new_zones_callbacks.append(_add_new_zones)
 
 
 class HydrawiseSensor(HydrawiseEntity, SensorEntity):

homeassistant/components/hydrawise/switch.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Coroutine, Iterable
+from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from datetime import timedelta
 from typing import Any
 
-from pydrawise import Controller, HydrawiseBase, Zone
+from pydrawise import HydrawiseBase, Zone
 
 from homeassistant.components.switch import (
     SwitchDeviceClass,
@@ -66,21 +66,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Hydrawise switch platform."""
     coordinators = config_entry.runtime_data
-
+    async_add_entities(
-    def _add_new_zones(zones: Iterable[tuple[Zone, Controller]]) -> None:
+        HydrawiseSwitch(coordinators.main, description, controller, zone_id=zone.id)
-        async_add_entities(
+        for controller in coordinators.main.data.controllers.values()
-            HydrawiseSwitch(coordinators.main, description, controller, zone_id=zone.id)
+        for zone in controller.zones
-            for zone, controller in zones
+        for description in SWITCH_TYPES
-            for description in SWITCH_TYPES
-        )
-
-    _add_new_zones(
-        [
-            (zone, coordinators.main.data.zone_id_to_controller[zone.id])
-            for zone in coordinators.main.data.zones.values()
-        ]
     )
-    coordinators.main.new_zones_callbacks.append(_add_new_zones)
 
 
 class HydrawiseSwitch(HydrawiseEntity, SwitchEntity):

homeassistant/components/hydrawise/valve.py

@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
 from typing import Any
 
-from pydrawise.schema import Controller, Zone
+from pydrawise.schema import Zone
 
 from homeassistant.components.valve import (
     ValveDeviceClass,
@@ -34,21 +33,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Hydrawise valve platform."""
     coordinators = config_entry.runtime_data
-
+    async_add_entities(
-    def _add_new_zones(zones: Iterable[tuple[Zone, Controller]]) -> None:
+        HydrawiseValve(coordinators.main, description, controller, zone_id=zone.id)
-        async_add_entities(
+        for controller in coordinators.main.data.controllers.values()
-            HydrawiseValve(coordinators.main, description, controller, zone_id=zone.id)
+        for zone in controller.zones
-            for zone, controller in zones
+        for description in VALVE_TYPES
-            for description in VALVE_TYPES
-        )
-
-    _add_new_zones(
-        [
-            (zone, coordinators.main.data.zone_id_to_controller[zone.id])
-            for zone in coordinators.main.data.zones.values()
-        ]
     )
-    coordinators.main.new_zones_callbacks.append(_add_new_zones)
 
 
 class HydrawiseValve(HydrawiseEntity, ValveEntity):

homeassistant/components/immich/__init__.py

@@ -16,25 +16,13 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
 from .coordinator import ImmichConfigEntry, ImmichDataUpdateCoordinator
-from .services import async_setup_services
-
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.UPDATE]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up immich integration."""
-    await async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ImmichConfigEntry) -> bool:
     """Set up Immich from a config entry."""
 

homeassistant/components/immich/icons.json

@@ -11,10 +11,5 @@
         "default": "mdi:file-video"
       }
     }
-  },
-  "services": {
-    "upload_file": {
-      "service": "mdi:upload"
-    }
   }
 }

homeassistant/components/immich/media_source.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from logging import getLogger
 
 from aiohttp.web import HTTPNotFound, Request, Response, StreamResponse
-from aioimmich.assets.models import ImmichAsset
 from aioimmich.exceptions import ImmichError
 
 from homeassistant.components.http import HomeAssistantView
@@ -84,10 +83,6 @@ class ImmichMediaSource(MediaSource):
         self, item: MediaSourceItem, entries: list[ConfigEntry]
     ) -> list[BrowseMediaSource]:
         """Handle browsing different immich instances."""
-
-        # --------------------------------------------------------
-        # root level, render immich instances
-        # --------------------------------------------------------
         if not item.identifier:
             LOGGER.debug("Render all Immich instances")
             return [
@@ -102,10 +97,6 @@ class ImmichMediaSource(MediaSource):
                 )
                 for entry in entries
             ]
-
-        # --------------------------------------------------------
-        # 1st level, render collections overview
-        # --------------------------------------------------------
         identifier = ImmichMediaSourceIdentifier(item.identifier)
         entry: ImmichConfigEntry | None = (
             self.hass.config_entries.async_entry_for_domain_unique_id(
@@ -120,127 +111,50 @@ class ImmichMediaSource(MediaSource):
             return [
                 BrowseMediaSource(
                     domain=DOMAIN,
-                    identifier=f"{identifier.unique_id}|{collection}",
+                    identifier=f"{identifier.unique_id}|albums",
                     media_class=MediaClass.DIRECTORY,
                     media_content_type=MediaClass.IMAGE,
-                    title=collection,
+                    title="albums",
                     can_play=False,
                     can_expand=True,
                 )
-                for collection in ("albums", "people", "tags")
             ]
 
-        # --------------------------------------------------------
-        # 2nd level, render collection
-        # --------------------------------------------------------
         if identifier.collection_id is None:
-            if identifier.collection == "albums":
+            LOGGER.debug("Render all albums for %s", entry.title)
-                LOGGER.debug("Render all albums for %s", entry.title)
-                try:
-                    albums = await immich_api.albums.async_get_all_albums()
-                except ImmichError:
-                    return []
-
-                return [
-                    BrowseMediaSource(
-                        domain=DOMAIN,
-                        identifier=f"{identifier.unique_id}|albums|{album.album_id}",
-                        media_class=MediaClass.DIRECTORY,
-                        media_content_type=MediaClass.IMAGE,
-                        title=album.album_name,
-                        can_play=False,
-                        can_expand=True,
-                        thumbnail=f"/immich/{identifier.unique_id}/{album.album_thumbnail_asset_id}/thumbnail/image/jpg",
-                    )
-                    for album in albums
-                ]
-
-            if identifier.collection == "tags":
-                LOGGER.debug("Render all tags for %s", entry.title)
-                try:
-                    tags = await immich_api.tags.async_get_all_tags()
-                except ImmichError:
-                    return []
-
-                return [
-                    BrowseMediaSource(
-                        domain=DOMAIN,
-                        identifier=f"{identifier.unique_id}|tags|{tag.tag_id}",
-                        media_class=MediaClass.DIRECTORY,
-                        media_content_type=MediaClass.IMAGE,
-                        title=tag.name,
-                        can_play=False,
-                        can_expand=True,
-                    )
-                    for tag in tags
-                ]
-
-            if identifier.collection == "people":
-                LOGGER.debug("Render all people for %s", entry.title)
-                try:
-                    people = await immich_api.people.async_get_all_people()
-                except ImmichError:
-                    return []
-
-                return [
-                    BrowseMediaSource(
-                        domain=DOMAIN,
-                        identifier=f"{identifier.unique_id}|people|{person.person_id}",
-                        media_class=MediaClass.DIRECTORY,
-                        media_content_type=MediaClass.IMAGE,
-                        title=person.name,
-                        can_play=False,
-                        can_expand=True,
-                        thumbnail=f"/immich/{identifier.unique_id}/{person.person_id}/person/image/jpg",
-                    )
-                    for person in people
-                ]
-
-        # --------------------------------------------------------
-        # final level, render assets
-        # --------------------------------------------------------
-        assert identifier.collection_id is not None
-        assets: list[ImmichAsset] = []
-        if identifier.collection == "albums":
-            LOGGER.debug(
-                "Render all assets of album %s for %s",
-                identifier.collection_id,
-                entry.title,
-            )
             try:
-                album_info = await immich_api.albums.async_get_album_info(
+                albums = await immich_api.albums.async_get_all_albums()
-                    identifier.collection_id
-                )
-                assets = album_info.assets
             except ImmichError:
                 return []
 
-        elif identifier.collection == "tags":
+            return [
-            LOGGER.debug(
+                BrowseMediaSource(
-                "Render all assets with tag %s",
+                    domain=DOMAIN,
-                identifier.collection_id,
+                    identifier=f"{identifier.unique_id}|albums|{album.album_id}",
-            )
+                    media_class=MediaClass.DIRECTORY,
-            try:
+                    media_content_type=MediaClass.IMAGE,
-                assets = await immich_api.search.async_get_all_by_tag_ids(
+                    title=album.album_name,
-                    [identifier.collection_id]
+                    can_play=False,
+                    can_expand=True,
+                    thumbnail=f"/immich/{identifier.unique_id}/{album.album_thumbnail_asset_id}/thumbnail/image/jpg",
                 )
-            except ImmichError:
+                for album in albums
-                return []
+            ]
 
-        elif identifier.collection == "people":
+        LOGGER.debug(
-            LOGGER.debug(
+            "Render all assets of album %s for %s",
-                "Render all assets for person %s",
+            identifier.collection_id,
-                identifier.collection_id,
+            entry.title,
+        )
+        try:
+            album_info = await immich_api.albums.async_get_album_info(
+                identifier.collection_id
             )
-            try:
+        except ImmichError:
-                assets = await immich_api.search.async_get_all_by_person_ids(
+            return []
-                    [identifier.collection_id]
-                )
-            except ImmichError:
-                return []
 
         ret: list[BrowseMediaSource] = []
-        for asset in assets:
+        for asset in album_info.assets:
             if not (mime_type := asset.original_mime_type) or not mime_type.startswith(
                 ("image/", "video/")
             ):
@@ -259,8 +173,7 @@ class ImmichMediaSource(MediaSource):
                 BrowseMediaSource(
                     domain=DOMAIN,
                     identifier=(
-                        f"{identifier.unique_id}|"
+                        f"{identifier.unique_id}|albums|"
-                        f"{identifier.collection}|"
                         f"{identifier.collection_id}|"
                         f"{asset.asset_id}|"
                         f"{asset.original_file_name}|"
@@ -344,10 +257,7 @@ class ImmichMediaView(HomeAssistantView):
 
         # web response for images
         try:
-            if size == "person":
+            image = await immich_api.assets.async_view_asset(asset_id, size)
-                image = await immich_api.people.async_get_person_thumbnail(asset_id)
-            else:
-                image = await immich_api.assets.async_view_asset(asset_id, size)
         except ImmichError as exc:
             raise HTTPNotFound from exc
         return Response(body=image, content_type=f"{mime_type_base}/{mime_type_format}")

homeassistant/components/immich/services.py

@@ -1,98 +0,0 @@
-"""Services for the Immich integration."""
-
-import logging
-
-from aioimmich.exceptions import ImmichError
-import voluptuous as vol
-
-from homeassistant.components.media_source import async_resolve_media
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.selector import MediaSelector
-
-from .const import DOMAIN
-from .coordinator import ImmichConfigEntry
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_ALBUM_ID = "album_id"
-CONF_CONFIG_ENTRY_ID = "config_entry_id"
-CONF_FILE = "file"
-
-SERVICE_UPLOAD_FILE = "upload_file"
-SERVICE_SCHEMA_UPLOAD_FILE = vol.Schema(
-    {
-        vol.Required(CONF_CONFIG_ENTRY_ID): str,
-        vol.Required(CONF_FILE): MediaSelector({"accept": ["image/*", "video/*"]}),
-        vol.Optional(CONF_ALBUM_ID): str,
-    }
-)
-
-
-async def _async_upload_file(service_call: ServiceCall) -> None:
-    """Call immich upload file service."""
-    _LOGGER.debug(
-        "Executing service %s with arguments %s",
-        service_call.service,
-        service_call.data,
-    )
-    hass = service_call.hass
-    target_entry: ImmichConfigEntry | None = hass.config_entries.async_get_entry(
-        service_call.data[CONF_CONFIG_ENTRY_ID]
-    )
-    source_media_id = service_call.data[CONF_FILE]["media_content_id"]
-
-    if not target_entry:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="config_entry_not_found",
-        )
-
-    if target_entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="config_entry_not_loaded",
-        )
-
-    media = await async_resolve_media(hass, source_media_id, None)
-    if media.path is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN, translation_key="only_local_media_supported"
-        )
-
-    coordinator = target_entry.runtime_data
-
-    if target_album := service_call.data.get(CONF_ALBUM_ID):
-        try:
-            await coordinator.api.albums.async_get_album_info(target_album, True)
-        except ImmichError as ex:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="album_not_found",
-                translation_placeholders={"album_id": target_album, "error": str(ex)},
-            ) from ex
-
-    try:
-        upload_result = await coordinator.api.assets.async_upload_asset(str(media.path))
-        if target_album:
-            await coordinator.api.albums.async_add_assets_to_album(
-                target_album, [upload_result.asset_id]
-            )
-    except ImmichError as ex:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="upload_failed",
-            translation_placeholders={"file": str(media.path), "error": str(ex)},
-        ) from ex
-
-
-async def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up services for immich integration."""
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_UPLOAD_FILE,
-        _async_upload_file,
-        SERVICE_SCHEMA_UPLOAD_FILE,
-    )

homeassistant/components/immich/services.yaml

@@ -1,18 +0,0 @@
-upload_file:
-  fields:
-    config_entry_id:
-      required: true
-      selector:
-        config_entry:
-          integration: immich
-    file:
-      required: true
-      selector:
-        media:
-          accept:
-            - image/*
-            - video/*
-    album_id:
-      required: false
-      selector:
-        text:

homeassistant/components/immich/strings.json

@@ -74,42 +74,5 @@
         "name": "Version"
       }
     }
-  },
-  "services": {
-    "upload_file": {
-      "name": "Upload file",
-      "description": "Uploads a file to your Immich instance.",
-      "fields": {
-        "config_entry_id": {
-          "name": "Immich instance",
-          "description": "The Immich instance where to upload the file."
-        },
-        "file": {
-          "name": "File",
-          "description": "The path to the file to be uploaded."
-        },
-        "album_id": {
-          "name": "Album ID",
-          "description": "The album in which the file should be placed after uploading."
-        }
-      }
-    }
-  },
-  "exceptions": {
-    "config_entry_not_found": {
-      "message": "Config entry not found."
-    },
-    "config_entry_not_loaded": {
-      "message": "Config entry not loaded."
-    },
-    "only_local_media_supported": {
-      "message": "Only local media files are currently supported."
-    },
-    "album_not_found": {
-      "message": "Album with ID `{album_id}` not found ({error})."
-    },
-    "upload_failed": {
-      "message": "Upload of file `{file}` failed ({error})."
-    }
   }
 }

homeassistant/components/iqvia/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["pyiqvia"],
-  "requirements": ["numpy==2.3.2", "pyiqvia==2022.04.0"]
+  "requirements": ["numpy==2.3.0", "pyiqvia==2022.04.0"]
 }

homeassistant/components/iron_os/__init__.py

@@ -9,7 +9,9 @@ from pynecil import IronOSUpdate, Pynecil
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
 from .const import DOMAIN
@@ -31,6 +33,8 @@ PLATFORMS: list[Platform] = [
     Platform.UPDATE,
 ]
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 
 IRON_OS_KEY: HassKey[IronOSFirmwareUpdateCoordinator] = HassKey(DOMAIN)
 
@@ -38,15 +42,19 @@ IRON_OS_KEY: HassKey[IronOSFirmwareUpdateCoordinator] = HassKey(DOMAIN)
 _LOGGER = logging.getLogger(__name__)
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up IronOS firmware update coordinator."""
+
+    session = async_get_clientsession(hass)
+    github = IronOSUpdate(session)
+
+    hass.data[IRON_OS_KEY] = IronOSFirmwareUpdateCoordinator(hass, github)
+    await hass.data[IRON_OS_KEY].async_request_refresh()
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bool:
     """Set up IronOS from a config entry."""
-    if IRON_OS_KEY not in hass.data:
-        session = async_get_clientsession(hass)
-        github = IronOSUpdate(session)
-
-        hass.data[IRON_OS_KEY] = IronOSFirmwareUpdateCoordinator(hass, github)
-        await hass.data[IRON_OS_KEY].async_request_refresh()
-
     if TYPE_CHECKING:
         assert entry.unique_id
 
@@ -69,9 +77,4 @@ async def async_setup_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bo
 
 async def async_unload_entry(hass: HomeAssistant, entry: IronOSConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    if not hass.config_entries.async_loaded_entries(DOMAIN):
-        await hass.data[IRON_OS_KEY].async_shutdown()
-        hass.data.pop(IRON_OS_KEY)
-    return unload_ok

homeassistant/components/israel_rail/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/israel_rail",
   "iot_class": "cloud_polling",
   "loggers": ["israelrailapi"],
-  "requirements": ["israel-rail-api==0.1.3"]
+  "requirements": ["israel-rail-api==0.1.2"]
 }

homeassistant/components/ituran/__init__.py

@@ -8,7 +8,6 @@ from homeassistant.core import HomeAssistant
 from .coordinator import IturanConfigEntry, IturanDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
     Platform.DEVICE_TRACKER,
     Platform.SENSOR,
 ]