[pull] dev from home-assistant:dev

homeassistant/components/alexa_devices/diagnostics.py

@@ -1,14 +1,14 @@
 """Diagnostics support for Alexa Devices integration."""
 
 from dataclasses import asdict
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aioamazondevices.structures import AmazonDevice
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry, DeviceEntry
 
 from .coordinator import AmazonConfigEntry
 
@@ -48,13 +48,16 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: AmazonConfigEntry, device_entry: DeviceEntry
+    hass: HomeAssistant, entry: AmazonConfigEntry, device_entry: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device."""
 
     coordinator = entry.runtime_data
 
-    assert device_entry.serial_number
+    if TYPE_CHECKING:
+        # alexa_devices does not create child devices, and devices have a serial number
+        assert isinstance(device_entry, DeviceEntry)
+        assert device_entry.serial_number
 
     return build_device_data(coordinator.data[device_entry.serial_number])
 

homeassistant/components/configurator/__init__.py

@@ -24,12 +24,16 @@
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.frame import ReportBehavior, report_usage
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.async_ import run_callback_threadsafe
 
 _KEY_INSTANCE = "configurator"
 
+# The configurator integration is deprecated and can be removed in HA Core 2027.10
+_BREAKS_IN_HA_VERSION = "2027.10"
+
 DATA_REQUESTS = "configurator_requests"
 
 ATTR_CONFIGURE_ID = "configure_id"
@@ -54,6 +58,17 @@
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
+def _report_deprecation() -> None:
+    """Report use of the deprecated configurator integration."""
+    report_usage(
+        "uses the deprecated configurator integration, which should be replaced "
+        "by a config flow",
+        breaks_in_ha_version=_BREAKS_IN_HA_VERSION,
+        core_behavior=ReportBehavior.LOG,
+        exclude_integrations={DOMAIN},
+    )
+
+
 @async_callback
 def async_request_config(
     hass: HomeAssistant,
@@ -69,6 +84,38 @@ def async_request_config(
 ) -> str:
     """Create a new request for configuration.
 
+    Will return an ID to be used for subsequent calls.
+    """
+    _report_deprecation()
+    return _async_request_config(
+        hass,
+        name,
+        callback=callback,
+        description=description,
+        description_image=description_image,
+        submit_caption=submit_caption,
+        fields=fields,
+        link_name=link_name,
+        link_url=link_url,
+        entity_picture=entity_picture,
+    )
+
+
+@async_callback
+def _async_request_config(
+    hass: HomeAssistant,
+    name: str,
+    callback: ConfiguratorCallback | None = None,
+    description: str | None = None,
+    description_image: str | None = None,
+    submit_caption: str | None = None,
+    fields: list[dict[str, str]] | None = None,
+    link_name: str | None = None,
+    link_url: str | None = None,
+    entity_picture: str | None = None,
+) -> str:
+    """Create a new request for configuration.
+
     Will return an ID to be used for sequent calls.
     """
     if description and link_name is not None and link_url is not None:
@@ -97,8 +144,9 @@ def request_config(hass: HomeAssistant, *args: Any, **kwargs: Any) -> str:
 
     Will return an ID to be used for sequent calls.
     """
+    _report_deprecation()
     return run_callback_threadsafe(
-        hass.loop, ft.partial(async_request_config, hass, *args, **kwargs)
+        hass.loop, ft.partial(_async_request_config, hass, *args, **kwargs)
     ).result()
 
 

homeassistant/components/diagnostics/util.py

@@ -6,7 +6,7 @@
 import attr
 
 from homeassistant.core import callback
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 from homeassistant.helpers.entity_registry import RegistryEntry
 
 from .const import REDACTED
@@ -65,7 +65,7 @@ def _device_entry_filter(a: attr.Attribute, _: Any) -> bool:
 
 
 @callback
-def device_entry_as_dict(entry: DeviceEntry) -> dict[str, Any]:
+def device_entry_as_dict(entry: AnyDeviceEntry) -> dict[str, Any]:
     """Convert a device registry entry to a dict for diagnostics.
 
     This excludes internal fields that should not be exposed in diagnostics.

homeassistant/components/duco/manifest.json

@@ -13,7 +13,7 @@
   "iot_class": "local_polling",
   "loggers": ["duco_connectivity"],
   "quality_scale": "platinum",
-  "requirements": ["python-duco-connectivity==0.12.0"],
+  "requirements": ["python-duco-connectivity==0.13.1"],
   "zeroconf": [
     {
       "name": "duco [[][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][]].*",

homeassistant/components/ecowitt/diagnostics.py

@@ -3,14 +3,14 @@
 from typing import Any
 
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from . import EcowittConfigEntry
 from .const import DOMAIN
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: EcowittConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: EcowittConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device entry."""
     ecowitt = entry.runtime_data

homeassistant/components/fibaro/diagnostics.py

@@ -7,7 +7,7 @@
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from . import CONF_IMPORT_PLUGINS, FibaroConfigEntry
 
@@ -34,7 +34,7 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, config_entry: FibaroConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, config_entry: FibaroConfigEntry, device: AnyDeviceEntry
 ) -> Mapping[str, Any]:
     """Return diagnostics for a device."""
     controller = config_entry.runtime_data

homeassistant/components/frontend/manifest.json

@@ -11,6 +11,7 @@
     "file_upload",
     "http",
     "lovelace",
+    "map_tiles",
     "onboarding",
     "repairs",
     "search",

homeassistant/components/fully_kiosk/diagnostics.py

@@ -54,7 +54,7 @@
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: FullyKioskConfigEntry, device: dr.DeviceEntry
+    hass: HomeAssistant, entry: FullyKioskConfigEntry, device: dr.AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return device diagnostics."""
     coordinator = entry.runtime_data

homeassistant/components/heos/diagnostics.py

@@ -9,7 +9,7 @@
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from .const import ATTR_PASSWORD, ATTR_USERNAME, DOMAIN
 from .coordinator import HeosConfigEntry
@@ -66,7 +66,7 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, config_entry: HeosConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, config_entry: HeosConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device."""
     entity_registry = er.async_get(hass)

homeassistant/components/home_connect/diagnostics.py

@@ -5,7 +5,7 @@
 from aiohomeconnect.model import GetSetting, Status
 
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from .const import DOMAIN
 from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
@@ -53,7 +53,7 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: HomeConnectConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: HomeConnectConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device."""
     ha_id = next(

homeassistant/components/homee/diagnostics.py

@@ -11,7 +11,7 @@
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from . import DOMAIN, HomeeConfigEntry
 
@@ -42,7 +42,7 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: HomeeConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: HomeeConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device."""
 

homeassistant/components/homekit_controller/diagnostics.py

@@ -1,14 +1,14 @@
 """Diagnostics support for HomeKit Controller."""
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from aiohomekit.model.characteristics.characteristic_types import CharacteristicsTypes
 
 from homeassistant.components.diagnostics import REDACTED, async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry, DeviceEntry
 
 from .connection import HKDevice
 from .const import KNOWN_DEVICES
@@ -33,9 +33,13 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: ConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device entry."""
+    if TYPE_CHECKING:
+        # homekit_controller does not create child devices
+        assert isinstance(device, DeviceEntry)
+
     return _async_get_diagnostics(hass, entry, device)
 
 

homeassistant/components/hunterdouglas_powerview/diagnostics.py

@@ -11,7 +11,7 @@
 from homeassistant.const import ATTR_CONFIGURATION_URL, CONF_HOST
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry
 
 from .const import REDACT_HUB_ADDRESS, REDACT_MAC_ADDRESS, REDACT_SERIAL_NUMBER
 from .model import PowerviewConfigEntry
@@ -43,7 +43,7 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: PowerviewConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: PowerviewConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device entry."""
     data = _async_get_diagnostics(hass, entry)
@@ -71,7 +71,9 @@ def _async_get_diagnostics(
 
 
 @callback
-def _async_device_as_dict(hass: HomeAssistant, device: DeviceEntry) -> dict[str, Any]:
+def _async_device_as_dict(
+    hass: HomeAssistant, device: AnyDeviceEntry
+) -> dict[str, Any]:
     """Represent a Powerview device as a dictionary."""
 
     # Gather information how this device is represented in Home Assistant

homeassistant/components/husqvarna_automower/diagnostics.py

@@ -1,12 +1,12 @@
 """Diagnostics support for Husqvarna Automower."""
 
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
+from homeassistant.helpers.device_registry import AnyDeviceEntry, DeviceEntry
 
 from . import AutomowerConfigEntry
 from .const import DOMAIN
@@ -30,9 +30,13 @@ async def async_get_config_entry_diagnostics(
 
 
 async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: AutomowerConfigEntry, device: DeviceEntry
+    hass: HomeAssistant, entry: AutomowerConfigEntry, device: AnyDeviceEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a device entry."""
+    if TYPE_CHECKING:
+        # husqvarna_automower does not create child devices
+        assert isinstance(device, DeviceEntry)
+
     coordinator = entry.runtime_data
     for identifier in device.identifiers:
         if identifier[0] == DOMAIN:

homeassistant/components/iotawatt/const.py

@@ -5,7 +5,6 @@
 import httpx
 
 DOMAIN = "iotawatt"
-VOLT_AMPERE_REACTIVE = "VAR"
 VOLT_AMPERE_REACTIVE_HOURS = "VARh"
 
 CONNECTION_ERRORS = (KeyError, json.JSONDecodeError, httpx.HTTPError)

homeassistant/components/iotawatt/sensor.py

@@ -21,6 +21,7 @@
     UnitOfEnergy,
     UnitOfFrequency,
     UnitOfPower,
+    UnitOfReactivePower,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -29,7 +30,7 @@
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import dt as dt_util
 
-from .const import VOLT_AMPERE_REACTIVE, VOLT_AMPERE_REACTIVE_HOURS
+from .const import VOLT_AMPERE_REACTIVE_HOURS
 from .coordinator import IotawattConfigEntry, IotawattUpdater
 
 _LOGGER = logging.getLogger(__name__)
@@ -87,9 +88,9 @@ class IotaWattSensorEntityDescription(SensorEntityDescription):
     ),
     "VAR": IotaWattSensorEntityDescription(
         key="VAR",
-        native_unit_of_measurement=VOLT_AMPERE_REACTIVE,
+        native_unit_of_measurement=UnitOfReactivePower.VOLT_AMPERE_REACTIVE,
         state_class=SensorStateClass.MEASUREMENT,
-        icon="mdi:flash",
+        device_class=SensorDeviceClass.REACTIVE_POWER,
         entity_registry_enabled_default=False,
     ),
     "VARh": IotaWattSensorEntityDescription(