Add host and add-on resource usage to support package download

.core_files.yaml

@@ -91,7 +91,6 @@ components: &components
   - homeassistant/components/input_number/**
   - homeassistant/components/input_select/**
   - homeassistant/components/input_text/**
-  - homeassistant/components/labs/**
   - homeassistant/components/logbook/**
   - homeassistant/components/logger/**
   - homeassistant/components/lovelace/**

.github/workflows/ci.yaml

@@ -247,11 +247,17 @@ jobs:
       && github.event.inputs.audit-licenses-only != 'true'
     steps:
       - *checkout
-      - name: Register problem matchers
+      - name: Register yamllint problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/yamllint.json"
+      - name: Register check-json problem matcher
+        run: |
           echo "::add-matcher::.github/workflows/matchers/check-json.json"
+      - name: Register check executables problem matcher
+        run: |
           echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
+      - name: Register codespell problem matcher
+        run: |
           echo "::add-matcher::.github/workflows/matchers/codespell.json"
       - name: Run prek
         uses: j178/prek-action@9d6a3097e0c1865ecce00cfb89fe80f2ee91b547 # v1.0.12

.github/workflows/matchers/check-executables-have-shebangs.json

@@ -4,7 +4,7 @@
       "owner": "check-executables-have-shebangs",
       "pattern": [
         {
-          "regexp": "^(.+):\\s(marked executable but has no \\(or invalid\\) shebang!.*)$",
+          "regexp": "^(.+):\\s(.+)$",
           "file": 1,
           "message": 2
         }

.strict-typing

@@ -455,7 +455,6 @@ homeassistant.components.russound_rio.*
 homeassistant.components.ruuvi_gateway.*
 homeassistant.components.ruuvitag_ble.*
 homeassistant.components.samsungtv.*
-homeassistant.components.saunum.*
 homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.schlage.*

CODEOWNERS

@@ -1017,8 +1017,8 @@ build.json @home-assistant/supervisor
 /tests/components/mill/ @danielhiversen
 /homeassistant/components/min_max/ @gjohansson-ST
 /tests/components/min_max/ @gjohansson-ST
-/homeassistant/components/minecraft_server/ @elmurato @zachdeibert
-/tests/components/minecraft_server/ @elmurato @zachdeibert
+/homeassistant/components/minecraft_server/ @elmurato
+/tests/components/minecraft_server/ @elmurato
 /homeassistant/components/minio/ @tkislan
 /tests/components/minio/ @tkislan
 /homeassistant/components/moat/ @bdraco
@@ -1273,8 +1273,7 @@ build.json @home-assistant/supervisor
 /tests/components/prosegur/ @dgomes
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
-/homeassistant/components/proxmoxve/ @jhollowe @Corbeno @erwindouna
-/tests/components/proxmoxve/ @jhollowe @Corbeno @erwindouna
+/homeassistant/components/proxmoxve/ @jhollowe @Corbeno
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pterodactyl/ @elmurato

homeassistant/components/airobot/__init__.py

@@ -12,7 +12,6 @@ PLATFORMS: list[Platform] = [
     Platform.CLIMATE,
     Platform.NUMBER,
     Platform.SENSOR,
-    Platform.SWITCH,
 ]
 
 

homeassistant/components/airobot/climate.py

@@ -63,11 +63,6 @@ class AirobotClimate(AirobotEntity, ClimateEntity):
     _attr_min_temp = SETPOINT_TEMP_MIN
     _attr_max_temp = SETPOINT_TEMP_MAX
 
-    def __init__(self, coordinator) -> None:
-        """Initialize the climate entity."""
-        super().__init__(coordinator)
-        self._attr_unique_id = coordinator.data.status.device_id
-
     @property
     def _status(self) -> ThermostatStatus:
         """Get status from coordinator data."""

homeassistant/components/airobot/entity.py

@@ -24,6 +24,8 @@ class AirobotEntity(CoordinatorEntity[AirobotDataUpdateCoordinator]):
         status = coordinator.data.status
         settings = coordinator.data.settings
 
+        self._attr_unique_id = status.device_id
+
         connections = set()
         if (mac := coordinator.config_entry.data.get(CONF_MAC)) is not None:
             connections.add((CONNECTION_NETWORK_MAC, mac))

homeassistant/components/airobot/icons.json

@@ -9,14 +9,6 @@
       "hysteresis_band": {
         "default": "mdi:delta"
       }
-    },
-    "switch": {
-      "actuator_exercise_disabled": {
-        "default": "mdi:valve"
-      },
-      "child_lock": {
-        "default": "mdi:lock"
-      }
     }
   }
 }

homeassistant/components/airobot/strings.json

@@ -85,14 +85,6 @@
       "heating_uptime": {
         "name": "Heating uptime"
       }
-    },
-    "switch": {
-      "actuator_exercise_disabled": {
-        "name": "Actuator exercise disabled"
-      },
-      "child_lock": {
-        "name": "Child lock"
-      }
     }
   },
   "exceptions": {
@@ -113,12 +105,6 @@
     },
     "set_value_failed": {
       "message": "Failed to set value: {error}"
-    },
-    "switch_turn_off_failed": {
-      "message": "Failed to turn off {switch}."
-    },
-    "switch_turn_on_failed": {
-      "message": "Failed to turn on {switch}."
     }
   }
 }

homeassistant/components/airobot/switch.py

@@ -1,118 +0,0 @@
-"""Switch platform for Airobot thermostat."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from pyairobotrest.exceptions import AirobotError
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import AirobotConfigEntry
-from .const import DOMAIN
-from .coordinator import AirobotDataUpdateCoordinator
-from .entity import AirobotEntity
-
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirobotSwitchEntityDescription(SwitchEntityDescription):
-    """Describes Airobot switch entity."""
-
-    is_on_fn: Callable[[AirobotDataUpdateCoordinator], bool]
-    turn_on_fn: Callable[[AirobotDataUpdateCoordinator], Coroutine[Any, Any, None]]
-    turn_off_fn: Callable[[AirobotDataUpdateCoordinator], Coroutine[Any, Any, None]]
-
-
-SWITCH_TYPES: tuple[AirobotSwitchEntityDescription, ...] = (
-    AirobotSwitchEntityDescription(
-        key="child_lock",
-        translation_key="child_lock",
-        entity_category=EntityCategory.CONFIG,
-        is_on_fn=lambda coordinator: (
-            coordinator.data.settings.setting_flags.childlock_enabled
-        ),
-        turn_on_fn=lambda coordinator: coordinator.client.set_child_lock(True),
-        turn_off_fn=lambda coordinator: coordinator.client.set_child_lock(False),
-    ),
-    AirobotSwitchEntityDescription(
-        key="actuator_exercise_disabled",
-        translation_key="actuator_exercise_disabled",
-        entity_category=EntityCategory.CONFIG,
-        entity_registry_enabled_default=False,
-        is_on_fn=lambda coordinator: (
-            coordinator.data.settings.setting_flags.actuator_exercise_disabled
-        ),
-        turn_on_fn=lambda coordinator: coordinator.client.toggle_actuator_exercise(
-            True
-        ),
-        turn_off_fn=lambda coordinator: coordinator.client.toggle_actuator_exercise(
-            False
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AirobotConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Airobot switch entities."""
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AirobotSwitch(coordinator, description) for description in SWITCH_TYPES
-    )
-
-
-class AirobotSwitch(AirobotEntity, SwitchEntity):
-    """Representation of an Airobot switch."""
-
-    entity_description: AirobotSwitchEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirobotDataUpdateCoordinator,
-        description: AirobotSwitchEntityDescription,
-    ) -> None:
-        """Initialize the switch."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if the switch is on."""
-        return self.entity_description.is_on_fn(self.coordinator)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        try:
-            await self.entity_description.turn_on_fn(self.coordinator)
-        except AirobotError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="switch_turn_on_failed",
-                translation_placeholders={"switch": self.entity_description.key},
-            ) from err
-        await self.coordinator.async_request_refresh()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        try:
-            await self.entity_description.turn_off_fn(self.coordinator)
-        except AirobotError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="switch_turn_off_failed",
-                translation_placeholders={"switch": self.entity_description.key},
-            ) from err
-        await self.coordinator.async_request_refresh()

homeassistant/components/cloud/http_api.py

@@ -19,6 +19,7 @@ import attr
 from hass_nabucasa import AlreadyConnectedError, Cloud, auth
 from hass_nabucasa.const import STATE_DISCONNECTED
 from hass_nabucasa.voice_data import TTS_VOICES
+import psutil_home_assistant as ha_psutil
 import voluptuous as vol
 
 from homeassistant.components import websocket_api
@@ -27,6 +28,7 @@ from homeassistant.components.alexa import (
     errors as alexa_errors,
 )
 from homeassistant.components.google_assistant import helpers as google_helpers
+from homeassistant.components.hassio import get_addons_stats, get_supervisor_info
 from homeassistant.components.homeassistant import exposed_entities
 from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
 from homeassistant.components.http.data_validator import RequestDataValidator
@@ -37,6 +39,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.hassio import is_hassio
 from homeassistant.loader import (
     async_get_custom_components,
     async_get_loaded_integration,
@@ -571,6 +574,11 @@ class DownloadSupportPackageView(HomeAssistantView):
                 "</details>\n\n"
             )
 
+        markdown += await self._get_host_resources_markdown(hass)
+
+        if is_hassio(hass):
+            markdown += await self._get_addon_resources_markdown(hass)
+
         log_handler = hass.data[DATA_CLOUD_LOG_HANDLER]
         logs = "\n".join(await log_handler.get_logs(hass))
         markdown += (
@@ -584,6 +592,103 @@ class DownloadSupportPackageView(HomeAssistantView):
 
         return markdown
 
+    async def _get_host_resources_markdown(self, hass: HomeAssistant) -> str:
+        """Get host resource usage markdown using psutil."""
+
+        def _collect_system_stats() -> dict[str, Any]:
+            """Collect system stats."""
+            psutil_wrapper = ha_psutil.PsutilWrapper()
+            psutil_mod = psutil_wrapper.psutil
+
+            cpu_percent = psutil_mod.cpu_percent(interval=0.1)
+            memory = psutil_mod.virtual_memory()
+            disk = psutil_mod.disk_usage("/")
+
+            return {
+                "cpu_percent": cpu_percent,
+                "memory_total": memory.total,
+                "memory_used": memory.used,
+                "memory_available": memory.available,
+                "memory_percent": memory.percent,
+                "disk_total": disk.total,
+                "disk_used": disk.used,
+                "disk_free": disk.free,
+                "disk_percent": disk.percent,
+            }
+
+        markdown = ""
+        try:
+            stats = await hass.async_add_executor_job(_collect_system_stats)
+
+            markdown += "## Host resource usage\n\n"
+            markdown += "Resource | Value\n"
+            markdown += "--- | ---\n"
+
+            markdown += f"CPU usage | {stats['cpu_percent']}%\n"
+
+            memory_total_gb = round(stats["memory_total"] / (1024**3), 2)
+            memory_used_gb = round(stats["memory_used"] / (1024**3), 2)
+            memory_available_gb = round(stats["memory_available"] / (1024**3), 2)
+            markdown += f"Memory total | {memory_total_gb} GB\n"
+            markdown += (
+                f"Memory used | {memory_used_gb} GB ({stats['memory_percent']}%)\n"
+            )
+            markdown += f"Memory available | {memory_available_gb} GB\n"
+
+            disk_total_gb = round(stats["disk_total"] / (1024**3), 2)
+            disk_used_gb = round(stats["disk_used"] / (1024**3), 2)
+            disk_free_gb = round(stats["disk_free"] / (1024**3), 2)
+            markdown += f"Disk total | {disk_total_gb} GB\n"
+            markdown += f"Disk used | {disk_used_gb} GB ({stats['disk_percent']}%)\n"
+            markdown += f"Disk free | {disk_free_gb} GB\n"
+
+            markdown += "\n"
+        except Exception:  # noqa: BLE001
+            # Broad exception catch for robustness in support package generation
+            markdown += "## Host resource usage\n\n"
+            markdown += "Unable to collect host resource information\n\n"
+
+        return markdown
+
+    async def _get_addon_resources_markdown(self, hass: HomeAssistant) -> str:
+        """Get add-on resource usage markdown for hassio."""
+        markdown = ""
+        try:
+            supervisor_info = get_supervisor_info(hass) or {}
+            addons_stats = get_addons_stats(hass)
+            addons = supervisor_info.get("addons", [])
+
+            if addons:
+                markdown += "## Add-on resource usage\n\n"
+                markdown += "<details><summary>Add-on resources</summary>\n\n"
+                markdown += "Add-on | Version | State | CPU | Memory\n"
+                markdown += "--- | --- | --- | --- | ---\n"
+
+                for addon in addons:
+                    slug = addon.get("slug", "unknown")
+                    name = addon.get("name", slug)
+                    version = addon.get("version", "unknown")
+                    state = addon.get("state", "unknown")
+
+                    addon_stats = addons_stats.get(slug, {})
+                    cpu = addon_stats.get("cpu_percent")
+                    memory = addon_stats.get("memory_percent")
+
+                    cpu_str = f"{cpu}%" if cpu is not None else "N/A"
+                    memory_str = f"{memory}%" if memory is not None else "N/A"
+
+                    markdown += (
+                        f"{name} | {version} | {state} | {cpu_str} | {memory_str}\n"
+                    )
+
+                markdown += "\n</details>\n\n"
+        except Exception:  # noqa: BLE001
+            # Broad exception catch for robustness in support package generation
+            markdown += "## Add-on resource usage\n\n"
+            markdown += "Unable to collect add-on resource information\n\n"
+
+        return markdown
+
     async def get(self, request: web.Request) -> web.Response:
         """Download support package file."""
 

homeassistant/components/cloud/manifest.json

@@ -5,7 +5,8 @@
     "alexa",
     "assist_pipeline",
     "backup",
-    "google_assistant"
+    "google_assistant",
+    "hassio"
   ],
   "codeowners": ["@home-assistant/cloud"],
   "dependencies": ["auth", "http", "repairs", "webhook", "web_rtc"],
@@ -13,6 +14,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.9.0"],
+  "requirements": ["hass-nabucasa==1.9.0", "psutil-home-assistant==0.0.1"],
   "single_config_entry": true
 }

homeassistant/components/concord232/alarm_control_panel.py

@@ -49,11 +49,11 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Concord232 alarm control panel platform."""
-    name: str = config[CONF_NAME]
-    code: str | None = config.get(CONF_CODE)
-    mode: str = config[CONF_MODE]
-    host: str = config[CONF_HOST]
-    port: int = config[CONF_PORT]
+    name = config[CONF_NAME]
+    code = config.get(CONF_CODE)
+    mode = config[CONF_MODE]
+    host = config[CONF_HOST]
+    port = config[CONF_PORT]
 
     url = f"http://{host}:{port}"
 
@@ -72,7 +72,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
         | AlarmControlPanelEntityFeature.ARM_AWAY
     )
 
-    def __init__(self, url: str, name: str, code: str | None, mode: str) -> None:
+    def __init__(self, url, name, code, mode):
         """Initialize the Concord232 alarm panel."""
 
         self._attr_name = name
@@ -125,7 +125,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
             return
         self._alarm.arm("away")
 
-    def _validate_code(self, code: str | None, state: AlarmControlPanelState) -> bool:
+    def _validate_code(self, code, state):
         """Validate given code."""
         if self._code is None:
             return True

homeassistant/components/concord232/binary_sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import datetime
 import logging
-from typing import Any
 
 from concord232 import client as concord232_client
 import requests
@@ -30,7 +29,8 @@ CONF_ZONE_TYPES = "zone_types"
 
 DEFAULT_HOST = "localhost"
 DEFAULT_NAME = "Alarm"
-DEFAULT_PORT = 5007
+DEFAULT_PORT = "5007"
+DEFAULT_SSL = False
 
 SCAN_INTERVAL = datetime.timedelta(seconds=10)
 
@@ -56,10 +56,10 @@ def setup_platform(
 ) -> None:
     """Set up the Concord232 binary sensor platform."""
 
-    host: str = config[CONF_HOST]
-    port: int = config[CONF_PORT]
-    exclude: list[int] = config[CONF_EXCLUDE_ZONES]
-    zone_types: dict[int, BinarySensorDeviceClass] = config[CONF_ZONE_TYPES]
+    host = config[CONF_HOST]
+    port = config[CONF_PORT]
+    exclude = config[CONF_EXCLUDE_ZONES]
+    zone_types = config[CONF_ZONE_TYPES]
     sensors = []
 
     try:
@@ -84,6 +84,7 @@ def setup_platform(
         if zone["number"] not in exclude:
             sensors.append(
                 Concord232ZoneSensor(
+                    hass,
                     client,
                     zone,
                     zone_types.get(zone["number"], get_opening_type(zone)),
@@ -109,25 +110,26 @@ def get_opening_type(zone):
 class Concord232ZoneSensor(BinarySensorEntity):
     """Representation of a Concord232 zone as a sensor."""
 
-    def __init__(
-        self,
-        client: concord232_client.Client,
-        zone: dict[str, Any],
-        zone_type: BinarySensorDeviceClass,
-    ) -> None:
+    def __init__(self, hass, client, zone, zone_type):
         """Initialize the Concord232 binary sensor."""
+        self._hass = hass
         self._client = client
         self._zone = zone
         self._number = zone["number"]
-        self._attr_device_class = zone_type
+        self._zone_type = zone_type
 
     @property
-    def name(self) -> str:
+    def device_class(self) -> BinarySensorDeviceClass:
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._zone_type
+
+    @property
+    def name(self):
         """Return the name of the binary sensor."""
         return self._zone["name"]
 
     @property
-    def is_on(self) -> bool:
+    def is_on(self):
         """Return true if the binary sensor is on."""
         # True means "faulted" or "open" or "abnormal state"
         return bool(self._zone["state"] != "Normal")
@@ -143,5 +145,5 @@ class Concord232ZoneSensor(BinarySensorEntity):
 
         if hasattr(self._client, "zones"):
             self._zone = next(
-                x for x in self._client.zones if x["number"] == self._number
+                (x for x in self._client.zones if x["number"] == self._number), None
             )

homeassistant/components/egardia/__init__.py

@@ -18,7 +18,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util.hass_dict import HassKey
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,7 +35,7 @@ DEFAULT_REPORT_SERVER_PORT = 52010
 DEFAULT_VERSION = "GATE-01"
 DOMAIN = "egardia"
 
-EGARDIA_DEVICE: HassKey[egardiadevice.EgardiaDevice] = HassKey(DOMAIN)
+EGARDIA_DEVICE = "egardiadevice"
 EGARDIA_NAME = "egardianame"
 EGARDIA_REPORT_SERVER_CODES = "egardia_rs_codes"
 EGARDIA_REPORT_SERVER_ENABLED = "egardia_rs_enabled"

homeassistant/components/egardia/alarm_control_panel.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import logging
 
-from pythonegardia.egardiadevice import EgardiaDevice
 import requests
 
 from homeassistant.components.alarm_control_panel import (
@@ -12,7 +11,6 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntityFeature,
     AlarmControlPanelState,
 )
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -49,10 +47,10 @@ def setup_platform(
     if discovery_info is None:
         return
     device = EgardiaAlarm(
-        discovery_info[CONF_NAME],
+        discovery_info["name"],
         hass.data[EGARDIA_DEVICE],
         discovery_info[CONF_REPORT_SERVER_ENABLED],
-        discovery_info[CONF_REPORT_SERVER_CODES],
+        discovery_info.get(CONF_REPORT_SERVER_CODES),
         discovery_info[CONF_REPORT_SERVER_PORT],
     )
 
@@ -69,13 +67,8 @@ class EgardiaAlarm(AlarmControlPanelEntity):
     )
 
     def __init__(
-        self,
-        name: str,
-        egardiasystem: EgardiaDevice,
-        rs_enabled: bool,
-        rs_codes: dict[str, list[str]],
-        rs_port: int,
-    ) -> None:
+        self, name, egardiasystem, rs_enabled=False, rs_codes=None, rs_port=52010
+    ):
         """Initialize the Egardia alarm."""
         self._attr_name = name
         self._egardiasystem = egardiasystem
@@ -92,7 +85,9 @@ class EgardiaAlarm(AlarmControlPanelEntity):
     @property
     def should_poll(self) -> bool:
         """Poll if no report server is enabled."""
-        return not self._rs_enabled
+        if not self._rs_enabled:
+            return True
+        return False
 
     def handle_status_event(self, event):
         """Handle the Egardia system status event."""

homeassistant/components/egardia/binary_sensor.py

@@ -2,12 +2,11 @@
 
 from __future__ import annotations
 
-from pythonegardia.egardiadevice import EgardiaDevice
-
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -52,20 +51,30 @@ async def async_setup_platform(
 class EgardiaBinarySensor(BinarySensorEntity):
     """Represents a sensor based on an Egardia sensor (IR, Door Contact)."""
 
-    def __init__(
-        self,
-        sensor_id: str,
-        name: str,
-        egardia_system: EgardiaDevice,
-        device_class: BinarySensorDeviceClass | None,
-    ) -> None:
+    def __init__(self, sensor_id, name, egardia_system, device_class):
         """Initialize the sensor device."""
         self._id = sensor_id
-        self._attr_name = name
-        self._attr_device_class = device_class
+        self._name = name
+        self._state = None
+        self._device_class = device_class
         self._egardia_system = egardia_system
 
     def update(self) -> None:
         """Update the status."""
         egardia_input = self._egardia_system.getsensorstate(self._id)
-        self._attr_is_on = bool(egardia_input)
+        self._state = STATE_ON if egardia_input else STATE_OFF
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Whether the device is switched on."""
+        return self._state == STATE_ON
+
+    @property
+    def device_class(self) -> BinarySensorDeviceClass | None:
+        """Return the device class."""
+        return self._device_class

homeassistant/components/frontend/manifest.json

@@ -23,5 +23,5 @@
     "winter_mode": {}
   },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260107.2"]
+  "requirements": ["home-assistant-frontend==20260107.1"]
 }

homeassistant/components/google_generative_ai_conversation/manifest.json

@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/google_generative_ai_conversation",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["google-genai==1.59.0"]
+  "requirements": ["google-genai==1.56.0"]
 }

homeassistant/components/hdfury/button.py

@@ -19,8 +19,6 @@ from .const import DOMAIN
 from .coordinator import HDFuryConfigEntry
 from .entity import HDFuryEntity
 
-PARALLEL_UPDATES = 1
-
 
 @dataclass(kw_only=True, frozen=True)
 class HDFuryButtonEntityDescription(ButtonEntityDescription):

homeassistant/components/hdfury/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/hdfury",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["hdfury==1.3.1"]
 }

homeassistant/components/hdfury/quality_scale.yaml

@@ -35,11 +35,11 @@ rules:
   entity-unavailable: done
   integration-owner: done
   log-when-unavailable: done
-  parallel-updates: done
+  parallel-updates: todo
   reauthentication-flow:
     status: exempt
     comment: Integration has no authentication flow.
-  test-coverage: done
+  test-coverage: todo
 
   # Gold
   devices: done

homeassistant/components/hdfury/select.py

@@ -20,8 +20,6 @@ from .const import DOMAIN
 from .coordinator import HDFuryConfigEntry, HDFuryCoordinator
 from .entity import HDFuryEntity
 
-PARALLEL_UPDATES = 1
-
 
 @dataclass(kw_only=True, frozen=True)
 class HDFurySelectEntityDescription(SelectEntityDescription):
@@ -79,11 +77,13 @@ async def async_setup_entry(
 
     coordinator = entry.runtime_data
 
-    entities: list[HDFuryEntity] = [
-        HDFurySelect(coordinator, description)
-        for description in SELECT_PORTS
-        if description.key in coordinator.data.info
-    ]
+    entities: list[HDFuryEntity] = []
+
+    for description in SELECT_PORTS:
+        if description.key not in coordinator.data.info:
+            continue
+
+        entities.append(HDFurySelect(coordinator, description))
 
     # Add OPMODE select if present
     if "opmode" in coordinator.data.info:

homeassistant/components/hdfury/sensor.py

@@ -8,8 +8,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import HDFuryConfigEntry
 from .entity import HDFuryEntity
 
-PARALLEL_UPDATES = 0
-
 SENSORS: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="RX0",

homeassistant/components/hdfury/switch.py

@@ -16,8 +16,6 @@ from .const import DOMAIN
 from .coordinator import HDFuryConfigEntry
 from .entity import HDFuryEntity
 
-PARALLEL_UPDATES = 1
-
 
 @dataclass(kw_only=True, frozen=True)
 class HDFurySwitchEntityDescription(SwitchEntityDescription):

homeassistant/components/jvc_projector/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from jvcprojector import JvcProjector, JvcProjectorAuthError, JvcProjectorTimeoutError
+from jvcprojector import JvcProjector, JvcProjectorAuthError, JvcProjectorConnectError
 
 from homeassistant.const import (
     CONF_HOST,
@@ -11,9 +11,8 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
     Platform,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.entity_registry import RegistryEntry, async_migrate_entries
 
 from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 
@@ -29,8 +28,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: JVCConfigEntry) -> bool:
     )
 
     try:
-        await device.connect()
-    except JvcProjectorTimeoutError as err:
+        await device.connect(True)
+    except JvcProjectorConnectError as err:
         await device.disconnect()
         raise ConfigEntryNotReady(
             f"Unable to connect to {entry.data[CONF_HOST]}"
@@ -51,8 +50,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: JVCConfigEntry) -> bool:
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, disconnect)
     )
 
-    await async_migrate_entities(hass, entry, coordinator)
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -63,21 +60,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: JVCConfigEntry) -> bool
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         await entry.runtime_data.device.disconnect()
     return unload_ok
-
-
-async def async_migrate_entities(
-    hass: HomeAssistant,
-    config_entry: JVCConfigEntry,
-    coordinator: JvcProjectorDataUpdateCoordinator,
-) -> None:
-    """Migrate old entities as needed."""
-
-    @callback
-    def _update_entry(entry: RegistryEntry) -> dict[str, str] | None:
-        """Fix unique_id of power binary_sensor entry."""
-        if entry.domain == Platform.BINARY_SENSOR and ":" not in entry.unique_id:
-            if "_power" in entry.unique_id:
-                return {"new_unique_id": f"{coordinator.unique_id}_power"}
-        return None
-
-    await async_migrate_entries(hass, config_entry.entry_id, _update_entry)

homeassistant/components/jvc_projector/binary_sensor.py

@@ -2,17 +2,16 @@
 
 from __future__ import annotations
 
-from jvcprojector import command as cmd
+from jvcprojector import const
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import POWER
 from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
 
-ON_STATUS = (cmd.Power.ON, cmd.Power.WARMING)
+ON_STATUS = (const.ON, const.WARMING)
 
 
 async def async_setup_entry(
@@ -22,13 +21,14 @@ async def async_setup_entry(
 ) -> None:
     """Set up the JVC Projector platform from a config entry."""
     coordinator = entry.runtime_data
+
     async_add_entities([JvcBinarySensor(coordinator)])
 
 
 class JvcBinarySensor(JvcProjectorEntity, BinarySensorEntity):
     """The entity class for JVC Projector Binary Sensor."""
 
-    _attr_translation_key = "power"
+    _attr_translation_key = "jvc_power"
 
     def __init__(
         self,
@@ -36,9 +36,9 @@ class JvcBinarySensor(JvcProjectorEntity, BinarySensorEntity):
     ) -> None:
         """Initialize the JVC Projector sensor."""
         super().__init__(coordinator)
-        self._attr_unique_id = f"{coordinator.unique_id}_power"
+        self._attr_unique_id = f"{coordinator.device.mac}_power"
 
     @property
     def is_on(self) -> bool:
-        """Return true if the JVC Projector is on."""
-        return self.coordinator.data[POWER] in ON_STATUS
+        """Return true if the JVC is on."""
+        return self.coordinator.data["power"] in ON_STATUS

homeassistant/components/jvc_projector/config_flow.py

@@ -5,12 +5,7 @@ from __future__ import annotations
 from collections.abc import Mapping
 from typing import Any
 
-from jvcprojector import (
-    JvcProjector,
-    JvcProjectorAuthError,
-    JvcProjectorTimeoutError,
-    command as cmd,
-)
+from jvcprojector import JvcProjector, JvcProjectorAuthError, JvcProjectorConnectError
 from jvcprojector.projector import DEFAULT_PORT
 import voluptuous as vol
 
@@ -45,7 +40,7 @@ class JvcProjectorConfigFlow(ConfigFlow, domain=DOMAIN):
                 mac = await get_mac_address(host, port, password)
             except InvalidHost:
                 errors["base"] = "invalid_host"
-            except JvcProjectorTimeoutError:
+            except JvcProjectorConnectError:
                 errors["base"] = "cannot_connect"
             except JvcProjectorAuthError:
                 errors["base"] = "invalid_auth"
@@ -96,7 +91,7 @@ class JvcProjectorConfigFlow(ConfigFlow, domain=DOMAIN):
 
             try:
                 await get_mac_address(host, port, password)
-            except JvcProjectorTimeoutError:
+            except JvcProjectorConnectError:
                 errors["base"] = "cannot_connect"
             except JvcProjectorAuthError:
                 errors["base"] = "invalid_auth"
@@ -120,7 +115,7 @@ async def get_mac_address(host: str, port: int, password: str | None) -> str:
     """Get device mac address for config flow."""
     device = JvcProjector(host, port=port, password=password)
     try:
-        await device.connect()
-        return await device.get(cmd.MacAddress)
+        await device.connect(True)
     finally:
         await device.disconnect()
+    return device.mac

homeassistant/components/jvc_projector/const.py

@@ -3,7 +3,3 @@
 NAME = "JVC Projector"
 DOMAIN = "jvc_projector"
 MANUFACTURER = "JVC"
-
-POWER = "power"
-INPUT = "input"
-SOURCE = "source"

homeassistant/components/jvc_projector/coordinator.py

@@ -4,21 +4,22 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from jvcprojector import (
     JvcProjector,
     JvcProjectorAuthError,
-    JvcProjectorTimeoutError,
-    command as cmd,
+    JvcProjectorConnectError,
+    const,
 )
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import INPUT, NAME, POWER
+from .const import NAME
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,33 +46,26 @@ class JvcProjectorDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str]]):
             update_interval=INTERVAL_SLOW,
         )
 
-        self.device: JvcProjector = device
-
-        if TYPE_CHECKING:
-            assert config_entry.unique_id is not None
-        self.unique_id = config_entry.unique_id
+        self.device = device
+        self.unique_id = format_mac(device.mac)
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Get the latest state data."""
-        state: dict[str, str | None] = {
-            POWER: None,
-            INPUT: None,
-        }
-
         try:
-            state[POWER] = await self.device.get(cmd.Power)
-
-            if state[POWER] == cmd.Power.ON:
-                state[INPUT] = await self.device.get(cmd.Input)
-
-        except JvcProjectorTimeoutError as err:
+            state = await self.device.get_state()
+        except JvcProjectorConnectError as err:
             raise UpdateFailed(f"Unable to connect to {self.device.host}") from err
         except JvcProjectorAuthError as err:
             raise ConfigEntryAuthFailed("Password authentication failed") from err
 
-        if state[POWER] != cmd.Power.STANDBY:
+        old_interval = self.update_interval
+
+        if state[const.POWER] != const.STANDBY:
             self.update_interval = INTERVAL_FAST
         else:
             self.update_interval = INTERVAL_SLOW
 
+        if self.update_interval != old_interval:
+            _LOGGER.debug("Changed update interval to %s", self.update_interval)
+
         return state

homeassistant/components/jvc_projector/entity.py

@@ -26,7 +26,7 @@ class JvcProjectorEntity(CoordinatorEntity[JvcProjectorDataUpdateCoordinator]):
 
         self._attr_unique_id = coordinator.unique_id
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._attr_unique_id)},
+            identifiers={(DOMAIN, coordinator.unique_id)},
             name=NAME,
             model=self.device.model,
             manufacturer=MANUFACTURER,

homeassistant/components/jvc_projector/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["jvcprojector"],
-  "requirements": ["pyjvcprojector==2.0.0"]
+  "requirements": ["pyjvcprojector==1.1.3"]
 }

homeassistant/components/jvc_projector/remote.py

@@ -7,62 +7,54 @@ from collections.abc import Iterable
 import logging
 from typing import Any
 
-from jvcprojector import command as cmd
+from jvcprojector import const
 
 from homeassistant.components.remote import RemoteEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import POWER
 from .coordinator import JVCConfigEntry
 from .entity import JvcProjectorEntity
 
-COMMANDS: list[str] = [
-    cmd.Remote.MENU,
-    cmd.Remote.UP,
-    cmd.Remote.DOWN,
-    cmd.Remote.LEFT,
-    cmd.Remote.RIGHT,
-    cmd.Remote.OK,
-    cmd.Remote.BACK,
-    cmd.Remote.MPC,
-    cmd.Remote.HIDE,
-    cmd.Remote.INFO,
-    cmd.Remote.INPUT,
-    cmd.Remote.CMD,
-    cmd.Remote.ADVANCED_MENU,
-    cmd.Remote.PICTURE_MODE,
-    cmd.Remote.COLOR_PROFILE,
-    cmd.Remote.LENS_CONTROL,
-    cmd.Remote.SETTING_MEMORY,
-    cmd.Remote.GAMMA_SETTINGS,
-    cmd.Remote.HDMI1,
-    cmd.Remote.HDMI2,
-    cmd.Remote.MODE_1,
-    cmd.Remote.MODE_2,
-    cmd.Remote.MODE_3,
-    cmd.Remote.MODE_4,
-    cmd.Remote.MODE_5,
-    cmd.Remote.MODE_6,
-    cmd.Remote.MODE_7,
-    cmd.Remote.MODE_8,
-    cmd.Remote.MODE_9,
-    cmd.Remote.MODE_10,
-    cmd.Remote.GAMMA,
-    cmd.Remote.NATURAL,
-    cmd.Remote.CINEMA,
-    cmd.Remote.COLOR_TEMP,
-    cmd.Remote.ANAMORPHIC,
-    cmd.Remote.LENS_APERTURE,
-    cmd.Remote.V3D_FORMAT,
-]
-
-RENAMED_COMMANDS: dict[str, str] = {
-    "anamo": cmd.Remote.ANAMORPHIC,
-    "lens_ap": cmd.Remote.LENS_APERTURE,
-    "hdmi1": cmd.Remote.HDMI1,
-    "hdmi2": cmd.Remote.HDMI2,
+COMMANDS = {
+    "menu": const.REMOTE_MENU,
+    "up": const.REMOTE_UP,
+    "down": const.REMOTE_DOWN,
+    "left": const.REMOTE_LEFT,
+    "right": const.REMOTE_RIGHT,
+    "ok": const.REMOTE_OK,
+    "back": const.REMOTE_BACK,
+    "mpc": const.REMOTE_MPC,
+    "hide": const.REMOTE_HIDE,
+    "info": const.REMOTE_INFO,
+    "input": const.REMOTE_INPUT,
+    "cmd": const.REMOTE_CMD,
+    "advanced_menu": const.REMOTE_ADVANCED_MENU,
+    "picture_mode": const.REMOTE_PICTURE_MODE,
+    "color_profile": const.REMOTE_COLOR_PROFILE,
+    "lens_control": const.REMOTE_LENS_CONTROL,
+    "setting_memory": const.REMOTE_SETTING_MEMORY,
+    "gamma_settings": const.REMOTE_GAMMA_SETTINGS,
+    "hdmi_1": const.REMOTE_HDMI_1,
+    "hdmi_2": const.REMOTE_HDMI_2,
+    "mode_1": const.REMOTE_MODE_1,
+    "mode_2": const.REMOTE_MODE_2,
+    "mode_3": const.REMOTE_MODE_3,
+    "mode_4": const.REMOTE_MODE_4,
+    "mode_5": const.REMOTE_MODE_5,
+    "mode_6": const.REMOTE_MODE_6,
+    "mode_7": const.REMOTE_MODE_7,
+    "mode_8": const.REMOTE_MODE_8,
+    "mode_9": const.REMOTE_MODE_9,
+    "mode_10": const.REMOTE_MODE_10,
+    "lens_ap": const.REMOTE_LENS_AP,
+    "gamma": const.REMOTE_GAMMA,
+    "color_temp": const.REMOTE_COLOR_TEMP,
+    "natural": const.REMOTE_NATURAL,
+    "cinema": const.REMOTE_CINEMA,
+    "anamo": const.REMOTE_ANAMO,
+    "3d_format": const.REMOTE_3D_FORMAT,
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -85,34 +77,25 @@ class JvcProjectorRemote(JvcProjectorEntity, RemoteEntity):
 
     @property
     def is_on(self) -> bool:
-        """Return True if the entity is on."""
-        return self.coordinator.data[POWER] in (cmd.Power.ON, cmd.Power.WARMING)
+        """Return True if entity is on."""
+        return self.coordinator.data["power"] in [const.ON, const.WARMING]
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the device on."""
-        await self.device.set(cmd.Power, cmd.Power.ON)
+        await self.device.power_on()
         await asyncio.sleep(1)
         await self.coordinator.async_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the device off."""
-        await self.device.set(cmd.Power, cmd.Power.OFF)
+        await self.device.power_off()
         await asyncio.sleep(1)
         await self.coordinator.async_refresh()
 
     async def async_send_command(self, command: Iterable[str], **kwargs: Any) -> None:
         """Send a remote command to the device."""
-        for send_command in command:
-            # Legacy name replace
-            if send_command in RENAMED_COMMANDS:
-                send_command = RENAMED_COMMANDS[send_command]
-
-            # Legacy name fixup
-            if "_" in send_command:
-                send_command = send_command.replace("_", "-")
-
-            if send_command not in COMMANDS:
-                raise HomeAssistantError(f"{send_command} is not a known command")
-
-            _LOGGER.debug("Sending command '%s'", send_command)
-            await self.device.remote(send_command)
+        for cmd in command:
+            if cmd not in COMMANDS:
+                raise HomeAssistantError(f"{cmd} is not a known command")
+            _LOGGER.debug("Sending command '%s'", cmd)
+            await self.device.remote(COMMANDS[cmd])

homeassistant/components/jvc_projector/select.py

@@ -6,7 +6,7 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from typing import Final
 
-from jvcprojector import JvcProjector, command as cmd
+from jvcprojector import JvcProjector, const
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
 from homeassistant.core import HomeAssistant
@@ -23,12 +23,16 @@ class JvcProjectorSelectDescription(SelectEntityDescription):
     command: Callable[[JvcProjector, str], Awaitable[None]]
 
 
+OPTIONS: Final[dict[str, dict[str, str]]] = {
+    "input": {const.HDMI1: const.REMOTE_HDMI_1, const.HDMI2: const.REMOTE_HDMI_2}
+}
+
 SELECTS: Final[list[JvcProjectorSelectDescription]] = [
     JvcProjectorSelectDescription(
         key="input",
         translation_key="input",
-        options=[cmd.Input.HDMI1, cmd.Input.HDMI2],
-        command=lambda device, option: device.set(cmd.Input, option),
+        options=list(OPTIONS["input"]),
+        command=lambda device, option: device.remote(OPTIONS["input"][option]),
     )
 ]
 

homeassistant/components/jvc_projector/sensor.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from jvcprojector import command as cmd
+from jvcprojector import const
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -23,11 +23,11 @@ JVC_SENSORS = (
         device_class=SensorDeviceClass.ENUM,
         entity_category=EntityCategory.DIAGNOSTIC,
         options=[
-            cmd.Power.STANDBY,
-            cmd.Power.ON,
-            cmd.Power.WARMING,
-            cmd.Power.COOLING,
-            cmd.Power.ERROR,
+            const.STANDBY,
+            const.ON,
+            const.WARMING,
+            const.COOLING,
+            const.ERROR,
         ],
     ),
 )

homeassistant/components/jvc_projector/strings.json

@@ -35,7 +35,7 @@
   },
   "entity": {
     "binary_sensor": {
-      "power": {
+      "jvc_power": {
         "name": "[%key:component::binary_sensor::entity_component::power::name%]"
       }
     },
@@ -50,7 +50,7 @@
     },
     "sensor": {
       "jvc_power_status": {
-        "name": "Status",
+        "name": "Power status",
         "state": {
           "cooling": "Cooling",
           "error": "[%key:common::state::error%]",

homeassistant/components/knx/manifest.json

@@ -13,7 +13,7 @@
   "requirements": [
     "xknx==3.14.0",
     "xknxproject==3.8.2",
-    "knx-frontend==2026.1.15.112308"
+    "knx-frontend==2025.12.30.151231"
   ],
   "single_config_entry": true
 }

homeassistant/components/labs/__init__.py

@@ -18,11 +18,7 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import async_get_custom_components
 
 from .const import DOMAIN, LABS_DATA, STORAGE_KEY, STORAGE_VERSION
-from .helpers import (
-    async_is_preview_feature_enabled,
-    async_listen,
-    async_update_preview_feature,
-)
+from .helpers import async_is_preview_feature_enabled, async_listen
 from .models import (
     EventLabsUpdatedData,
     LabPreviewFeature,
@@ -41,7 +37,6 @@ __all__ = [
     "EventLabsUpdatedData",
     "async_is_preview_feature_enabled",
     "async_listen",
-    "async_update_preview_feature",
 ]
 
 

homeassistant/components/labs/helpers.py

@@ -61,32 +61,3 @@ def async_listen(
             listener()
 
     return hass.bus.async_listen(EVENT_LABS_UPDATED, _async_feature_updated)
-
-
-async def async_update_preview_feature(
-    hass: HomeAssistant,
-    domain: str,
-    preview_feature: str,
-    enabled: bool,
-) -> None:
-    """Update a lab preview feature state."""
-    labs_data = hass.data[LABS_DATA]
-
-    preview_feature_id = f"{domain}.{preview_feature}"
-
-    if preview_feature_id not in labs_data.preview_features:
-        raise ValueError(f"Preview feature {preview_feature_id} not found")
-
-    if enabled:
-        labs_data.data.preview_feature_status.add((domain, preview_feature))
-    else:
-        labs_data.data.preview_feature_status.discard((domain, preview_feature))
-
-    await labs_data.store.async_save(labs_data.data.to_store_format())
-
-    event_data: EventLabsUpdatedData = {
-        "domain": domain,
-        "preview_feature": preview_feature,
-        "enabled": enabled,
-    }
-    hass.bus.async_fire(EVENT_LABS_UPDATED, event_data)

homeassistant/components/labs/websocket_api.py

@@ -8,14 +8,12 @@ import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.components.backup import async_get_manager
+from homeassistant.const import EVENT_LABS_UPDATED
 from homeassistant.core import HomeAssistant, callback
 
 from .const import LABS_DATA
-from .helpers import (
-    async_is_preview_feature_enabled,
-    async_listen,
-    async_update_preview_feature,
-)
+from .helpers import async_is_preview_feature_enabled, async_listen
+from .models import EventLabsUpdatedData
 
 
 @callback
@@ -97,7 +95,19 @@ async def websocket_update_preview_feature(
             )
             return
 
-    await async_update_preview_feature(hass, domain, preview_feature, enabled)
+    if enabled:
+        labs_data.data.preview_feature_status.add((domain, preview_feature))
+    else:
+        labs_data.data.preview_feature_status.discard((domain, preview_feature))
+
+    await labs_data.store.async_save(labs_data.data.to_store_format())
+
+    event_data: EventLabsUpdatedData = {
+        "domain": domain,
+        "preview_feature": preview_feature,
+        "enabled": enabled,
+    }
+    hass.bus.async_fire(EVENT_LABS_UPDATED, event_data)
 
     connection.send_result(msg["id"])
 

homeassistant/components/london_air/sensor.py

@@ -27,7 +27,6 @@ SCAN_INTERVAL = timedelta(minutes=30)
 
 AUTHORITIES = [
     "Barking and Dagenham",
-    "Barnet",
     "Bexley",
     "Brent",
     "Bromley",
@@ -50,13 +49,11 @@ AUTHORITIES = [
     "Lambeth",
     "Lewisham",
     "Merton",
-    "Newham",
     "Redbridge",
     "Richmond",
     "Southwark",
     "Sutton",
     "Tower Hamlets",
-    "Waltham Forest",
     "Wandsworth",
     "Westminster",
 ]

homeassistant/components/mastodon/__init__.py

@@ -28,7 +28,7 @@ from .coordinator import MastodonConfigEntry, MastodonCoordinator, MastodonData
 from .services import async_setup_services
 from .utils import construct_mastodon_username, create_mastodon_client
 
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 

homeassistant/components/mastodon/binary_sensor.py

@@ -1,128 +0,0 @@
-"""Binary sensor platform for the Mastodon integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from enum import StrEnum
-
-from mastodon.Mastodon import Account
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import MastodonConfigEntry
-from .entity import MastodonEntity
-
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
-
-class MastodonBinarySensor(StrEnum):
-    """Mastodon binary sensors."""
-
-    BOT = "bot"
-    SUSPENDED = "suspended"
-    DISCOVERABLE = "discoverable"
-    LOCKED = "locked"
-    INDEXABLE = "indexable"
-    LIMITED = "limited"
-    MEMORIAL = "memorial"
-    MOVED = "moved"
-
-
-@dataclass(frozen=True, kw_only=True)
-class MastodonBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Mastodon binary sensor description."""
-
-    is_on_fn: Callable[[Account], bool | None]
-
-
-ENTITY_DESCRIPTIONS: tuple[MastodonBinarySensorEntityDescription, ...] = (
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.BOT,
-        translation_key=MastodonBinarySensor.BOT,
-        is_on_fn=lambda account: account.bot,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.DISCOVERABLE,
-        translation_key=MastodonBinarySensor.DISCOVERABLE,
-        is_on_fn=lambda account: account.discoverable,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.LOCKED,
-        translation_key=MastodonBinarySensor.LOCKED,
-        is_on_fn=lambda account: account.locked,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.MOVED,
-        translation_key=MastodonBinarySensor.MOVED,
-        is_on_fn=lambda account: account.moved is not None,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.INDEXABLE,
-        translation_key=MastodonBinarySensor.INDEXABLE,
-        is_on_fn=lambda account: account.indexable,
-        entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.LIMITED,
-        translation_key=MastodonBinarySensor.LIMITED,
-        is_on_fn=lambda account: account.limited is True,
-        entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.MEMORIAL,
-        translation_key=MastodonBinarySensor.MEMORIAL,
-        is_on_fn=lambda account: account.memorial is True,
-        entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    MastodonBinarySensorEntityDescription(
-        key=MastodonBinarySensor.SUSPENDED,
-        translation_key=MastodonBinarySensor.SUSPENDED,
-        is_on_fn=lambda account: account.suspended is True,
-        entity_registry_enabled_default=False,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: MastodonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the binary sensor platform."""
-    coordinator = entry.runtime_data.coordinator
-
-    async_add_entities(
-        MastodonBinarySensorEntity(
-            coordinator=coordinator,
-            entity_description=entity_description,
-            data=entry,
-        )
-        for entity_description in ENTITY_DESCRIPTIONS
-    )
-
-
-class MastodonBinarySensorEntity(MastodonEntity, BinarySensorEntity):
-    """Mastodon binary sensor entity."""
-
-    entity_description: MastodonBinarySensorEntityDescription
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return true if the binary sensor is on."""
-        return self.entity_description.is_on_fn(self.coordinator.data)

homeassistant/components/mastodon/icons.json

@@ -1,18 +1,5 @@
 {
   "entity": {
-    "binary_sensor": {
-      "bot": { "default": "mdi:robot" },
-      "discoverable": { "default": "mdi:magnify-scan" },
-      "indexable": { "default": "mdi:search-web" },
-      "limited": { "default": "mdi:account-cancel" },
-      "locked": {
-        "default": "mdi:account-lock",
-        "state": { "off": "mdi:account-lock-open" }
-      },
-      "memorial": { "default": "mdi:candle" },
-      "moved": { "default": "mdi:truck-delivery" },
-      "suspended": { "default": "mdi:account-off" }
-    },
     "sensor": {
       "followers": {
         "default": "mdi:account-multiple"

homeassistant/components/mastodon/strings.json

@@ -26,16 +26,6 @@
     }
   },
   "entity": {
-    "binary_sensor": {
-      "bot": { "name": "Bot" },
-      "discoverable": { "name": "Discoverable" },
-      "indexable": { "name": "Indexable" },
-      "limited": { "name": "Limited" },
-      "locked": { "name": "Locked" },
-      "memorial": { "name": "Memorial" },
-      "moved": { "name": "Moved" },
-      "suspended": { "name": "Suspended" }
-    },
     "sensor": {
       "followers": {
         "name": "Followers",

homeassistant/components/matter/binary_sensor.py

@@ -489,7 +489,6 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.BINARY_SENSOR,
         entity_description=MatterBinarySensorEntityDescription(
             key="WindowCoveringConfigStatusOperational",
-            translation_key="config_status_operational",
             device_class=BinarySensorDeviceClass.PROBLEM,
             entity_category=EntityCategory.DIAGNOSTIC,
             # unset Operational bit from ConfigStatus bitmap means problem

homeassistant/components/matter/sensor.py

@@ -442,9 +442,6 @@ DISCOVERY_SCHEMAS = [
             key="PowerSourceBatVoltage",
             translation_key="battery_voltage",
             native_unit_of_measurement=UnitOfElectricPotential.MILLIVOLT,
-            # Battery voltages are low-voltage diagnostics; use 2 decimals in volts
-            # to provide finer granularity than mains-level voltage sensors.
-            suggested_display_precision=2,
             suggested_unit_of_measurement=UnitOfElectricPotential.VOLT,
             device_class=SensorDeviceClass.VOLTAGE,
             entity_category=EntityCategory.DIAGNOSTIC,

homeassistant/components/matter/strings.json

@@ -56,9 +56,6 @@
       "boost_state": {
         "name": "Boost state"
       },
-      "config_status_operational": {
-        "name": "Configuration status"
-      },
       "dishwasher_alarm_inflow": {
         "name": "Inflow alarm"
       },

homeassistant/components/maxcube/climate.py

@@ -192,7 +192,7 @@ class MaxCubeClimate(ClimateEntity):
         self._set_target(None, temp)
 
     @property
-    def preset_mode(self) -> str:
+    def preset_mode(self):
         """Return the current preset mode."""
         if self._device.mode == MAX_DEVICE_MODE_MANUAL:
             if self._device.target_temperature == self._device.comfort_temperature:

homeassistant/components/mealie/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "platinum",
-  "requirements": ["aiomealie==1.2.0"]
+  "requirements": ["aiomealie==1.1.1"]
 }

homeassistant/components/minecraft_server/api.py

@@ -5,12 +5,8 @@ from enum import StrEnum
 import logging
 
 from dns.resolver import LifetimeTimeout
-from mcstatus import BedrockServer, JavaServer, LegacyServer
-from mcstatus.responses import (
-    BedrockStatusResponse,
-    JavaStatusResponse,
-    LegacyStatusResponse,
-)
+from mcstatus import BedrockServer, JavaServer
+from mcstatus.responses import BedrockStatusResponse, JavaStatusResponse
 
 from homeassistant.core import HomeAssistant
 
@@ -47,7 +43,6 @@ class MinecraftServerType(StrEnum):
 
     BEDROCK_EDITION = "Bedrock Edition"
     JAVA_EDITION = "Java Edition"
-    LEGACY_JAVA_EDITION = "Legacy Java Edition"
 
 
 class MinecraftServerAddressError(Exception):
@@ -65,7 +60,7 @@ class MinecraftServerNotInitializedError(Exception):
 class MinecraftServer:
     """Minecraft Server wrapper class for 3rd party library mcstatus."""
 
-    _server: BedrockServer | JavaServer | LegacyServer | None
+    _server: BedrockServer | JavaServer | None
 
     def __init__(
         self, hass: HomeAssistant, server_type: MinecraftServerType, address: str
@@ -81,12 +76,10 @@ class MinecraftServer:
         try:
             if self._server_type == MinecraftServerType.JAVA_EDITION:
                 self._server = await JavaServer.async_lookup(self._address)
-            elif self._server_type == MinecraftServerType.BEDROCK_EDITION:
+            else:
                 self._server = await self._hass.async_add_executor_job(
                     BedrockServer.lookup, self._address
                 )
-            else:
-                self._server = await LegacyServer.async_lookup(self._address)
         except (ValueError, LifetimeTimeout) as error:
             raise MinecraftServerAddressError(
                 f"Lookup of '{self._address}' failed: {self._get_error_message(error)}"
@@ -119,9 +112,7 @@ class MinecraftServer:
 
     async def async_get_data(self) -> MinecraftServerData:
         """Get updated data from the server, supporting both Java and Bedrock Edition servers."""
-        status_response: (
-            BedrockStatusResponse | JavaStatusResponse | LegacyStatusResponse
-        )
+        status_response: BedrockStatusResponse | JavaStatusResponse
 
         if self._server is None:
             raise MinecraftServerNotInitializedError(
@@ -137,10 +128,8 @@ class MinecraftServer:
 
         if isinstance(status_response, JavaStatusResponse):
             data = self._extract_java_data(status_response)
-        elif isinstance(status_response, BedrockStatusResponse):
-            data = self._extract_bedrock_data(status_response)
         else:
-            data = self._extract_legacy_data(status_response)
+            data = self._extract_bedrock_data(status_response)
 
         return data
 
@@ -180,19 +169,6 @@ class MinecraftServer:
             map_name=status_response.map_name,
         )
 
-    def _extract_legacy_data(
-        self, status_response: LegacyStatusResponse
-    ) -> MinecraftServerData:
-        """Extract legacy Java Edition server data out of status response."""
-        return MinecraftServerData(
-            latency=status_response.latency,
-            motd=status_response.motd.to_plain(),
-            players_max=status_response.players.max,
-            players_online=status_response.players.online,
-            protocol_version=status_response.version.protocol,
-            version=status_response.version.name,
-        )
-
     def _get_error_message(self, error: BaseException) -> str:
         """Get error message of an exception."""
         if not str(error):

homeassistant/components/minecraft_server/config_flow.py

@@ -84,5 +84,4 @@ class MinecraftServerConfigFlow(ConfigFlow, domain=DOMAIN):
                 }
             ),
             errors=errors,
-            description_placeholders={"minimum_minecraft_version": "1.4"},
         )

homeassistant/components/minecraft_server/manifest.json

@@ -1,12 +1,12 @@
 {
   "domain": "minecraft_server",
   "name": "Minecraft Server",
-  "codeowners": ["@elmurato", "@zachdeibert"],
+  "codeowners": ["@elmurato"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/minecraft_server",
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["dnspython", "mcstatus"],
   "quality_scale": "silver",
-  "requirements": ["mcstatus==12.1.0"]
+  "requirements": ["mcstatus==12.0.6"]
 }

homeassistant/components/minecraft_server/sensor.py

@@ -65,7 +65,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -77,7 +76,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
@@ -91,7 +89,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
         entity_registry_enabled_default=False,
     ),
@@ -105,7 +102,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -117,7 +113,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
     ),
     MinecraftServerSensorEntityDescription(
@@ -129,7 +124,6 @@ SENSOR_DESCRIPTIONS = [
         supported_server_types={
             MinecraftServerType.JAVA_EDITION,
             MinecraftServerType.BEDROCK_EDITION,
-            MinecraftServerType.LEGACY_JAVA_EDITION,
         },
     ),
     MinecraftServerSensorEntityDescription(

homeassistant/components/minecraft_server/strings.json

@@ -4,7 +4,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "error": {
-      "cannot_connect": "Failed to connect to server. Please check the address and try again. If a port was provided, it must be within a valid range. If you are running a Minecraft Java Edition server, ensure that it is at least version {minimum_minecraft_version}."
+      "cannot_connect": "Failed to connect to server. Please check the address and try again. If a port was provided, it must be within a valid range. If you are running a Minecraft Java Edition server, ensure that it is at least version 1.7."
     },
     "step": {
       "user": {

homeassistant/components/ness_alarm/__init__.py

@@ -1,8 +1,8 @@
 """Support for Ness D8X/D16X devices."""
 
+from collections import namedtuple
 import datetime
 import logging
-from typing import NamedTuple
 
 from nessclient import ArmingMode, ArmingState, Client
 import voluptuous as vol
@@ -25,12 +25,11 @@ from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util.hass_dict import HassKey
 
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "ness_alarm"
-DATA_NESS: HassKey[Client] = HassKey(DOMAIN)
+DATA_NESS = "ness_alarm"
 
 CONF_DEVICE_PORT = "port"
 CONF_INFER_ARMING_STATE = "infer_arming_state"
@@ -45,13 +44,7 @@ DEFAULT_INFER_ARMING_STATE = False
 SIGNAL_ZONE_CHANGED = "ness_alarm.zone_changed"
 SIGNAL_ARMING_STATE_CHANGED = "ness_alarm.arming_state_changed"
 
-
-class ZoneChangedData(NamedTuple):
-    """Data for a zone state change."""
-
-    zone_id: int
-    state: bool
-
+ZoneChangedData = namedtuple("ZoneChangedData", ["zone_id", "state"])  # noqa: PYI024
 
 DEFAULT_ZONE_TYPE = BinarySensorDeviceClass.MOTION
 ZONE_SCHEMA = vol.Schema(

homeassistant/components/ness_alarm/binary_sensor.py

@@ -33,14 +33,18 @@ async def async_setup_platform(
 
     configured_zones = discovery_info[CONF_ZONES]
 
-    async_add_entities(
-        NessZoneBinarySensor(
-            zone_id=zone_config[CONF_ZONE_ID],
-            name=zone_config[CONF_ZONE_NAME],
-            zone_type=zone_config[CONF_ZONE_TYPE],
+    devices = []
+
+    for zone_config in configured_zones:
+        zone_type = zone_config[CONF_ZONE_TYPE]
+        zone_name = zone_config[CONF_ZONE_NAME]
+        zone_id = zone_config[CONF_ZONE_ID]
+        device = NessZoneBinarySensor(
+            zone_id=zone_id, name=zone_name, zone_type=zone_type
         )
-        for zone_config in configured_zones
-    )
+        devices.append(device)
+
+    async_add_entities(devices)
 
 
 class NessZoneBinarySensor(BinarySensorEntity):
@@ -48,14 +52,12 @@ class NessZoneBinarySensor(BinarySensorEntity):
 
     _attr_should_poll = False
 
-    def __init__(
-        self, zone_id: int, name: str, zone_type: BinarySensorDeviceClass
-    ) -> None:
+    def __init__(self, zone_id, name, zone_type):
         """Initialize the binary_sensor."""
         self._zone_id = zone_id
-        self._attr_name = name
-        self._attr_device_class = zone_type
-        self._attr_is_on = False
+        self._name = name
+        self._type = zone_type
+        self._state = 0
 
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""
@@ -65,9 +67,24 @@ class NessZoneBinarySensor(BinarySensorEntity):
             )
         )
 
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state == 1
+
+    @property
+    def device_class(self) -> BinarySensorDeviceClass:
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._type
+
     @callback
-    def _handle_zone_change(self, data: ZoneChangedData) -> None:
+    def _handle_zone_change(self, data: ZoneChangedData):
         """Handle zone state update."""
         if self._zone_id == data.zone_id:
-            self._attr_is_on = data.state
+            self._state = data.state
             self.async_write_ha_state()

homeassistant/components/nexia/climate.py

@@ -225,7 +225,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):
         self._signal_thermostat_update()
 
     @property
-    def preset_mode(self) -> str | None:
+    def preset_mode(self):
         """Preset that is active."""
         return self._zone.get_preset()
 

homeassistant/components/nina/quality_scale.yaml

@@ -47,8 +47,10 @@ rules:
   test-coverage:
     status: todo
     comment: |
+      Patch the library instead of the HTTP requests
       Create a shared fixture for the mock config entry
       Use init_integration in tests
+      Evaluate the need of test_config_entry_not_ready
 
   # Gold
   devices: done

homeassistant/components/nuheat/climate.py

@@ -154,7 +154,7 @@ class NuHeatThermostat(CoordinatorEntity, ClimateEntity):
         return nuheat_to_fahrenheit(self._target_temperature)
 
     @property
-    def preset_mode(self) -> str:
+    def preset_mode(self):
         """Return current preset mode."""
         return SCHEDULE_MODE_TO_PRESET_MODE_MAP.get(self._schedule_mode, PRESET_RUN)
 

homeassistant/components/nx584/binary_sensor.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import logging
 import threading
 import time
-from typing import Any
 
 from nx584 import client as nx584_client
 import requests
@@ -29,7 +28,8 @@ CONF_EXCLUDE_ZONES = "exclude_zones"
 CONF_ZONE_TYPES = "zone_types"
 
 DEFAULT_HOST = "localhost"
-DEFAULT_PORT = 5007
+DEFAULT_PORT = "5007"
+DEFAULT_SSL = False
 
 ZONE_TYPES_SCHEMA = vol.Schema({cv.positive_int: BINARY_SENSOR_DEVICE_CLASSES_SCHEMA})
 
@@ -53,10 +53,10 @@ def setup_platform(
 ) -> None:
     """Set up the NX584 binary sensor platform."""
 
-    host: str = config[CONF_HOST]
-    port: int = config[CONF_PORT]
-    exclude: list[int] = config[CONF_EXCLUDE_ZONES]
-    zone_types: dict[int, BinarySensorDeviceClass] = config[CONF_ZONE_TYPES]
+    host = config[CONF_HOST]
+    port = config[CONF_PORT]
+    exclude = config[CONF_EXCLUDE_ZONES]
+    zone_types = config[CONF_ZONE_TYPES]
 
     try:
         client = nx584_client.Client(f"http://{host}:{port}")
@@ -90,12 +90,15 @@ class NX584ZoneSensor(BinarySensorEntity):
 
     _attr_should_poll = False
 
-    def __init__(
-        self, zone: dict[str, Any], zone_type: BinarySensorDeviceClass
-    ) -> None:
+    def __init__(self, zone, zone_type):
         """Initialize the nx594 binary sensor."""
         self._zone = zone
-        self._attr_device_class = zone_type
+        self._zone_type = zone_type
+
+    @property
+    def device_class(self) -> BinarySensorDeviceClass:
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._zone_type
 
     @property
     def name(self):
@@ -109,7 +112,7 @@ class NX584ZoneSensor(BinarySensorEntity):
         return self._zone["state"]
 
     @property
-    def extra_state_attributes(self) -> dict[str, Any]:
+    def extra_state_attributes(self):
         """Return the state attributes."""
         return {
             "zone_number": self._zone["number"],

homeassistant/components/oasa_telematics/sensor.py

@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 import logging
 from operator import itemgetter
-from typing import Any
 
 import oasatelematics
 import voluptuous as vol
@@ -56,9 +55,9 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the OASA Telematics sensor."""
-    name: str = config[CONF_NAME]
-    stop_id: str = config[CONF_STOP_ID]
-    route_id: str = config[CONF_ROUTE_ID]
+    name = config[CONF_NAME]
+    stop_id = config[CONF_STOP_ID]
+    route_id = config.get(CONF_ROUTE_ID)
 
     data = OASATelematicsData(stop_id, route_id)
 
@@ -69,31 +68,42 @@ class OASATelematicsSensor(SensorEntity):
     """Implementation of the OASA Telematics sensor."""
 
     _attr_attribution = "Data retrieved from telematics.oasa.gr"
-    _attr_device_class = SensorDeviceClass.TIMESTAMP
     _attr_icon = "mdi:bus"
 
-    def __init__(
-        self, data: OASATelematicsData, stop_id: str, route_id: str, name: str
-    ) -> None:
+    def __init__(self, data, stop_id, route_id, name):
         """Initialize the sensor."""
         self.data = data
-        self._attr_name = name
+        self._name = name
         self._stop_id = stop_id
         self._route_id = route_id
-        self._name_data: dict[str, Any] | None = None
-        self._times: list[dict[str, Any]] | None = None
+        self._name_data = self._times = self._state = None
 
     @property
-    def extra_state_attributes(self) -> dict[str, Any]:
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def device_class(self) -> SensorDeviceClass:
+        """Return the class of this sensor."""
+        return SensorDeviceClass.TIMESTAMP
+
+    @property
+    def native_value(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def extra_state_attributes(self):
         """Return the state attributes."""
         params = {}
         if self._times is not None:
             next_arrival_data = self._times[0]
             if ATTR_NEXT_ARRIVAL in next_arrival_data:
-                next_arrival: datetime = next_arrival_data[ATTR_NEXT_ARRIVAL]
+                next_arrival = next_arrival_data[ATTR_NEXT_ARRIVAL]
                 params.update({ATTR_NEXT_ARRIVAL: next_arrival.isoformat()})
             if len(self._times) > 1:
-                second_next_arrival_time: datetime = self._times[1][ATTR_NEXT_ARRIVAL]
+                second_next_arrival_time = self._times[1][ATTR_NEXT_ARRIVAL]
                 if second_next_arrival_time is not None:
                     second_arrival = second_next_arrival_time
                     params.update(
@@ -105,13 +115,12 @@ class OASATelematicsSensor(SensorEntity):
                     ATTR_STOP_ID: self._stop_id,
                 }
             )
-        if self._name_data is not None:
-            params.update(
-                {
-                    ATTR_ROUTE_NAME: self._name_data[ATTR_ROUTE_NAME],
-                    ATTR_STOP_NAME: self._name_data[ATTR_STOP_NAME],
-                }
-            )
+        params.update(
+            {
+                ATTR_ROUTE_NAME: self._name_data[ATTR_ROUTE_NAME],
+                ATTR_STOP_NAME: self._name_data[ATTR_STOP_NAME],
+            }
+        )
         return {k: v for k, v in params.items() if v}
 
     def update(self) -> None:
@@ -121,7 +130,7 @@ class OASATelematicsSensor(SensorEntity):
         self._name_data = self.data.name_data
         next_arrival_data = self._times[0]
         if ATTR_NEXT_ARRIVAL in next_arrival_data:
-            self._attr_native_value = next_arrival_data[ATTR_NEXT_ARRIVAL]
+            self._state = next_arrival_data[ATTR_NEXT_ARRIVAL]
 
 
 class OASATelematicsData:

homeassistant/components/openai_conversation/__init__.py

@@ -25,7 +25,6 @@ from homeassistant.core import (
     SupportsResponse,
 )
 from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
     ConfigEntryNotReady,
     HomeAssistantError,
     ServiceValidationError,
@@ -97,9 +96,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 response_format="url",
                 n=1,
             )
-        except openai.AuthenticationError as err:
-            entry.async_start_reauth(hass)
-            raise HomeAssistantError("Authentication error") from err
         except openai.OpenAIError as err:
             raise HomeAssistantError(f"Error generating image: {err}") from err
 
@@ -183,9 +179,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
         try:
             response: Response = await client.responses.create(**model_args)
-        except openai.AuthenticationError as err:
-            entry.async_start_reauth(hass)
-            raise HomeAssistantError("Authentication error") from err
+
         except openai.OpenAIError as err:
             raise HomeAssistantError(f"Error generating content: {err}") from err
         except FileNotFoundError as err:
@@ -251,7 +245,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: OpenAIConfigEntry) -> bo
     try:
         await hass.async_add_executor_job(client.with_options(timeout=10.0).models.list)
     except openai.AuthenticationError as err:
-        raise ConfigEntryAuthFailed(err) from err
+        LOGGER.error("Invalid API key: %s", err)
+        return False
     except openai.OpenAIError as err:
         raise ConfigEntryNotReady(err) from err
 
@@ -264,7 +259,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: OpenAIConfigEntry) -> bo
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: OpenAIConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload OpenAI."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
@@ -285,7 +280,7 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
     if not any(entry.version == 1 for entry in entries):
         return
 
-    api_keys_entries: dict[str, tuple[OpenAIConfigEntry, bool]] = {}
+    api_keys_entries: dict[str, tuple[ConfigEntry, bool]] = {}
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
 

homeassistant/components/openai_conversation/ai_task.py

@@ -10,6 +10,7 @@ from typing import TYPE_CHECKING
 from openai.types.responses.response_output_item import ImageGenerationCall
 
 from homeassistant.components import ai_task, conversation
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -34,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: OpenAIConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AI Task entities."""

homeassistant/components/openai_conversation/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 import json
 import logging
 from typing import Any
@@ -13,7 +12,6 @@ from voluptuous_openapi import convert
 
 from homeassistant.components.zone import ENTITY_ID_HOME
 from homeassistant.config_entries import (
-    SOURCE_REAUTH,
     ConfigEntry,
     ConfigEntryState,
     ConfigFlow,
@@ -129,10 +127,6 @@ class OpenAIConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                if self.source == SOURCE_REAUTH:
-                    return self.async_update_reload_and_abort(
-                        self._get_reauth_entry(), data_updates=user_input
-                    )
                 return self.async_create_entry(
                     title="ChatGPT",
                     data=user_input,
@@ -163,23 +157,6 @@ class OpenAIConfigFlow(ConfigFlow, domain=DOMAIN):
             },
         )
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Dialog that informs the user that reauth is required."""
-        if not user_input:
-            return self.async_show_form(
-                step_id="reauth_confirm", data_schema=STEP_USER_DATA_SCHEMA
-            )
-
-        return await self.async_step_user(user_input)
-
     @classmethod
     @callback
     def async_get_supported_subentry_types(

homeassistant/components/openai_conversation/const.py

@@ -89,8 +89,6 @@ UNSUPPORTED_EXTENDED_CACHE_RETENTION_MODELS: list[str] = [
     "gpt-3.5",
     "gpt-4-turbo",
     "gpt-4o",
-    "gpt-4.1-mini",
-    "gpt-4.1-nano",
     "gpt-5-mini",
     "gpt-5-nano",
 ]

homeassistant/components/openai_conversation/strings.json

@@ -1,8 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -10,15 +9,6 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
-      "reauth_confirm": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        },
-        "data_description": {
-          "api_key": "[%key:component::openai_conversation::config::step::user::data_description::api_key%]"
-        },
-        "description": "Reauthentication required. Please enter your updated API key."
-      },
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"

homeassistant/components/proxmoxve/__init__.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from datetime import timedelta
-import logging
 from typing import Any
 
 from proxmoxer import AuthenticationError, ProxmoxAPI
@@ -11,7 +10,6 @@ import requests.exceptions
 from requests.exceptions import ConnectTimeout, SSLError
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -20,29 +18,26 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
     Platform,
 )
-from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, issue_registry as ir
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from .common import (
-    ProxmoxClient,
-    ResourceException,
-    call_api_container_vm,
-    parse_api_container_vm,
-)
+from .common import ProxmoxClient, call_api_container_vm, parse_api_container_vm
 from .const import (
+    _LOGGER,
     CONF_CONTAINERS,
     CONF_NODE,
     CONF_NODES,
     CONF_REALM,
     CONF_VMS,
+    COORDINATORS,
     DEFAULT_PORT,
     DEFAULT_REALM,
     DEFAULT_VERIFY_SSL,
     DOMAIN,
+    PROXMOX_CLIENTS,
     TYPE_CONTAINER,
     TYPE_VM,
     UPDATE_INTERVAL,
@@ -50,10 +45,6 @@ from .const import (
 
 PLATFORMS = [Platform.BINARY_SENSOR]
 
-type ProxmoxConfigEntry = ConfigEntry[
-    dict[str, dict[str, dict[int, DataUpdateCoordinator[dict[str, Any] | None]]]]
-]
-
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: vol.All(
@@ -93,154 +84,109 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Import the Proxmox configuration from YAML."""
-    if DOMAIN not in config:
-        return True
+    """Set up the platform."""
+    hass.data.setdefault(DOMAIN, {})
 
-    hass.async_create_task(_async_setup(hass, config))
+    def build_client() -> ProxmoxAPI:
+        """Build the Proxmox client connection."""
+        hass.data[PROXMOX_CLIENTS] = {}
 
-    return True
+        for entry in config[DOMAIN]:
+            host = entry[CONF_HOST]
+            port = entry[CONF_PORT]
+            user = entry[CONF_USERNAME]
+            realm = entry[CONF_REALM]
+            password = entry[CONF_PASSWORD]
+            verify_ssl = entry[CONF_VERIFY_SSL]
 
+            hass.data[PROXMOX_CLIENTS][host] = None
 
-async def _async_setup(hass: HomeAssistant, config: ConfigType) -> None:
-    for entry_config in config[DOMAIN]:
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_IMPORT},
-            data=entry_config,
-        )
-        if (
-            result.get("type") is FlowResultType.ABORT
-            and result.get("reason") != "already_configured"
-        ):
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                f"deprecated_yaml_import_issue_{result.get('reason')}",
-                breaks_in_ha_version="2026.8.0",
-                is_fixable=False,
-                issue_domain=DOMAIN,
-                severity=ir.IssueSeverity.WARNING,
-                translation_key=f"deprecated_yaml_import_issue_{result.get('reason')}",
-                translation_placeholders={
-                    "domain": DOMAIN,
-                    "integration_title": "Proxmox VE",
-                },
-            )
-            return
+            try:
+                # Construct an API client with the given data for the given host
+                proxmox_client = ProxmoxClient(
+                    host, port, user, realm, password, verify_ssl
+                )
+                proxmox_client.build_client()
+            except AuthenticationError:
+                _LOGGER.warning(
+                    "Invalid credentials for proxmox instance %s:%d", host, port
+                )
+                continue
+            except SSLError:
+                _LOGGER.error(
+                    (
+                        "Unable to verify proxmox server SSL. "
+                        'Try using "verify_ssl: false" for proxmox instance %s:%d'
+                    ),
+                    host,
+                    port,
+                )
+                continue
+            except ConnectTimeout:
+                _LOGGER.warning("Connection to host %s timed out during setup", host)
+                continue
+            except requests.exceptions.ConnectionError:
+                _LOGGER.warning("Host %s is not reachable", host)
+                continue
 
-        ir.async_create_issue(
-            hass,
-            HOMEASSISTANT_DOMAIN,
-            "deprecated_yaml",
-            breaks_in_ha_version="2026.8.0",
-            is_fixable=False,
-            issue_domain=DOMAIN,
-            severity=ir.IssueSeverity.WARNING,
-            translation_key="deprecated_yaml",
-            translation_placeholders={
-                "domain": DOMAIN,
-                "integration_title": "Proxmox VE",
-            },
-        )
+            hass.data[PROXMOX_CLIENTS][host] = proxmox_client
 
-
-async def async_setup_entry(hass: HomeAssistant, entry: ProxmoxConfigEntry) -> bool:
-    """Set up a ProxmoxVE instance from a config entry."""
-
-    def build_client() -> ProxmoxClient:
-        """Build and return the Proxmox client connection."""
-        host = entry.data[CONF_HOST]
-        port = entry.data[CONF_PORT]
-        user = entry.data[CONF_USERNAME]
-        realm = entry.data[CONF_REALM]
-        password = entry.data[CONF_PASSWORD]
-        verify_ssl = entry.data[CONF_VERIFY_SSL]
-        try:
-            client = ProxmoxClient(host, port, user, realm, password, verify_ssl)
-            client.build_client()
-        except AuthenticationError as ex:
-            raise ConfigEntryAuthFailed("Invalid credentials") from ex
-        except SSLError as ex:
-            raise ConfigEntryAuthFailed(
-                f"Unable to verify proxmox server SSL. Try using 'verify_ssl: false' for proxmox instance {host}:{port}"
-            ) from ex
-        except ConnectTimeout as ex:
-            raise ConfigEntryNotReady("Connection timed out") from ex
-        except requests.exceptions.ConnectionError as ex:
-            raise ConfigEntryNotReady(f"Host {host} is not reachable: {ex}") from ex
-        else:
-            return client
-
-    proxmox_client = await hass.async_add_executor_job(build_client)
+    await hass.async_add_executor_job(build_client)
 
     coordinators: dict[
         str, dict[str, dict[int, DataUpdateCoordinator[dict[str, Any] | None]]]
     ] = {}
-    entry.runtime_data = coordinators
+    hass.data[DOMAIN][COORDINATORS] = coordinators
 
-    host_name = entry.data[CONF_HOST]
-    coordinators[host_name] = {}
+    # Create a coordinator for each vm/container
+    for host_config in config[DOMAIN]:
+        host_name = host_config["host"]
+        coordinators[host_name] = {}
 
-    proxmox: ProxmoxAPI = proxmox_client.get_api_client()
+        proxmox_client = hass.data[PROXMOX_CLIENTS][host_name]
 
-    for node_config in entry.data[CONF_NODES]:
-        node_name = node_config[CONF_NODE]
-        node_coordinators = coordinators[host_name][node_name] = {}
-
-        try:
-            vms, containers = await hass.async_add_executor_job(
-                _get_vms_containers, proxmox, node_config
-            )
-        except (ResourceException, requests.exceptions.ConnectionError) as err:
-            LOGGER.error("Unable to get vms/containers for node %s: %s", node_name, err)
+        # Skip invalid hosts
+        if proxmox_client is None:
             continue
 
-        for vm in vms:
-            coordinator = _create_coordinator_container_vm(
-                hass, entry, proxmox, host_name, node_name, vm["vmid"], TYPE_VM
-            )
-            await coordinator.async_config_entry_first_refresh()
+        proxmox = proxmox_client.get_api_client()
 
-            node_coordinators[vm["vmid"]] = coordinator
+        for node_config in host_config["nodes"]:
+            node_name = node_config["node"]
+            node_coordinators = coordinators[host_name][node_name] = {}
 
-        for container in containers:
-            coordinator = _create_coordinator_container_vm(
-                hass,
-                entry,
-                proxmox,
-                host_name,
-                node_name,
-                container["vmid"],
-                TYPE_CONTAINER,
-            )
-            await coordinator.async_config_entry_first_refresh()
+            for vm_id in node_config["vms"]:
+                coordinator = create_coordinator_container_vm(
+                    hass, proxmox, host_name, node_name, vm_id, TYPE_VM
+                )
 
-            node_coordinators[container["vmid"]] = coordinator
+                # Fetch initial data
+                await coordinator.async_refresh()
 
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+                node_coordinators[vm_id] = coordinator
+
+            for container_id in node_config["containers"]:
+                coordinator = create_coordinator_container_vm(
+                    hass, proxmox, host_name, node_name, container_id, TYPE_CONTAINER
+                )
+
+                # Fetch initial data
+                await coordinator.async_refresh()
+
+                node_coordinators[container_id] = coordinator
+
+    for component in PLATFORMS:
+        await hass.async_create_task(
+            async_load_platform(hass, component, DOMAIN, {"config": config}, config)
+        )
 
     return True
 
 
-def _get_vms_containers(
-    proxmox: ProxmoxAPI,
-    node_config: dict[str, Any],
-) -> tuple[list[dict[str, Any]], list[dict[str, Any]]]:
-    """Get vms and containers for a node."""
-    vms = proxmox.nodes(node_config[CONF_NODE]).qemu.get()
-    containers = proxmox.nodes(node_config[CONF_NODE]).lxc.get()
-    assert vms is not None and containers is not None
-    return vms, containers
-
-
-def _create_coordinator_container_vm(
+def create_coordinator_container_vm(
     hass: HomeAssistant,
-    entry: ProxmoxConfigEntry,
     proxmox: ProxmoxAPI,
     host_name: str,
     node_name: str,
@@ -259,7 +205,7 @@ def _create_coordinator_container_vm(
         vm_status = await hass.async_add_executor_job(poll_api)
 
         if vm_status is None:
-            LOGGER.warning(
+            _LOGGER.warning(
                 "Vm/Container %s unable to be found in node %s", vm_id, node_name
             )
             return None
@@ -268,14 +214,9 @@ def _create_coordinator_container_vm(
 
     return DataUpdateCoordinator(
         hass,
-        LOGGER,
-        config_entry=entry,
+        _LOGGER,
+        config_entry=None,
         name=f"proxmox_coordinator_{host_name}_{node_name}_{vm_id}",
         update_method=async_update_data,
         update_interval=timedelta(seconds=UPDATE_INTERVAL),
     )
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ProxmoxConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/proxmoxve/binary_sensor.py

@@ -2,48 +2,55 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from . import ProxmoxConfigEntry
-from .const import CONF_CONTAINERS, CONF_NODE, CONF_NODES, CONF_VMS
+from .const import COORDINATORS, DOMAIN, PROXMOX_CLIENTS
 from .entity import ProxmoxEntity
 
 
-async def async_setup_entry(
+async def async_setup_platform(
     hass: HomeAssistant,
-    entry: ProxmoxConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
+    config: ConfigType,
+    add_entities: AddEntitiesCallback,
+    discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up binary sensors."""
+    if discovery_info is None:
+        return
+
     sensors = []
 
-    host_name = entry.data[CONF_HOST]
-    host_name_coordinators = entry.runtime_data[host_name]
+    for host_config in discovery_info["config"][DOMAIN]:
+        host_name = host_config["host"]
+        host_name_coordinators = hass.data[DOMAIN][COORDINATORS][host_name]
 
-    for node_config in entry.data[CONF_NODES]:
-        node_name = node_config[CONF_NODE]
+        if hass.data[PROXMOX_CLIENTS][host_name] is None:
+            continue
 
-        for dev_id in node_config[CONF_VMS] + node_config[CONF_CONTAINERS]:
-            coordinator = host_name_coordinators[node_name][dev_id]
+        for node_config in host_config["nodes"]:
+            node_name = node_config["node"]
 
-            if TYPE_CHECKING:
-                assert coordinator.data is not None
-            name = coordinator.data["name"]
-            sensor = create_binary_sensor(
-                coordinator, host_name, node_name, dev_id, name
-            )
-            sensors.append(sensor)
+            for dev_id in node_config["vms"] + node_config["containers"]:
+                coordinator = host_name_coordinators[node_name][dev_id]
 
-    async_add_entities(sensors)
+                # unfound case
+                if (coordinator_data := coordinator.data) is None:
+                    continue
+
+                name = coordinator_data["name"]
+                sensor = create_binary_sensor(
+                    coordinator, host_name, node_name, dev_id, name
+                )
+                sensors.append(sensor)
+
+    add_entities(sensors)
 
 
 def create_binary_sensor(

homeassistant/components/proxmoxve/config_flow.py

@@ -1,175 +0,0 @@
-"""Config flow for Proxmox VE integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from proxmoxer import AuthenticationError, ProxmoxAPI
-import requests
-from requests.exceptions import ConnectTimeout, SSLError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_PORT,
-    CONF_USERNAME,
-    CONF_VERIFY_SSL,
-)
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-
-from .common import ResourceException
-from .const import (
-    CONF_CONTAINERS,
-    CONF_NODE,
-    CONF_NODES,
-    CONF_REALM,
-    CONF_VMS,
-    DEFAULT_PORT,
-    DEFAULT_REALM,
-    DEFAULT_VERIFY_SSL,
-    DOMAIN,
-)
-
-_LOGGER = logging.getLogger(__name__)
-CONFIG_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): cv.string,
-        vol.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
-        vol.Optional(CONF_REALM, default=DEFAULT_REALM): cv.string,
-        vol.Required(CONF_USERNAME): cv.string,
-        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
-    }
-)
-
-
-def _sanitize_userid(data: dict[str, Any]) -> str:
-    """Sanitize the user ID."""
-    return (
-        data[CONF_USERNAME]
-        if "@" in data[CONF_USERNAME]
-        else f"{data[CONF_USERNAME]}@{data[CONF_REALM]}"
-    )
-
-
-def _get_nodes_data(data: dict[str, Any]) -> list[dict[str, Any]]:
-    """Validate the user input and fetch data (sync, for executor)."""
-    try:
-        client = ProxmoxAPI(
-            data[CONF_HOST],
-            port=data[CONF_PORT],
-            user=_sanitize_userid(data),
-            password=data[CONF_PASSWORD],
-            verify_ssl=data.get(CONF_VERIFY_SSL, DEFAULT_VERIFY_SSL),
-        )
-        nodes = client.nodes.get()
-    except AuthenticationError as err:
-        raise ProxmoxAuthenticationError from err
-    except SSLError as err:
-        raise ProxmoxSSLError from err
-    except ConnectTimeout as err:
-        raise ProxmoxConnectTimeout from err
-    except (ResourceException, requests.exceptions.ConnectionError) as err:
-        raise ProxmoxNoNodesFound from err
-
-    _LOGGER.debug("Proxmox nodes: %s", nodes)
-
-    nodes_data: list[dict[str, Any]] = []
-    for node in nodes:
-        try:
-            vms = client.nodes(node["node"]).qemu.get()
-            containers = client.nodes(node["node"]).lxc.get()
-        except (ResourceException, requests.exceptions.ConnectionError) as err:
-            raise ProxmoxNoNodesFound from err
-
-        nodes_data.append(
-            {
-                CONF_NODE: node["node"],
-                CONF_VMS: [vm["vmid"] for vm in vms],
-                CONF_CONTAINERS: [container["vmid"] for container in containers],
-            }
-        )
-
-    _LOGGER.debug("Nodes with data: %s", nodes_data)
-    return nodes_data
-
-
-class ProxmoxveConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Proxmox VE."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        proxmox_nodes: list[dict[str, Any]] = []
-        if user_input is not None:
-            self._async_abort_entries_match({CONF_HOST: user_input[CONF_HOST]})
-            try:
-                proxmox_nodes = await self.hass.async_add_executor_job(
-                    _get_nodes_data, user_input
-                )
-            except ProxmoxConnectTimeout:
-                errors["base"] = "connect_timeout"
-            except ProxmoxAuthenticationError:
-                errors["base"] = "invalid_auth"
-            except ProxmoxSSLError:
-                errors["base"] = "ssl_error"
-            except ProxmoxNoNodesFound:
-                errors["base"] = "no_nodes_found"
-
-            if not errors:
-                return self.async_create_entry(
-                    title=user_input[CONF_HOST],
-                    data={**user_input, CONF_NODES: proxmox_nodes},
-                )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=CONFIG_SCHEMA,
-            errors=errors,
-        )
-
-    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
-        """Handle a flow initiated by configuration file."""
-        self._async_abort_entries_match({CONF_HOST: import_data[CONF_HOST]})
-
-        try:
-            proxmox_nodes = await self.hass.async_add_executor_job(
-                _get_nodes_data, import_data
-            )
-        except ProxmoxConnectTimeout:
-            return self.async_abort(reason="connect_timeout")
-        except ProxmoxAuthenticationError:
-            return self.async_abort(reason="invalid_auth")
-        except ProxmoxSSLError:
-            return self.async_abort(reason="ssl_error")
-        except ProxmoxNoNodesFound:
-            return self.async_abort(reason="no_nodes_found")
-
-        return self.async_create_entry(
-            title=import_data[CONF_HOST],
-            data={**import_data, CONF_NODES: proxmox_nodes},
-        )
-
-
-class ProxmoxNoNodesFound(HomeAssistantError):
-    """Error to indicate no nodes found."""
-
-
-class ProxmoxConnectTimeout(HomeAssistantError):
-    """Error to indicate a connection timeout."""
-
-
-class ProxmoxSSLError(HomeAssistantError):
-    """Error to indicate an SSL error."""
-
-
-class ProxmoxAuthenticationError(HomeAssistantError):
-    """Error to indicate an authentication error."""

homeassistant/components/proxmoxve/const.py

@@ -1,12 +1,16 @@
 """Constants for ProxmoxVE."""
 
+import logging
+
 DOMAIN = "proxmoxve"
+PROXMOX_CLIENTS = "proxmox_clients"
 CONF_REALM = "realm"
 CONF_NODE = "node"
 CONF_NODES = "nodes"
 CONF_VMS = "vms"
 CONF_CONTAINERS = "containers"
 
+COORDINATORS = "coordinators"
 
 DEFAULT_PORT = 8006
 DEFAULT_REALM = "pam"
@@ -14,3 +18,5 @@ DEFAULT_VERIFY_SSL = True
 TYPE_VM = 0
 TYPE_CONTAINER = 1
 UPDATE_INTERVAL = 60
+
+_LOGGER = logging.getLogger(__package__)

homeassistant/components/proxmoxve/manifest.json

@@ -1,10 +1,8 @@
 {
   "domain": "proxmoxve",
   "name": "Proxmox VE",
-  "codeowners": ["@jhollowe", "@Corbeno", "@erwindouna"],
-  "config_flow": true,
+  "codeowners": ["@jhollowe", "@Corbeno"],
   "documentation": "https://www.home-assistant.io/integrations/proxmoxve",
-  "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["proxmoxer"],
   "quality_scale": "legacy",

homeassistant/components/proxmoxve/strings.json

@@ -1,46 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "Cannot connect to Proxmox VE server",
-      "connect_timeout": "[%key:common::config_flow::error::timeout_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "no_nodes_found": "No active nodes found",
-      "ssl_error": "SSL check failed. Check the SSL settings"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "port": "[%key:common::config_flow::data::port%]",
-          "realm": "Realm",
-          "username": "[%key:common::config_flow::data::username%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-        },
-        "description": "Enter your Proxmox VE server details to set up the integration.",
-        "title": "Connect to Proxmox VE"
-      }
-    }
-  },
-  "issues": {
-    "deprecated_yaml_import_issue_connect_timeout": {
-      "description": "Configuring {integration_title} via YAML is deprecated and will be removed in a future release. While importing your configuration, a connection timeout occurred. Please correct your YAML configuration and restart Home Assistant, or remove the {domain} key from your configuration and configure the integration via the UI.",
-      "title": "The {integration_title} YAML configuration is being removed"
-    },
-    "deprecated_yaml_import_issue_invalid_auth": {
-      "description": "Configuring {integration_title} via YAML is deprecated and will be removed in a future release. While importing your configuration, invalid authentication details were found. Please correct your YAML configuration and restart Home Assistant, or remove the {domain} key from your configuration and configure the integration via the UI.",
-      "title": "[%key:component::proxmoxve::issues::deprecated_yaml_import_issue_connect_timeout::title%]"
-    },
-    "deprecated_yaml_import_issue_no_nodes_found": {
-      "description": "Configuring {integration_title} via YAML is deprecated and will be removed in a future release. While importing your configuration, no active nodes were found on the Proxmox VE server. Please correct your YAML configuration and restart Home Assistant, or remove the {domain} key from your configuration and configure the integration via the UI.",
-      "title": "[%key:component::proxmoxve::issues::deprecated_yaml_import_issue_connect_timeout::title%]"
-    },
-    "deprecated_yaml_import_issue_ssl_error": {
-      "description": "Configuring {integration_title} via YAML is deprecated and will be removed in a future release. While importing your configuration, an SSL error occurred. Please correct your YAML configuration and restart Home Assistant, or remove the {domain} key from your configuration and configure the integration via the UI.",
-      "title": "[%key:component::proxmoxve::issues::deprecated_yaml_import_issue_connect_timeout::title%]"
-    }
-  }
-}

homeassistant/components/qwikswitch/__init__.py

@@ -24,10 +24,10 @@ from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DATA_QUIKSWITCH, DOMAIN
-
 _LOGGER = logging.getLogger(__name__)
 
+DOMAIN = "qwikswitch"
+
 CONF_DIMMER_ADJUST = "dimmer_adjust"
 CONF_BUTTON_EVENTS = "button_events"
 CV_DIM_VALUE = vol.All(vol.Coerce(float), vol.Range(min=1, max=3))
@@ -96,7 +96,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if not await qsusb.update_from_devices():
         return False
 
-    hass.data[DATA_QUIKSWITCH] = qsusb
+    hass.data[DOMAIN] = qsusb
 
     comps: dict[Platform, list] = {
         Platform.SWITCH: [],
@@ -168,7 +168,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     @callback
     def async_stop(_):
         """Stop the listener."""
-        hass.data[DATA_QUIKSWITCH].stop()
+        hass.data[DOMAIN].stop()
 
     hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, async_stop)
 

homeassistant/components/qwikswitch/binary_sensor.py

@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import DATA_QUIKSWITCH, DOMAIN
+from . import DOMAIN
 from .entity import QSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -30,7 +30,7 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[DATA_QUIKSWITCH]
+    qsusb = hass.data[DOMAIN]
     _LOGGER.debug("Setup qwikswitch.binary_sensor %s, %s", qsusb, discovery_info)
     devs = [QSBinarySensor(sensor) for sensor in discovery_info[DOMAIN]]
     add_entities(devs)

homeassistant/components/qwikswitch/const.py

@@ -1,13 +0,0 @@
-"""Support for Qwikswitch devices."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from homeassistant.util.hass_dict import HassKey
-
-if TYPE_CHECKING:
-    from pyqwikswitch.async_ import QSUsb
-
-DOMAIN = "qwikswitch"
-DATA_QUIKSWITCH: HassKey[QSUsb] = HassKey(DOMAIN)

homeassistant/components/qwikswitch/entity.py

@@ -7,7 +7,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 
-from .const import DATA_QUIKSWITCH
+from . import DOMAIN
 
 
 class QSEntity(Entity):
@@ -67,8 +67,8 @@ class QSToggleEntity(QSEntity):
     async def async_turn_on(self, **kwargs):
         """Turn the device on."""
         new = kwargs.get(ATTR_BRIGHTNESS, 255)
-        self.hass.data[DATA_QUIKSWITCH].devices.set_value(self.qsid, new)
+        self.hass.data[DOMAIN].devices.set_value(self.qsid, new)
 
     async def async_turn_off(self, **_):
         """Turn the device off."""
-        self.hass.data[DATA_QUIKSWITCH].devices.set_value(self.qsid, 0)
+        self.hass.data[DOMAIN].devices.set_value(self.qsid, 0)

homeassistant/components/qwikswitch/sensor.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import DATA_QUIKSWITCH, DOMAIN
+from . import DOMAIN
 from .entity import QSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,7 +28,7 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[DATA_QUIKSWITCH]
+    qsusb = hass.data[DOMAIN]
     _LOGGER.debug("Setup qwikswitch.sensor %s, %s", qsusb, discovery_info)
     devs = [QSSensor(sensor) for sensor in discovery_info[DOMAIN]]
     add_entities(devs)

homeassistant/components/qwikswitch/switch.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from .const import DATA_QUIKSWITCH, DOMAIN
+from . import DOMAIN
 from .entity import QSToggleEntity
 
 
@@ -21,7 +21,7 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[DATA_QUIKSWITCH]
+    qsusb = hass.data[DOMAIN]
     devs = [QSSwitch(qsid, qsusb) for qsid in discovery_info[DOMAIN]]
     add_entities(devs)
 

homeassistant/components/saunum/climate.py

@@ -17,7 +17,7 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -57,8 +57,6 @@ class LeilSaunaClimate(LeilSaunaEntity, ClimateEntity):
         ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.FAN_MODE
     )
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
-    _attr_precision = PRECISION_WHOLE
-    _attr_target_temperature_step = 1.0
     _attr_min_temp = MIN_TEMPERATURE
     _attr_max_temp = MAX_TEMPERATURE
     _attr_fan_modes = [FAN_OFF, FAN_LOW, FAN_MEDIUM, FAN_HIGH]
@@ -145,18 +143,10 @@ class LeilSaunaClimate(LeilSaunaEntity, ClimateEntity):
         """Set new fan mode."""
         if not self.coordinator.data.session_active:
             raise ServiceValidationError(
+                "Cannot change fan mode when sauna session is not active",
                 translation_domain=DOMAIN,
                 translation_key="session_not_active",
             )
 
-        try:
-            await self.coordinator.client.async_set_fan_speed(
-                FAN_MODE_TO_SPEED[fan_mode]
-            )
-        except SaunumException as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="set_fan_mode_failed",
-            ) from err
-
+        await self.coordinator.client.async_set_fan_speed(FAN_MODE_TO_SPEED[fan_mode])
         await self.coordinator.async_request_refresh()

homeassistant/components/saunum/light.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from pysaunum import SaunumException
 
@@ -15,9 +15,6 @@ from . import LeilSaunaConfigEntry
 from .const import DOMAIN
 from .entity import LeilSaunaEntity
 
-if TYPE_CHECKING:
-    from .coordinator import LeilSaunaCoordinator
-
 PARALLEL_UPDATES = 1
 
 
@@ -38,7 +35,7 @@ class LeilSaunaLight(LeilSaunaEntity, LightEntity):
     _attr_color_mode = ColorMode.ONOFF
     _attr_supported_color_modes = {ColorMode.ONOFF}
 
-    def __init__(self, coordinator: LeilSaunaCoordinator) -> None:
+    def __init__(self, coordinator) -> None:
         """Initialize the light entity."""
         super().__init__(coordinator)
         # Override unique_id to differentiate from climate entity

homeassistant/components/saunum/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pysaunum"],
-  "quality_scale": "platinum",
+  "quality_scale": "gold",
   "requirements": ["pysaunum==0.2.0"]
 }

homeassistant/components/saunum/number.py

@@ -133,7 +133,11 @@ class LeilSaunaNumber(LeilSaunaEntity, NumberEntity):
         except SaunumException as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key=f"set_{self.entity_description.key}_failed",
+                translation_key="set_value_failed",
+                translation_placeholders={
+                    "entity": self.entity_description.key,
+                    "value": str(value),
+                },
             ) from err
 
         await self.coordinator.async_request_refresh()

homeassistant/components/saunum/quality_scale.yaml

@@ -77,4 +77,4 @@ rules:
   inject-websession:
     status: exempt
     comment: Integration uses Modbus TCP protocol and does not make HTTP requests.
-  strict-typing: done
+  strict-typing: todo

homeassistant/components/saunum/strings.json

@@ -89,12 +89,6 @@
     "session_not_active": {
       "message": "Cannot change fan mode when sauna session is not active"
     },
-    "set_fan_duration_failed": {
-      "message": "Failed to set fan duration"
-    },
-    "set_fan_mode_failed": {
-      "message": "Failed to set fan mode"
-    },
     "set_hvac_mode_failed": {
       "message": "Failed to set HVAC mode to {hvac_mode}"
     },
@@ -104,11 +98,11 @@
     "set_light_on_failed": {
       "message": "Failed to turn on light"
     },
-    "set_sauna_duration_failed": {
-      "message": "Failed to set sauna duration"
-    },
     "set_temperature_failed": {
       "message": "Failed to set temperature to {temperature}"
+    },
+    "set_value_failed": {
+      "message": "Failed to set {entity} to {value}"
     }
   }
 }

homeassistant/components/shelly/binary_sensor.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Final, cast
 
-from aioshelly.const import MODEL_FLOOD_G4, RPC_GENERATIONS
+from aioshelly.const import RPC_GENERATIONS
 
 from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_PLATFORM,
@@ -335,7 +335,6 @@ RPC_SENSORS: Final = {
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
         supported=lambda status: status.get("alarm") is not None,
-        models={MODEL_FLOOD_G4},
     ),
     "presence_num_objects": RpcBinarySensorDescription(
         key="presence",

homeassistant/components/sma/config_flow.py

@@ -144,51 +144,6 @@ class SmaConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of the integration."""
-        errors: dict[str, str] = {}
-        reconf_entry = self._get_reconfigure_entry()
-        if user_input is not None:
-            errors, device_info = await self._handle_user_input(
-                user_input={
-                    **reconf_entry.data,
-                    **user_input,
-                }
-            )
-
-            if not errors:
-                await self.async_set_unique_id(
-                    str(device_info["serial"]), raise_on_progress=False
-                )
-                self._abort_if_unique_id_mismatch()
-                return self.async_update_reload_and_abort(
-                    reconf_entry,
-                    data_updates={
-                        CONF_HOST: user_input[CONF_HOST],
-                        CONF_SSL: user_input[CONF_SSL],
-                        CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
-                        CONF_GROUP: user_input[CONF_GROUP],
-                    },
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=self.add_suggested_values_to_schema(
-                data_schema=vol.Schema(
-                    {
-                        vol.Required(CONF_HOST): cv.string,
-                        vol.Optional(CONF_SSL): cv.boolean,
-                        vol.Optional(CONF_VERIFY_SSL): cv.boolean,
-                        vol.Optional(CONF_GROUP): vol.In(GROUPS),
-                    }
-                ),
-                suggested_values=user_input or dict(reconf_entry.data),
-            ),
-            errors=errors,
-        )
-
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:

homeassistant/components/sma/strings.json

@@ -3,9 +3,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "You selected a different SMA device than the one this config entry was configured with, this is not allowed."
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -31,16 +29,6 @@
         "description": "The SMA integration needs to re-authenticate your connection details",
         "title": "[%key:common::config_flow::title::reauth%]"
       },
-      "reconfigure": {
-        "data": {
-          "group": "[%key:component::sma::config::step::user::data::group%]",
-          "host": "[%key:common::config_flow::data::host%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-        },
-        "description": "Use the following form to reconfigure your SMA device.",
-        "title": "Reconfigure SMA Solar Integration"
-      },
       "user": {
         "data": {
           "group": "Group",
@@ -56,13 +44,5 @@
         "title": "Set up SMA Solar"
       }
     }
-  },
-  "selector": {
-    "group": {
-      "options": {
-        "installer": "Installer",
-        "user": "User"
-      }
-    }
   }
 }

homeassistant/components/smartthings/audio.py

@@ -0,0 +1,265 @@
+"""Audio helper for SmartThings audio notifications."""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+import secrets
+
+from aiohttp import hdrs, web
+
+from homeassistant.components import ffmpeg
+from homeassistant.components.http import HomeAssistantView
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.network import NoURLAvailableError, get_url
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+PCM_SAMPLE_RATE = 24000
+PCM_SAMPLE_WIDTH = 2
+PCM_CHANNELS = 1
+PCM_MIME = "audio/L16"
+PCM_EXTENSION = ".pcm"
+WARNING_DURATION_SECONDS = 40
+FFMPEG_MAX_DURATION_SECONDS = 10 * 60
+TRANSCODE_TIMEOUT_SECONDS = WARNING_DURATION_SECONDS + 10
+_TRUNCATION_EPSILON = 1 / PCM_SAMPLE_RATE
+ENTRY_TTL = timedelta(minutes=5)
+MAX_STORED_ENTRIES = 4  # Limit the number of cached notifications.
+
+PCM_FRAME_BYTES = PCM_SAMPLE_WIDTH * PCM_CHANNELS
+
+DATA_AUDIO_MANAGER = "audio_manager"
+
+
+class SmartThingsAudioError(HomeAssistantError):
+    """Error raised when SmartThings audio preparation fails."""
+
+
+@dataclass
+class _AudioEntry:
+    """Stored PCM audio entry."""
+
+    pcm: bytes
+    created: float
+    expires: float
+
+
+class SmartThingsAudioManager(HomeAssistantView):
+    """Manage PCM proxy URLs for SmartThings audio notifications."""
+
+    url = "/api/smartthings/audio/{token}"
+    name = "api:smartthings:audio"
+    requires_auth = False
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the manager."""
+        self.hass = hass
+        self._entries: dict[str, _AudioEntry] = {}
+        self._cleanup_handle: asyncio.TimerHandle | None = None
+
+    async def async_prepare_notification(self, source_url: str) -> str:
+        """Generate an externally accessible PCM URL for SmartThings."""
+        pcm, duration, truncated = await self._transcode_to_pcm(source_url)
+        if not pcm:
+            raise SmartThingsAudioError("Converted audio is empty")
+
+        if truncated:
+            _LOGGER.warning(
+                "SmartThings audio notification truncated to %s seconds (output length %.1fs); longer sources may be cut off",
+                FFMPEG_MAX_DURATION_SECONDS,
+                duration,
+            )
+        elif duration > WARNING_DURATION_SECONDS:
+            _LOGGER.warning(
+                "SmartThings audio notification is %.1fs; playback over %s seconds may be cut off",
+                duration,
+                WARNING_DURATION_SECONDS,
+            )
+
+        token = secrets.token_urlsafe(
+            16
+        )  # Shorter tokens avoid playback issues in some devices.
+        now = self.hass.loop.time()
+        entry = _AudioEntry(
+            pcm=pcm,
+            created=now,
+            expires=now + ENTRY_TTL.total_seconds(),
+        )
+
+        self._cleanup(now)
+        while token in self._entries:
+            token = secrets.token_urlsafe(16)
+        self._entries[token] = entry
+        while len(self._entries) > MAX_STORED_ENTRIES:
+            dropped_token = next(iter(self._entries))
+            self._entries.pop(dropped_token, None)
+            _LOGGER.debug(
+                "Dropped oldest SmartThings audio token %s to cap cache",
+                dropped_token,
+            )
+        self._schedule_cleanup()
+
+        path = f"/api/smartthings/audio/{token}{PCM_EXTENSION}"
+        try:
+            base_url = get_url(
+                self.hass,
+                allow_internal=True,
+                allow_external=True,
+                allow_cloud=True,
+                prefer_external=False,  # Prevent NAT loopback failures; may break non-local access for devices outside the LAN.
+                prefer_cloud=True,
+            )
+        except NoURLAvailableError as err:
+            self._entries.pop(token, None)
+            self._schedule_cleanup()
+            raise SmartThingsAudioError(
+                "SmartThings audio notifications require an accessible Home Assistant URL"
+            ) from err
+
+        return f"{base_url}{path}"
+
+    async def get(self, request: web.Request, token: str) -> web.StreamResponse:
+        """Serve a PCM audio response."""
+        token = token.removesuffix(PCM_EXTENSION)
+
+        now = self.hass.loop.time()
+        self._cleanup(now)
+        self._schedule_cleanup()
+        entry = self._entries.get(token)
+
+        if entry is None:
+            raise web.HTTPNotFound
+
+        _LOGGER.debug("Serving SmartThings audio token=%s to %s", token, request.remote)
+
+        response = web.Response(body=entry.pcm, content_type=PCM_MIME)
+        response.headers[hdrs.CACHE_CONTROL] = "no-store"
+        response.headers[hdrs.ACCEPT_RANGES] = "none"
+        response.headers[hdrs.CONTENT_DISPOSITION] = (
+            f'inline; filename="{token}{PCM_EXTENSION}"'
+        )
+        return response
+
+    async def _transcode_to_pcm(self, source_url: str) -> tuple[bytes, float, bool]:
+        """Use ffmpeg to convert the source media to 24kHz mono PCM."""
+        manager = ffmpeg.get_ffmpeg_manager(self.hass)
+        command = [
+            manager.binary,
+            "-hide_banner",
+            "-loglevel",
+            "error",
+            "-nostdin",
+            "-i",
+            source_url,
+            "-ac",
+            str(PCM_CHANNELS),
+            "-ar",
+            str(PCM_SAMPLE_RATE),
+            "-c:a",
+            "pcm_s16le",
+            "-t",
+            str(FFMPEG_MAX_DURATION_SECONDS),
+            "-f",
+            "s16le",
+            "pipe:1",
+        ]
+
+        try:
+            process = await asyncio.create_subprocess_exec(
+                *command,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+        except FileNotFoundError as err:
+            raise SmartThingsAudioError(
+                "FFmpeg is required for SmartThings audio notifications"
+            ) from err
+
+        try:
+            stdout, stderr = await asyncio.wait_for(
+                process.communicate(), timeout=TRANSCODE_TIMEOUT_SECONDS
+            )
+        except TimeoutError:
+            _LOGGER.warning(
+                "FFmpeg timed out after %s seconds while converting SmartThings audio from %s",
+                TRANSCODE_TIMEOUT_SECONDS,
+                source_url,
+            )
+            with contextlib.suppress(ProcessLookupError):
+                process.kill()
+            stdout, stderr = await process.communicate()
+
+        if process.returncode != 0:
+            message = stderr.decode().strip() or "unknown error"
+            _LOGGER.error(
+                "FFmpeg failed to convert SmartThings audio from %s: %s",
+                source_url,
+                message,
+            )
+            raise SmartThingsAudioError(
+                "Unable to convert audio to PCM for SmartThings"
+            )
+
+        if not stdout:
+            return b"", 0.0, False
+
+        frame_count, remainder = divmod(len(stdout), PCM_FRAME_BYTES)
+        if remainder:
+            _LOGGER.debug(
+                "SmartThings audio conversion produced misaligned PCM: dropping %s extra byte(s)",
+                remainder,
+            )
+            stdout = stdout[: len(stdout) - remainder]
+            frame_count = len(stdout) // PCM_FRAME_BYTES
+
+        if frame_count == 0:
+            return b"", 0.0, False
+
+        duration = frame_count / PCM_SAMPLE_RATE
+        truncated = duration >= (FFMPEG_MAX_DURATION_SECONDS - _TRUNCATION_EPSILON)
+        return stdout, duration, truncated
+
+    @callback
+    def _schedule_cleanup(self) -> None:
+        """Schedule the next cleanup based on entry expiry."""
+        if self._cleanup_handle is not None:
+            self._cleanup_handle.cancel()
+            self._cleanup_handle = None
+        if not self._entries:
+            return
+        next_expiry = min(entry.expires for entry in self._entries.values())
+        delay = max(0.0, next_expiry - self.hass.loop.time())
+        self._cleanup_handle = self.hass.loop.call_later(delay, self._cleanup_callback)
+
+    @callback
+    def _cleanup_callback(self) -> None:
+        """Run a cleanup pass."""
+        self._cleanup_handle = None
+        now = self.hass.loop.time()
+        self._cleanup(now)
+        self._schedule_cleanup()
+
+    def _cleanup(self, now: float) -> None:
+        """Remove expired entries."""
+        expired = [
+            token for token, entry in self._entries.items() if entry.expires <= now
+        ]
+        for token in expired:
+            self._entries.pop(token, None)
+
+
+async def async_get_audio_manager(hass: HomeAssistant) -> SmartThingsAudioManager:
+    """Return the shared SmartThings audio manager."""
+    domain_data = hass.data.setdefault(DOMAIN, {})
+    if (manager := domain_data.get(DATA_AUDIO_MANAGER)) is None:
+        manager = SmartThingsAudioManager(hass)
+        hass.http.register_view(manager)
+        domain_data[DATA_AUDIO_MANAGER] = manager
+    return manager

homeassistant/components/smartthings/manifest.json

@@ -3,7 +3,7 @@
   "name": "SmartThings",
   "codeowners": ["@joostlek"],
   "config_flow": true,
-  "dependencies": ["application_credentials"],
+  "dependencies": ["application_credentials", "http", "ffmpeg"],
   "dhcp": [
     {
       "hostname": "st*",

homeassistant/components/smartthings/media_player.py

@@ -6,17 +6,22 @@ from typing import Any
 
 from pysmartthings import Attribute, Capability, Category, Command, SmartThings
 
+from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
     MediaPlayerEntityFeature,
     MediaPlayerState,
+    MediaType,
     RepeatMode,
+    async_process_play_media_url,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import FullDevice, SmartThingsConfigEntry
+from .audio import SmartThingsAudioError, async_get_audio_manager
 from .const import MAIN
 from .entity import SmartThingsEntity
 
@@ -84,6 +89,7 @@ class SmartThingsMediaPlayer(SmartThingsEntity, MediaPlayerEntity):
                 Capability.AUDIO_MUTE,
                 Capability.AUDIO_TRACK_DATA,
                 Capability.AUDIO_VOLUME,
+                Capability.AUDIO_NOTIFICATION,
                 Capability.MEDIA_INPUT_SOURCE,
                 Capability.MEDIA_PLAYBACK,
                 Capability.MEDIA_PLAYBACK_REPEAT,
@@ -128,6 +134,8 @@ class SmartThingsMediaPlayer(SmartThingsEntity, MediaPlayerEntity):
             flags |= MediaPlayerEntityFeature.SHUFFLE_SET
         if self.supports_capability(Capability.MEDIA_PLAYBACK_REPEAT):
             flags |= MediaPlayerEntityFeature.REPEAT_SET
+        if self.supports_capability(Capability.AUDIO_NOTIFICATION):
+            flags |= MediaPlayerEntityFeature.PLAY_MEDIA
         return flags
 
     async def async_turn_off(self, **kwargs: Any) -> None:
@@ -233,6 +241,40 @@ class SmartThingsMediaPlayer(SmartThingsEntity, MediaPlayerEntity):
             argument=HA_REPEAT_MODE_TO_SMARTTHINGS[repeat],
         )
 
+    async def async_play_media(
+        self, media_type: MediaType | str, media_id: str, **kwargs: Any
+    ) -> None:
+        """Play media using SmartThings audio notifications."""
+        if not self.supports_capability(Capability.AUDIO_NOTIFICATION):
+            raise HomeAssistantError("Device does not support audio notifications")
+
+        if media_type not in (MediaType.MUSIC,):
+            raise HomeAssistantError(
+                "Unsupported media type for SmartThings audio notification"
+            )
+
+        if media_source.is_media_source_id(media_id):
+            play_item = await media_source.async_resolve_media(
+                self.hass, media_id, self.entity_id
+            )
+            media_id = async_process_play_media_url(self.hass, play_item.url)
+        else:
+            media_id = async_process_play_media_url(self.hass, media_id)
+
+        audio_manager = await async_get_audio_manager(self.hass)
+        try:
+            proxy_url = await audio_manager.async_prepare_notification(media_id)
+        except SmartThingsAudioError as err:
+            raise HomeAssistantError(str(err)) from err
+
+        command = Command("playTrackAndResume")
+
+        await self.execute_device_command(
+            Capability.AUDIO_NOTIFICATION,
+            command,
+            argument=[proxy_url],
+        )
+
     @property
     def media_title(self) -> str | None:
         """Title of current playing media."""

homeassistant/components/sunricher_dali/__init__.py

@@ -25,12 +25,7 @@ from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from .const import CONF_SERIAL_NUMBER, DOMAIN, MANUFACTURER
 from .types import DaliCenterConfigEntry, DaliCenterData
 
-_PLATFORMS: list[Platform] = [
-    Platform.BUTTON,
-    Platform.LIGHT,
-    Platform.SCENE,
-    Platform.SENSOR,
-]
+_PLATFORMS: list[Platform] = [Platform.BUTTON, Platform.LIGHT, Platform.SCENE]
 _LOGGER = logging.getLogger(__name__)
 
 

homeassistant/components/sunricher_dali/sensor.py

@@ -1,121 +0,0 @@
-"""Platform for Sunricher DALI sensor entities."""
-
-from __future__ import annotations
-
-import logging
-
-from PySrDaliGateway import CallbackEventType, Device
-from PySrDaliGateway.helper import is_illuminance_sensor
-from PySrDaliGateway.types import IlluminanceStatus
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorStateClass,
-)
-from homeassistant.const import LIGHT_LUX
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import DOMAIN, MANUFACTURER
-from .entity import DaliDeviceEntity
-from .types import DaliCenterConfigEntry
-
-_LOGGER = logging.getLogger(__name__)
-
-PARALLEL_UPDATES = 0
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: DaliCenterConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Sunricher DALI sensor entities from config entry."""
-    devices = entry.runtime_data.devices
-
-    entities: list[SensorEntity] = [
-        SunricherDaliIlluminanceSensor(device)
-        for device in devices
-        if is_illuminance_sensor(device.dev_type)
-    ]
-
-    if entities:
-        async_add_entities(entities)
-
-
-class SunricherDaliIlluminanceSensor(DaliDeviceEntity, SensorEntity):
-    """Representation of a Sunricher DALI Illuminance Sensor."""
-
-    _attr_device_class = SensorDeviceClass.ILLUMINANCE
-    _attr_state_class = SensorStateClass.MEASUREMENT
-    _attr_native_unit_of_measurement = LIGHT_LUX
-    _attr_name = None
-
-    def __init__(self, device: Device) -> None:
-        """Initialize the illuminance sensor."""
-        super().__init__(device)
-        self._device = device
-        self._illuminance_value: float | None = None
-        self._sensor_enabled: bool = True
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device.dev_id)},
-            name=device.name,
-            manufacturer=MANUFACTURER,
-            model=device.model,
-            via_device=(DOMAIN, device.gw_sn),
-        )
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the native value, or None if sensor is disabled."""
-        if not self._sensor_enabled:
-            return None
-        return self._illuminance_value
-
-    async def async_added_to_hass(self) -> None:
-        """Handle entity addition to Home Assistant."""
-        await super().async_added_to_hass()
-
-        self.async_on_remove(
-            self._device.register_listener(
-                CallbackEventType.ILLUMINANCE_STATUS, self._handle_illuminance_status
-            )
-        )
-
-        self.async_on_remove(
-            self._device.register_listener(
-                CallbackEventType.SENSOR_ON_OFF, self._handle_sensor_on_off
-            )
-        )
-
-        self._device.read_status()
-
-    @callback
-    def _handle_illuminance_status(self, status: IlluminanceStatus) -> None:
-        """Handle illuminance status updates."""
-        illuminance_value = status["illuminance_value"]
-        is_valid = status["is_valid"]
-
-        if not is_valid:
-            _LOGGER.debug(
-                "Illuminance value is not valid for device %s: %s lux",
-                self._device.dev_id,
-                illuminance_value,
-            )
-            return
-
-        self._illuminance_value = illuminance_value
-        self.schedule_update_ha_state()
-
-    @callback
-    def _handle_sensor_on_off(self, on_off: bool) -> None:
-        """Handle sensor on/off updates."""
-        self._sensor_enabled = on_off
-        _LOGGER.debug(
-            "Illuminance sensor enable state for device %s updated to: %s",
-            self._device.dev_id,
-            on_off,
-        )
-        self.schedule_update_ha_state()

homeassistant/components/tibber/__init__.py

@@ -8,6 +8,7 @@ import logging
 import aiohttp
 from aiohttp.client_exceptions import ClientError, ClientResponseError
 import tibber
+from tibber import data_api as tibber_data_api
 
 from homeassistant.const import CONF_ACCESS_TOKEN, EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import Event, HomeAssistant
@@ -22,7 +23,13 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util, ssl as ssl_util
 
-from .const import AUTH_IMPLEMENTATION, DATA_HASS_CONFIG, DOMAIN, TibberConfigEntry
+from .const import (
+    AUTH_IMPLEMENTATION,
+    CONF_LEGACY_ACCESS_TOKEN,
+    DATA_HASS_CONFIG,
+    DOMAIN,
+    TibberConfigEntry,
+)
 from .coordinator import TibberDataAPICoordinator
 from .services import async_setup_services
 
@@ -37,23 +44,24 @@ _LOGGER = logging.getLogger(__name__)
 class TibberRuntimeData:
     """Runtime data for Tibber API entries."""
 
+    tibber_connection: tibber.Tibber
     session: OAuth2Session
     data_api_coordinator: TibberDataAPICoordinator | None = field(default=None)
-    _client: tibber.Tibber | None = None
+    _client: tibber_data_api.TibberDataAPI | None = None
 
-    async def async_get_client(self, hass: HomeAssistant) -> tibber.Tibber:
-        """Return an authenticated Tibber client."""
+    async def async_get_client(
+        self, hass: HomeAssistant
+    ) -> tibber_data_api.TibberDataAPI:
+        """Return an authenticated Tibber Data API client."""
         await self.session.async_ensure_token_valid()
         token = self.session.token
         access_token = token.get(CONF_ACCESS_TOKEN)
         if not access_token:
             raise ConfigEntryAuthFailed("Access token missing from OAuth session")
         if self._client is None:
-            self._client = tibber.Tibber(
-                access_token=access_token,
+            self._client = tibber_data_api.TibberDataAPI(
+                access_token,
                 websession=async_get_clientsession(hass),
-                time_zone=dt_util.get_default_time_zone(),
-                ssl=ssl_util.get_default_context(),
             )
         self._client.set_access_token(access_token)
         return self._client
@@ -80,6 +88,32 @@ async def async_setup_entry(hass: HomeAssistant, entry: TibberConfigEntry) -> bo
             translation_key="data_api_reauth_required",
         )
 
+    tibber_connection = tibber.Tibber(
+        access_token=entry.data[CONF_LEGACY_ACCESS_TOKEN],
+        websession=async_get_clientsession(hass),
+        time_zone=dt_util.get_default_time_zone(),
+        ssl=ssl_util.get_default_context(),
+    )
+
+    async def _close(event: Event) -> None:
+        await tibber_connection.rt_disconnect()
+
+    entry.async_on_unload(hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close))
+
+    try:
+        await tibber_connection.update_info()
+    except (
+        TimeoutError,
+        aiohttp.ClientError,
+        tibber.RetryableHttpExceptionError,
+    ) as err:
+        raise ConfigEntryNotReady("Unable to connect") from err
+    except tibber.InvalidLoginError as exp:
+        _LOGGER.error("Failed to login. %s", exp)
+        return False
+    except tibber.FatalHttpExceptionError:
+        return False
+
     try:
         implementation = await async_get_config_entry_implementation(hass, entry)
     except ImplementationUnavailableError as err:
@@ -101,29 +135,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: TibberConfigEntry) -> bo
         raise ConfigEntryNotReady from err
 
     entry.runtime_data = TibberRuntimeData(
+        tibber_connection=tibber_connection,
         session=session,
     )
 
-    tibber_connection = await entry.runtime_data.async_get_client(hass)
-
-    async def _close(event: Event) -> None:
-        await tibber_connection.rt_disconnect()
-
-    entry.async_on_unload(hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close))
-
-    try:
-        await tibber_connection.update_info()
-    except (
-        TimeoutError,
-        aiohttp.ClientError,
-        tibber.RetryableHttpExceptionError,
-    ) as err:
-        raise ConfigEntryNotReady("Unable to connect") from err
-    except tibber.InvalidLoginError as err:
-        raise ConfigEntryAuthFailed("Invalid login credentials") from err
-    except tibber.FatalHttpExceptionError as err:
-        raise ConfigEntryNotReady("Fatal HTTP error from Tibber API") from err
-
     coordinator = TibberDataAPICoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data.data_api_coordinator = coordinator
@@ -139,6 +154,5 @@ async def async_unload_entry(
     if unload_ok := await hass.config_entries.async_unload_platforms(
         config_entry, PLATFORMS
     ):
-        tibber_connection = await config_entry.runtime_data.async_get_client(hass)
-        await tibber_connection.rt_disconnect()
+        await config_entry.runtime_data.tibber_connection.rt_disconnect()
     return unload_ok

homeassistant/components/tibber/config_flow.py

@@ -8,16 +8,21 @@ from typing import Any
 
 import aiohttp
 import tibber
+from tibber import data_api as tibber_data_api
+import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER, ConfigFlowResult
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
-from .const import DATA_API_DEFAULT_SCOPES, DOMAIN
+from .const import CONF_LEGACY_ACCESS_TOKEN, DATA_API_DEFAULT_SCOPES, DOMAIN
 
+DATA_SCHEMA = vol.Schema({vol.Required(CONF_LEGACY_ACCESS_TOKEN): str})
+ERR_TIMEOUT = "timeout"
 ERR_CLIENT = "cannot_connect"
 ERR_TOKEN = "invalid_access_token"
+TOKEN_URL = "https://developer.tibber.com/settings/access-token"
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -31,7 +36,8 @@ class TibberConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
     def __init__(self) -> None:
         """Initialize the config flow."""
         super().__init__()
-        self._oauth_data: dict[str, Any] | None = None
+        self._access_token: str | None = None
+        self._title = ""
 
     @property
     def logger(self) -> logging.Logger:
@@ -46,70 +52,114 @@ class TibberConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
             "scope": " ".join(DATA_API_DEFAULT_SCOPES),
         }
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle a reauth flow."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
+    async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Confirm reauthentication by reusing the user step."""
+        """Handle the initial step."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
-        return await self.async_step_user()
+            data_schema = self.add_suggested_values_to_schema(
+                DATA_SCHEMA, {CONF_LEGACY_ACCESS_TOKEN: self._access_token or ""}
+            )
 
-    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
-        """Finalize the OAuth flow and create the config entry."""
-        self._oauth_data = data
-        return await self._async_validate_and_create()
+            return self.async_show_form(
+                step_id=SOURCE_USER,
+                data_schema=data_schema,
+                description_placeholders={"url": TOKEN_URL},
+                errors={},
+            )
 
-    async def async_step_connection_error(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle connection error retry."""
-        if user_input is not None:
-            return await self._async_validate_and_create()
-        return self.async_show_form(step_id="connection_error")
-
-    async def _async_validate_and_create(self) -> ConfigFlowResult:
-        """Validate the OAuth token and create the config entry."""
-        assert self._oauth_data is not None
-        access_token = self._oauth_data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+        self._access_token = user_input[CONF_LEGACY_ACCESS_TOKEN].replace(" ", "")
         tibber_connection = tibber.Tibber(
-            access_token=access_token,
+            access_token=self._access_token,
             websession=async_get_clientsession(self.hass),
         )
+        self._title = tibber_connection.name or "Tibber"
 
+        errors: dict[str, str] = {}
         try:
             await tibber_connection.update_info()
         except TimeoutError:
-            return await self.async_step_connection_error()
+            errors[CONF_LEGACY_ACCESS_TOKEN] = ERR_TIMEOUT
         except tibber.InvalidLoginError:
-            return self.async_abort(reason=ERR_TOKEN)
+            errors[CONF_LEGACY_ACCESS_TOKEN] = ERR_TOKEN
         except (
             aiohttp.ClientError,
             tibber.RetryableHttpExceptionError,
+            tibber.FatalHttpExceptionError,
         ):
-            return await self.async_step_connection_error()
-        except tibber.FatalHttpExceptionError:
-            return self.async_abort(reason=ERR_CLIENT)
+            errors[CONF_LEGACY_ACCESS_TOKEN] = ERR_CLIENT
+
+        if errors:
+            data_schema = self.add_suggested_values_to_schema(
+                DATA_SCHEMA, {CONF_LEGACY_ACCESS_TOKEN: self._access_token or ""}
+            )
+
+            return self.async_show_form(
+                step_id=SOURCE_USER,
+                data_schema=data_schema,
+                description_placeholders={"url": TOKEN_URL},
+                errors=errors,
+            )
 
         await self.async_set_unique_id(tibber_connection.user_id)
 
-        title = tibber_connection.name or "Tibber"
         if self.source == SOURCE_REAUTH:
             reauth_entry = self._get_reauth_entry()
             self._abort_if_unique_id_mismatch(
                 reason="wrong_account",
                 description_placeholders={"title": reauth_entry.title},
             )
+        else:
+            self._abort_if_unique_id_configured()
+
+        return await self.async_step_pick_implementation()
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle a reauth flow."""
+        reauth_entry = self._get_reauth_entry()
+        self._access_token = reauth_entry.data.get(CONF_LEGACY_ACCESS_TOKEN)
+        self._title = reauth_entry.title
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm reauthentication by reusing the user step."""
+        reauth_entry = self._get_reauth_entry()
+        self._access_token = reauth_entry.data.get(CONF_LEGACY_ACCESS_TOKEN)
+        self._title = reauth_entry.title
+        if user_input is None:
+            return self.async_show_form(
+                step_id="reauth_confirm",
+            )
+        return await self.async_step_user()
+
+    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
+        """Finalize the OAuth flow and create the config entry."""
+        if self._access_token is None:
+            return self.async_abort(reason="missing_configuration")
+
+        data[CONF_LEGACY_ACCESS_TOKEN] = self._access_token
+
+        access_token = data[CONF_TOKEN][CONF_ACCESS_TOKEN]
+        data_api_client = tibber_data_api.TibberDataAPI(
+            access_token,
+            websession=async_get_clientsession(self.hass),
+        )
+
+        try:
+            await data_api_client.get_userinfo()
+        except (aiohttp.ClientError, TimeoutError):
+            return self.async_abort(reason="cannot_connect")
+
+        if self.source == SOURCE_REAUTH:
+            reauth_entry = self._get_reauth_entry()
             return self.async_update_reload_and_abort(
                 reauth_entry,
-                data=self._oauth_data,
-                title=title,
+                data=data,
+                title=self._title,
             )
 
-        self._abort_if_unique_id_configured()
-        return self.async_create_entry(title=title, data=self._oauth_data)
+        return self.async_create_entry(title=self._title, data=data)

homeassistant/components/tibber/const.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ACCESS_TOKEN
 
 if TYPE_CHECKING:
     from . import TibberRuntimeData
@@ -12,6 +13,8 @@ if TYPE_CHECKING:
 type TibberConfigEntry = ConfigEntry[TibberRuntimeData]
 
 
+CONF_LEGACY_ACCESS_TOKEN = CONF_ACCESS_TOKEN
+
 AUTH_IMPLEMENTATION = "auth_implementation"
 DATA_HASS_CONFIG = "tibber_hass_config"
 DOMAIN = "tibber"

homeassistant/components/tibber/coordinator.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, cast
 
 from aiohttp.client_exceptions import ClientError
 import tibber
-from tibber.data_api import TibberDevice
+from tibber.data_api import TibberDataAPI, TibberDevice
 
 from homeassistant.components.recorder import get_instance
 from homeassistant.components.recorder.models import (
@@ -230,26 +230,28 @@ class TibberDataAPICoordinator(DataUpdateCoordinator[dict[str, TibberDevice]]):
             return device_sensors.get(sensor_id)
         return None
 
-    async def _async_get_client(self) -> tibber.Tibber:
-        """Get the Tibber client with error handling."""
+    async def _async_get_client(self) -> TibberDataAPI:
+        """Get the Tibber Data API client with error handling."""
         try:
             return await self._runtime_data.async_get_client(self.hass)
         except ConfigEntryAuthFailed:
             raise
         except (ClientError, TimeoutError, tibber.UserAgentMissingError) as err:
-            raise UpdateFailed(f"Unable to create Tibber client: {err}") from err
+            raise UpdateFailed(
+                f"Unable to create Tibber Data API client: {err}"
+            ) from err
 
     async def _async_setup(self) -> None:
         """Initial load of Tibber Data API devices."""
         client = await self._async_get_client()
-        devices = await client.data_api.get_all_devices()
+        devices = await client.get_all_devices()
         self._build_sensor_lookup(devices)
 
     async def _async_update_data(self) -> dict[str, TibberDevice]:
         """Fetch the latest device capabilities from the Tibber Data API."""
         client = await self._async_get_client()
         try:
-            devices: dict[str, TibberDevice] = await client.data_api.update_devices()
+            devices: dict[str, TibberDevice] = await client.update_devices()
         except tibber.exceptions.RateLimitExceededError as err:
             raise UpdateFailed(
                 f"Rate limit exceeded, retry after {err.retry_after} seconds",

homeassistant/components/tibber/diagnostics.py

@@ -15,7 +15,6 @@ async def async_get_config_entry_diagnostics(
     """Return diagnostics for a config entry."""
 
     runtime = config_entry.runtime_data
-    tibber_connection = await runtime.async_get_client(hass)
     result: dict[str, Any] = {
         "homes": [
             {
@@ -25,7 +24,7 @@ async def async_get_config_entry_diagnostics(
                 "last_cons_data_timestamp": home.last_cons_data_timestamp,
                 "country": home.country,
             }
-            for home in tibber_connection.get_homes(only_active=False)
+            for home in runtime.tibber_connection.get_homes(only_active=False)
         ]
     }
 

homeassistant/components/tibber/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/tibber",
   "iot_class": "cloud_polling",
   "loggers": ["tibber"],
-  "requirements": ["pyTibber==0.35.0"]
+  "requirements": ["pyTibber==0.34.4"]
 }