Use HassKey in qwikswitch (#161066)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/ci.yaml

@@ -247,17 +247,11 @@ jobs:
       && github.event.inputs.audit-licenses-only != 'true'
     steps:
       - *checkout
-      - name: Register yamllint problem matcher
+      - name: Register problem matchers
         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(.+)$",
+          "regexp": "^(.+):\\s(marked executable but has no \\(or invalid\\) shebang!.*)$",
           "file": 1,
           "message": 2
         }

homeassistant/components/alarm_control_panel/condition.py

@@ -0,0 +1,93 @@
+"""Provides conditions for alarm control panels."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.condition import (
+    Condition,
+    EntityStateConditionBase,
+    make_entity_state_condition,
+)
+from homeassistant.helpers.entity import get_supported_features
+
+from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelState
+
+
+def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool:
+    """Test if an entity supports the specified features."""
+    try:
+        return bool(get_supported_features(hass, entity_id) & features)
+    except HomeAssistantError:
+        return False
+
+
+class EntityStateRequiredFeaturesCondition(EntityStateConditionBase):
+    """State condition."""
+
+    _required_features: int
+
+    def entity_filter(self, entities: set[str]) -> set[str]:
+        """Filter entities of this domain with the required features."""
+        entities = super().entity_filter(entities)
+        return {
+            entity_id
+            for entity_id in entities
+            if supports_feature(self._hass, entity_id, self._required_features)
+        }
+
+
+def make_entity_state_required_features_condition(
+    domain: str, to_state: str, required_features: int
+) -> type[EntityStateRequiredFeaturesCondition]:
+    """Create an entity state condition class with required feature filtering."""
+
+    class CustomCondition(EntityStateRequiredFeaturesCondition):
+        """Condition for entity state changes."""
+
+        _domain = domain
+        _states = {to_state}
+        _required_features = required_features
+
+    return CustomCondition
+
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_armed": make_entity_state_condition(
+        DOMAIN,
+        {
+            AlarmControlPanelState.ARMED_AWAY,
+            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+            AlarmControlPanelState.ARMED_HOME,
+            AlarmControlPanelState.ARMED_NIGHT,
+            AlarmControlPanelState.ARMED_VACATION,
+        },
+    ),
+    "is_armed_away": make_entity_state_required_features_condition(
+        DOMAIN,
+        AlarmControlPanelState.ARMED_AWAY,
+        AlarmControlPanelEntityFeature.ARM_AWAY,
+    ),
+    "is_armed_home": make_entity_state_required_features_condition(
+        DOMAIN,
+        AlarmControlPanelState.ARMED_HOME,
+        AlarmControlPanelEntityFeature.ARM_HOME,
+    ),
+    "is_armed_night": make_entity_state_required_features_condition(
+        DOMAIN,
+        AlarmControlPanelState.ARMED_NIGHT,
+        AlarmControlPanelEntityFeature.ARM_NIGHT,
+    ),
+    "is_armed_vacation": make_entity_state_required_features_condition(
+        DOMAIN,
+        AlarmControlPanelState.ARMED_VACATION,
+        AlarmControlPanelEntityFeature.ARM_VACATION,
+    ),
+    "is_disarmed": make_entity_state_condition(DOMAIN, AlarmControlPanelState.DISARMED),
+    "is_triggered": make_entity_state_condition(
+        DOMAIN, AlarmControlPanelState.TRIGGERED
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the alarm control panel conditions."""
+    return CONDITIONS

homeassistant/components/alarm_control_panel/conditions.yaml

@@ -0,0 +1,52 @@
+.condition_common: &condition_common
+  target:
+    entity:
+      domain: alarm_control_panel
+  fields: &condition_common_fields
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+is_armed: *condition_common
+
+is_armed_away:
+  fields: *condition_common_fields
+  target:
+    entity:
+      domain: alarm_control_panel
+      supported_features:
+        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_AWAY
+
+is_armed_home:
+  fields: *condition_common_fields
+  target:
+    entity:
+      domain: alarm_control_panel
+      supported_features:
+        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_HOME
+
+is_armed_night:
+  fields: *condition_common_fields
+  target:
+    entity:
+      domain: alarm_control_panel
+      supported_features:
+        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_NIGHT
+
+is_armed_vacation:
+  fields: *condition_common_fields
+  target:
+    entity:
+      domain: alarm_control_panel
+      supported_features:
+        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_VACATION
+
+is_disarmed: *condition_common
+
+is_triggered: *condition_common

homeassistant/components/alarm_control_panel/icons.json

@@ -1,4 +1,27 @@
 {
+  "conditions": {
+    "is_armed": {
+      "condition": "mdi:shield"
+    },
+    "is_armed_away": {
+      "condition": "mdi:shield-lock"
+    },
+    "is_armed_home": {
+      "condition": "mdi:shield-home"
+    },
+    "is_armed_night": {
+      "condition": "mdi:shield-moon"
+    },
+    "is_armed_vacation": {
+      "condition": "mdi:shield-airplane"
+    },
+    "is_disarmed": {
+      "condition": "mdi:shield-off"
+    },
+    "is_triggered": {
+      "condition": "mdi:bell-ring"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:shield",

homeassistant/components/alarm_control_panel/strings.json

@@ -1,8 +1,82 @@
 {
   "common": {
+    "condition_behavior_description": "How the state should match on the targeted alarms.",
+    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
+  "conditions": {
+    "is_armed": {
+      "description": "Tests if one or more alarms are armed.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is armed"
+    },
+    "is_armed_away": {
+      "description": "Tests if one or more alarms are armed in away mode.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is armed away"
+    },
+    "is_armed_home": {
+      "description": "Tests if one or more alarms are armed in home mode.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is armed home"
+    },
+    "is_armed_night": {
+      "description": "Tests if one or more alarms are armed in night mode.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is armed night"
+    },
+    "is_armed_vacation": {
+      "description": "Tests if one or more alarms are armed in vacation mode.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is armed vacation"
+    },
+    "is_disarmed": {
+      "description": "Tests if one or more alarms are disarmed.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is disarmed"
+    },
+    "is_triggered": {
+      "description": "Tests if one or more alarms are triggered.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
+          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If an alarm is triggered"
+    }
+  },
   "device_automation": {
     "action_type": {
       "arm_away": "Arm {entity_name} away",
@@ -76,6 +150,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/alarm_control_panel/trigger.py

@@ -14,7 +14,7 @@ from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelStat
 
 
 def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool:
-    """Get the device class of an entity or UNDEFINED if not found."""
+    """Test if an entity supports the specified features."""
     try:
         return bool(get_supported_features(hass, entity_id) & features)
     except HomeAssistantError:
@@ -39,7 +39,7 @@ class EntityStateTriggerRequiredFeatures(EntityTargetStateTriggerBase):
 def make_entity_state_trigger_required_features(
     domain: str, to_state: str, required_features: int
 ) -> type[EntityTargetStateTriggerBase]:
-    """Create an entity state trigger class."""
+    """Create an entity state trigger class with required feature filtering."""
 
     class CustomTrigger(EntityStateTriggerRequiredFeatures):
         """Trigger for entity state changes."""

homeassistant/components/assist_satellite/condition.py

@@ -0,0 +1,23 @@
+"""Provides conditions for assist satellites."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from .const import DOMAIN
+from .entity import AssistSatelliteState
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_idle": make_entity_state_condition(DOMAIN, AssistSatelliteState.IDLE),
+    "is_listening": make_entity_state_condition(DOMAIN, AssistSatelliteState.LISTENING),
+    "is_processing": make_entity_state_condition(
+        DOMAIN, AssistSatelliteState.PROCESSING
+    ),
+    "is_responding": make_entity_state_condition(
+        DOMAIN, AssistSatelliteState.RESPONDING
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the assist satellite conditions."""
+    return CONDITIONS

homeassistant/components/assist_satellite/conditions.yaml

@@ -0,0 +1,19 @@
+.condition_common: &condition_common
+  target:
+    entity:
+      domain: assist_satellite
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+is_idle: *condition_common
+is_listening: *condition_common
+is_processing: *condition_common
+is_responding: *condition_common

homeassistant/components/assist_satellite/icons.json

@@ -1,4 +1,18 @@
 {
+  "conditions": {
+    "is_idle": {
+      "condition": "mdi:chat-sleep"
+    },
+    "is_listening": {
+      "condition": "mdi:chat-question"
+    },
+    "is_processing": {
+      "condition": "mdi:chat-processing"
+    },
+    "is_responding": {
+      "condition": "mdi:chat-alert"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:account-voice"

homeassistant/components/assist_satellite/strings.json

@@ -1,8 +1,52 @@
 {
   "common": {
+    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
+    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
+  "conditions": {
+    "is_idle": {
+      "description": "Tests if one or more Assist satellites are idle.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is idle"
+    },
+    "is_listening": {
+      "description": "Tests if one or more Assist satellites are listening.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is listening"
+    },
+    "is_processing": {
+      "description": "Tests if one or more Assist satellites are processing.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is processing"
+    },
+    "is_responding": {
+      "description": "Tests if one or more Assist satellites are responding.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is responding"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "Assist satellite",
@@ -21,6 +65,12 @@
         "sentences": "Sentences"
       }
     },
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/automation/__init__.py

@@ -123,6 +123,8 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
+    "alarm_control_panel",
+    "assist_satellite",
     "fan",
     "light",
 }

homeassistant/components/blebox/sensor.py

@@ -1,5 +1,7 @@
 """BleBox sensor entities."""
 
+from datetime import datetime
+
 import blebox_uniapi.sensor
 
 from homeassistant.components.sensor import (
@@ -146,7 +148,7 @@ class BleBoxSensorEntity(BleBoxEntity[blebox_uniapi.sensor.BaseSensor], SensorEn
         return self._feature.native_value
 
     @property
-    def last_reset(self):
+    def last_reset(self) -> datetime | None:
         """Return the time when the sensor was last reset, if implemented."""
         native_implementation = getattr(self._feature, "last_reset", None)
 

homeassistant/components/blueprint/websocket_api.py

@@ -64,6 +64,7 @@ def _ws_with_blueprint_domain(
     return with_domain_blueprints
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "blueprint/list",
@@ -97,6 +98,7 @@ async def ws_list_blueprints(
     connection.send_result(msg["id"], results)
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "blueprint/import",
@@ -150,6 +152,7 @@ async def ws_import_blueprint(
     )
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "blueprint/save",
@@ -206,6 +209,7 @@ async def ws_save_blueprint(
     )
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "blueprint/delete",
@@ -233,6 +237,7 @@ async def ws_delete_blueprint(
     )
 
 
+@websocket_api.require_admin
 @websocket_api.websocket_command(
     {
         vol.Required("type"): "blueprint/substitute",

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 = config[CONF_NAME]
-    code = config.get(CONF_CODE)
-    mode = config[CONF_MODE]
-    host = config[CONF_HOST]
-    port = config[CONF_PORT]
+    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]
 
     url = f"http://{host}:{port}"
 
@@ -72,7 +72,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
         | AlarmControlPanelEntityFeature.ARM_AWAY
     )
 
-    def __init__(self, url, name, code, mode):
+    def __init__(self, url: str, name: str, code: str | None, mode: str) -> None:
         """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, state):
+    def _validate_code(self, code: str | None, state: AlarmControlPanelState) -> bool:
         """Validate given code."""
         if self._code is None:
             return True

homeassistant/components/concord232/binary_sensor.py

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

homeassistant/components/digital_ocean/__init__.py

@@ -1,6 +1,7 @@
 """Support for Digital Ocean."""
 
-from datetime import timedelta
+from __future__ import annotations
+
 import logging
 
 import digitalocean
@@ -12,27 +13,12 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
+from .const import DATA_DIGITAL_OCEAN, DOMAIN, MIN_TIME_BETWEEN_UPDATES
+
 _LOGGER = logging.getLogger(__name__)
 
-ATTR_CREATED_AT = "created_at"
-ATTR_DROPLET_ID = "droplet_id"
-ATTR_DROPLET_NAME = "droplet_name"
-ATTR_FEATURES = "features"
-ATTR_IPV4_ADDRESS = "ipv4_address"
-ATTR_IPV6_ADDRESS = "ipv6_address"
-ATTR_MEMORY = "memory"
-ATTR_REGION = "region"
-ATTR_VCPUS = "vcpus"
 
-ATTRIBUTION = "Data provided by Digital Ocean"
-
-CONF_DROPLETS = "droplets"
-
-DATA_DIGITAL_OCEAN = "data_do"
 DIGITAL_OCEAN_PLATFORMS = [Platform.SWITCH, Platform.BINARY_SENSOR]
-DOMAIN = "digital_ocean"
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
 
 CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.Schema({vol.Required(CONF_ACCESS_TOKEN): cv.string})},

homeassistant/components/digital_ocean/binary_sensor.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
 import voluptuous as vol
 
@@ -16,7 +17,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import (
+from .const import (
     ATTR_CREATED_AT,
     ATTR_DROPLET_ID,
     ATTR_DROPLET_NAME,
@@ -65,6 +66,7 @@ class DigitalOceanBinarySensor(BinarySensorEntity):
     """Representation of a Digital Ocean droplet sensor."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_device_class = BinarySensorDeviceClass.MOVING
 
     def __init__(self, do, droplet_id):
         """Initialize a new Digital Ocean sensor."""
@@ -79,17 +81,12 @@ class DigitalOceanBinarySensor(BinarySensorEntity):
         return self.data.name
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
         return self.data.status == "active"
 
     @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor."""
-        return BinarySensorDeviceClass.MOVING
-
-    @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes of the Digital Ocean droplet."""
         return {
             ATTR_CREATED_AT: self.data.created_at,

homeassistant/components/digital_ocean/const.py

@@ -0,0 +1,30 @@
+"""Support for Digital Ocean."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+from typing import TYPE_CHECKING
+
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from . import DigitalOcean
+
+ATTR_CREATED_AT = "created_at"
+ATTR_DROPLET_ID = "droplet_id"
+ATTR_DROPLET_NAME = "droplet_name"
+ATTR_FEATURES = "features"
+ATTR_IPV4_ADDRESS = "ipv4_address"
+ATTR_IPV6_ADDRESS = "ipv6_address"
+ATTR_MEMORY = "memory"
+ATTR_REGION = "region"
+ATTR_VCPUS = "vcpus"
+
+ATTRIBUTION = "Data provided by Digital Ocean"
+
+CONF_DROPLETS = "droplets"
+
+DOMAIN = "digital_ocean"
+DATA_DIGITAL_OCEAN: HassKey[DigitalOcean] = HassKey(DOMAIN)
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)

homeassistant/components/digital_ocean/switch.py

@@ -16,7 +16,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import (
+from .const import (
     ATTR_CREATED_AT,
     ATTR_DROPLET_ID,
     ATTR_DROPLET_NAME,
@@ -80,12 +80,12 @@ class DigitalOceanSwitch(SwitchEntity):
         return self.data.name
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if switch is on."""
         return self.data.status == "active"
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes of the Digital Ocean droplet."""
         return {
             ATTR_CREATED_AT: self.data.created_at,

homeassistant/components/ebusd/__init__.py

@@ -1,6 +1,7 @@
 """Support for Ebusd daemon for communication with eBUS heating systems."""
 
 import logging
+from typing import Any
 
 import ebusdpy
 import voluptuous as vol
@@ -17,7 +18,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN, SENSOR_TYPES
+from .const import DOMAIN, EBUSD_DATA, SENSOR_TYPES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -28,9 +29,9 @@ CACHE_TTL = 900
 SERVICE_EBUSD_WRITE = "ebusd_write"
 
 
-def verify_ebusd_config(config):
+def verify_ebusd_config(config: ConfigType) -> ConfigType:
     """Verify eBusd config."""
-    circuit = config[CONF_CIRCUIT]
+    circuit: str = config[CONF_CIRCUIT]
     for condition in config[CONF_MONITORED_CONDITIONS]:
         if condition not in SENSOR_TYPES[circuit]:
             raise vol.Invalid(f"Condition '{condition}' not in '{circuit}'.")
@@ -59,17 +60,17 @@ CONFIG_SCHEMA = vol.Schema(
 def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the eBusd component."""
     _LOGGER.debug("Integration setup started")
-    conf = config[DOMAIN]
-    name = conf[CONF_NAME]
-    circuit = conf[CONF_CIRCUIT]
-    monitored_conditions = conf.get(CONF_MONITORED_CONDITIONS)
-    server_address = (conf.get(CONF_HOST), conf.get(CONF_PORT))
+    conf: ConfigType = config[DOMAIN]
+    name: str = conf[CONF_NAME]
+    circuit: str = conf[CONF_CIRCUIT]
+    monitored_conditions: list[str] = conf[CONF_MONITORED_CONDITIONS]
+    server_address: tuple[str, int] = (conf[CONF_HOST], conf[CONF_PORT])
 
     try:
         ebusdpy.init(server_address)
     except (TimeoutError, OSError):
         return False
-    hass.data[DOMAIN] = EbusdData(server_address, circuit)
+    hass.data[EBUSD_DATA] = EbusdData(server_address, circuit)
     sensor_config = {
         CONF_MONITORED_CONDITIONS: monitored_conditions,
         "client_name": name,
@@ -77,7 +78,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     }
     load_platform(hass, Platform.SENSOR, DOMAIN, sensor_config, config)
 
-    hass.services.register(DOMAIN, SERVICE_EBUSD_WRITE, hass.data[DOMAIN].write)
+    hass.services.register(DOMAIN, SERVICE_EBUSD_WRITE, hass.data[EBUSD_DATA].write)
 
     _LOGGER.debug("Ebusd integration setup completed")
     return True
@@ -86,13 +87,13 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class EbusdData:
     """Get the latest data from Ebusd."""
 
-    def __init__(self, address, circuit):
+    def __init__(self, address: tuple[str, int], circuit: str) -> None:
         """Initialize the data object."""
         self._circuit = circuit
         self._address = address
-        self.value = {}
+        self.value: dict[str, Any] = {}
 
-    def update(self, name, stype):
+    def update(self, name: str, stype: int) -> None:
         """Call the Ebusd API to update the data."""
         try:
             _LOGGER.debug("Opening socket to ebusd %s", name)

homeassistant/components/ebusd/const.py

@@ -1,5 +1,9 @@
 """Constants for ebus component."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
@@ -8,277 +12,283 @@ from homeassistant.const import (
     UnitOfTemperature,
     UnitOfTime,
 )
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from . import EbusdData
 
 DOMAIN = "ebusd"
+EBUSD_DATA: HassKey[EbusdData] = HassKey(DOMAIN)
 
 #  SensorTypes from ebusdpy module :
 #  0='decimal', 1='time-schedule', 2='switch', 3='string', 4='value;status'
 
-SENSOR_TYPES = {
+type SensorSpecs = tuple[str, str | None, str | None, int, SensorDeviceClass | None]
+SENSOR_TYPES: dict[str, dict[str, SensorSpecs]] = {
     "700": {
-        "ActualFlowTemperatureDesired": [
+        "ActualFlowTemperatureDesired": (
             "Hc1ActualFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "MaxFlowTemperatureDesired": [
+        ),
+        "MaxFlowTemperatureDesired": (
             "Hc1MaxFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "MinFlowTemperatureDesired": [
+        ),
+        "MinFlowTemperatureDesired": (
             "Hc1MinFlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "PumpStatus": ["Hc1PumpStatus", None, "mdi:toggle-switch", 2, None],
-        "HCSummerTemperatureLimit": [
+        ),
+        "PumpStatus": ("Hc1PumpStatus", None, "mdi:toggle-switch", 2, None),
+        "HCSummerTemperatureLimit": (
             "Hc1SummerTempLimit",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "HolidayTemperature": [
+        ),
+        "HolidayTemperature": (
             "HolidayTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "HWTemperatureDesired": [
+        ),
+        "HWTemperatureDesired": (
             "HwcTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "HWActualTemperature": [
+        ),
+        "HWActualTemperature": (
             "HwcStorageTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "HWTimerMonday": ["hwcTimer.Monday", None, "mdi:timer-outline", 1, None],
-        "HWTimerTuesday": ["hwcTimer.Tuesday", None, "mdi:timer-outline", 1, None],
-        "HWTimerWednesday": ["hwcTimer.Wednesday", None, "mdi:timer-outline", 1, None],
-        "HWTimerThursday": ["hwcTimer.Thursday", None, "mdi:timer-outline", 1, None],
-        "HWTimerFriday": ["hwcTimer.Friday", None, "mdi:timer-outline", 1, None],
-        "HWTimerSaturday": ["hwcTimer.Saturday", None, "mdi:timer-outline", 1, None],
-        "HWTimerSunday": ["hwcTimer.Sunday", None, "mdi:timer-outline", 1, None],
-        "HWOperativeMode": ["HwcOpMode", None, "mdi:math-compass", 3, None],
-        "WaterPressure": [
+        ),
+        "HWTimerMonday": ("hwcTimer.Monday", None, "mdi:timer-outline", 1, None),
+        "HWTimerTuesday": ("hwcTimer.Tuesday", None, "mdi:timer-outline", 1, None),
+        "HWTimerWednesday": ("hwcTimer.Wednesday", None, "mdi:timer-outline", 1, None),
+        "HWTimerThursday": ("hwcTimer.Thursday", None, "mdi:timer-outline", 1, None),
+        "HWTimerFriday": ("hwcTimer.Friday", None, "mdi:timer-outline", 1, None),
+        "HWTimerSaturday": ("hwcTimer.Saturday", None, "mdi:timer-outline", 1, None),
+        "HWTimerSunday": ("hwcTimer.Sunday", None, "mdi:timer-outline", 1, None),
+        "HWOperativeMode": ("HwcOpMode", None, "mdi:math-compass", 3, None),
+        "WaterPressure": (
             "WaterPressure",
             UnitOfPressure.BAR,
             "mdi:water-pump",
             0,
             SensorDeviceClass.PRESSURE,
-        ],
-        "Zone1RoomZoneMapping": ["z1RoomZoneMapping", None, "mdi:label", 0, None],
-        "Zone1NightTemperature": [
+        ),
+        "Zone1RoomZoneMapping": ("z1RoomZoneMapping", None, "mdi:label", 0, None),
+        "Zone1NightTemperature": (
             "z1NightTemp",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-night",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Zone1DayTemperature": [
+        ),
+        "Zone1DayTemperature": (
             "z1DayTemp",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-sunny",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Zone1HolidayTemperature": [
+        ),
+        "Zone1HolidayTemperature": (
             "z1HolidayTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Zone1RoomTemperature": [
+        ),
+        "Zone1RoomTemperature": (
             "z1RoomTemp",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Zone1ActualRoomTemperatureDesired": [
+        ),
+        "Zone1ActualRoomTemperatureDesired": (
             "z1ActualRoomTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Zone1TimerMonday": ["z1Timer.Monday", None, "mdi:timer-outline", 1, None],
-        "Zone1TimerTuesday": ["z1Timer.Tuesday", None, "mdi:timer-outline", 1, None],
-        "Zone1TimerWednesday": [
+        ),
+        "Zone1TimerMonday": ("z1Timer.Monday", None, "mdi:timer-outline", 1, None),
+        "Zone1TimerTuesday": ("z1Timer.Tuesday", None, "mdi:timer-outline", 1, None),
+        "Zone1TimerWednesday": (
             "z1Timer.Wednesday",
             None,
             "mdi:timer-outline",
             1,
             None,
-        ],
-        "Zone1TimerThursday": ["z1Timer.Thursday", None, "mdi:timer-outline", 1, None],
-        "Zone1TimerFriday": ["z1Timer.Friday", None, "mdi:timer-outline", 1, None],
-        "Zone1TimerSaturday": ["z1Timer.Saturday", None, "mdi:timer-outline", 1, None],
-        "Zone1TimerSunday": ["z1Timer.Sunday", None, "mdi:timer-outline", 1, None],
-        "Zone1OperativeMode": ["z1OpMode", None, "mdi:math-compass", 3, None],
-        "ContinuosHeating": [
+        ),
+        "Zone1TimerThursday": ("z1Timer.Thursday", None, "mdi:timer-outline", 1, None),
+        "Zone1TimerFriday": ("z1Timer.Friday", None, "mdi:timer-outline", 1, None),
+        "Zone1TimerSaturday": ("z1Timer.Saturday", None, "mdi:timer-outline", 1, None),
+        "Zone1TimerSunday": ("z1Timer.Sunday", None, "mdi:timer-outline", 1, None),
+        "Zone1OperativeMode": ("z1OpMode", None, "mdi:math-compass", 3, None),
+        "ContinuosHeating": (
             "ContinuosHeating",
             UnitOfTemperature.CELSIUS,
             "mdi:weather-snowy",
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "PowerEnergyConsumptionLastMonth": [
+        ),
+        "PowerEnergyConsumptionLastMonth": (
             "PrEnergySumHcLastMonth",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ],
-        "PowerEnergyConsumptionThisMonth": [
+        ),
+        "PowerEnergyConsumptionThisMonth": (
             "PrEnergySumHcThisMonth",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ],
+        ),
     },
     "ehp": {
-        "HWTemperature": [
+        "HWTemperature": (
             "HwcTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "OutsideTemp": [
+        ),
+        "OutsideTemp": (
             "OutsideTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
+        ),
     },
     "bai": {
-        "HotWaterTemperature": [
+        "HotWaterTemperature": (
             "HwcTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "StorageTemperature": [
+        ),
+        "StorageTemperature": (
             "StorageTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "DesiredStorageTemperature": [
+        ),
+        "DesiredStorageTemperature": (
             "StorageTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "OutdoorsTemperature": [
+        ),
+        "OutdoorsTemperature": (
             "OutdoorstempSensor",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "WaterPressure": [
+        ),
+        "WaterPressure": (
             "WaterPressure",
             UnitOfPressure.BAR,
             "mdi:pipe",
             4,
             SensorDeviceClass.PRESSURE,
-        ],
-        "AverageIgnitionTime": [
+        ),
+        "AverageIgnitionTime": (
             "averageIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ],
-        "MaximumIgnitionTime": [
+        ),
+        "MaximumIgnitionTime": (
             "maxIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ],
-        "MinimumIgnitionTime": [
+        ),
+        "MinimumIgnitionTime": (
             "minIgnitiontime",
             UnitOfTime.SECONDS,
             "mdi:av-timer",
             0,
             SensorDeviceClass.DURATION,
-        ],
-        "ReturnTemperature": [
+        ),
+        "ReturnTemperature": (
             "ReturnTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "CentralHeatingPump": ["WP", None, "mdi:toggle-switch", 2, None],
-        "HeatingSwitch": ["HeatingSwitch", None, "mdi:toggle-switch", 2, None],
-        "DesiredFlowTemperature": [
+        ),
+        "CentralHeatingPump": ("WP", None, "mdi:toggle-switch", 2, None),
+        "HeatingSwitch": ("HeatingSwitch", None, "mdi:toggle-switch", 2, None),
+        "DesiredFlowTemperature": (
             "FlowTempDesired",
             UnitOfTemperature.CELSIUS,
             None,
             0,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "FlowTemperature": [
+        ),
+        "FlowTemperature": (
             "FlowTemp",
             UnitOfTemperature.CELSIUS,
             None,
             4,
             SensorDeviceClass.TEMPERATURE,
-        ],
-        "Flame": ["Flame", None, "mdi:toggle-switch", 2, None],
-        "PowerEnergyConsumptionHeatingCircuit": [
+        ),
+        "Flame": ("Flame", None, "mdi:toggle-switch", 2, None),
+        "PowerEnergyConsumptionHeatingCircuit": (
             "PrEnergySumHc1",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ],
-        "PowerEnergyConsumptionHotWaterCircuit": [
+        ),
+        "PowerEnergyConsumptionHotWaterCircuit": (
             "PrEnergySumHwc1",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ],
-        "RoomThermostat": ["DCRoomthermostat", None, "mdi:toggle-switch", 2, None],
-        "HeatingPartLoad": [
+        ),
+        "RoomThermostat": ("DCRoomthermostat", None, "mdi:toggle-switch", 2, None),
+        "HeatingPartLoad": (
             "PartloadHcKW",
             UnitOfEnergy.KILO_WATT_HOUR,
             "mdi:flash",
             0,
             SensorDeviceClass.ENERGY,
-        ],
-        "StateNumber": ["StateNumber", None, "mdi:fire", 3, None],
-        "ModulationPercentage": [
+        ),
+        "StateNumber": ("StateNumber", None, "mdi:fire", 3, None),
+        "ModulationPercentage": (
             "ModulationTempDesired",
             PERCENTAGE,
             "mdi:percent",
             0,
             None,
-        ],
+        ),
     },
 }

homeassistant/components/ebusd/sensor.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import datetime
 import logging
+from typing import Any, cast
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
@@ -11,7 +12,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle, dt as dt_util
 
-from .const import DOMAIN
+from . import EbusdData
+from .const import EBUSD_DATA, SensorSpecs
 
 TIME_FRAME1_BEGIN = "time_frame1_begin"
 TIME_FRAME1_END = "time_frame1_end"
@@ -33,9 +35,9 @@ def setup_platform(
     """Set up the Ebus sensor."""
     if not discovery_info:
         return
-    ebusd_api = hass.data[DOMAIN]
-    monitored_conditions = discovery_info["monitored_conditions"]
-    name = discovery_info["client_name"]
+    ebusd_api = hass.data[EBUSD_DATA]
+    monitored_conditions: list[str] = discovery_info["monitored_conditions"]
+    name: str = discovery_info["client_name"]
 
     add_entities(
         (
@@ -49,9 +51,8 @@ def setup_platform(
 class EbusdSensor(SensorEntity):
     """Ebusd component sensor methods definition."""
 
-    def __init__(self, data, sensor, name):
+    def __init__(self, data: EbusdData, sensor: SensorSpecs, name: str) -> None:
         """Initialize the sensor."""
-        self._state = None
         self._client_name = name
         (
             self._name,
@@ -63,20 +64,15 @@ class EbusdSensor(SensorEntity):
         self.data = data
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the sensor."""
         return f"{self._client_name} {self._name}"
 
     @property
-    def native_value(self):
-        """Return the state of the sensor."""
-        return self._state
-
-    @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return the device state attributes."""
-        if self._type == 1 and self._state is not None:
-            schedule = {
+        if self._type == 1 and (native_value := self.native_value) is not None:
+            schedule: dict[str, str | None] = {
                 TIME_FRAME1_BEGIN: None,
                 TIME_FRAME1_END: None,
                 TIME_FRAME2_BEGIN: None,
@@ -84,7 +80,7 @@ class EbusdSensor(SensorEntity):
                 TIME_FRAME3_BEGIN: None,
                 TIME_FRAME3_END: None,
             }
-            time_frame = self._state.split(";")
+            time_frame = cast(str, native_value).split(";")
             for index, item in enumerate(sorted(schedule.items())):
                 if index < len(time_frame):
                     parsed = datetime.datetime.strptime(time_frame[index], "%H:%M")
@@ -101,12 +97,12 @@ class EbusdSensor(SensorEntity):
         return self._device_class
 
     @property
-    def icon(self):
+    def icon(self) -> str | None:
         """Icon to use in the frontend, if any."""
         return self._icon
 
     @property
-    def native_unit_of_measurement(self):
+    def native_unit_of_measurement(self) -> str | None:
         """Return the unit of measurement."""
         return self._unit_of_measurement
 
@@ -118,6 +114,6 @@ class EbusdSensor(SensorEntity):
             if self._name not in self.data.value:
                 return
 
-            self._state = self.data.value[self._name]
+            self._attr_native_value = self.data.value[self._name]
         except RuntimeError:
             _LOGGER.debug("EbusdData.update exception")

homeassistant/components/egardia/__init__.py

@@ -18,6 +18,7 @@ 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__)
 
@@ -35,7 +36,7 @@ DEFAULT_REPORT_SERVER_PORT = 52010
 DEFAULT_VERSION = "GATE-01"
 DOMAIN = "egardia"
 
-EGARDIA_DEVICE = "egardiadevice"
+EGARDIA_DEVICE: HassKey[egardiadevice.EgardiaDevice] = HassKey(DOMAIN)
 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,6 +4,7 @@ from __future__ import annotations
 
 import logging
 
+from pythonegardia.egardiadevice import EgardiaDevice
 import requests
 
 from homeassistant.components.alarm_control_panel import (
@@ -11,6 +12,7 @@ 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
@@ -47,10 +49,10 @@ def setup_platform(
     if discovery_info is None:
         return
     device = EgardiaAlarm(
-        discovery_info["name"],
+        discovery_info[CONF_NAME],
         hass.data[EGARDIA_DEVICE],
         discovery_info[CONF_REPORT_SERVER_ENABLED],
-        discovery_info.get(CONF_REPORT_SERVER_CODES),
+        discovery_info[CONF_REPORT_SERVER_CODES],
         discovery_info[CONF_REPORT_SERVER_PORT],
     )
 
@@ -67,8 +69,13 @@ class EgardiaAlarm(AlarmControlPanelEntity):
     )
 
     def __init__(
-        self, name, egardiasystem, rs_enabled=False, rs_codes=None, rs_port=52010
-    ):
+        self,
+        name: str,
+        egardiasystem: EgardiaDevice,
+        rs_enabled: bool,
+        rs_codes: dict[str, list[str]],
+        rs_port: int,
+    ) -> None:
         """Initialize the Egardia alarm."""
         self._attr_name = name
         self._egardiasystem = egardiasystem
@@ -85,9 +92,7 @@ class EgardiaAlarm(AlarmControlPanelEntity):
     @property
     def should_poll(self) -> bool:
         """Poll if no report server is enabled."""
-        if not self._rs_enabled:
-            return True
-        return False
+        return not self._rs_enabled
 
     def handle_status_event(self, event):
         """Handle the Egardia system status event."""

homeassistant/components/egardia/binary_sensor.py

@@ -2,11 +2,12 @@
 
 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
@@ -51,30 +52,20 @@ async def async_setup_platform(
 class EgardiaBinarySensor(BinarySensorEntity):
     """Represents a sensor based on an Egardia sensor (IR, Door Contact)."""
 
-    def __init__(self, sensor_id, name, egardia_system, device_class):
+    def __init__(
+        self,
+        sensor_id: str,
+        name: str,
+        egardia_system: EgardiaDevice,
+        device_class: BinarySensorDeviceClass | None,
+    ) -> None:
         """Initialize the sensor device."""
         self._id = sensor_id
-        self._name = name
-        self._state = None
-        self._device_class = device_class
+        self._attr_name = name
+        self._attr_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._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
+        self._attr_is_on = bool(egardia_input)

homeassistant/components/envisalink/__init__.py

@@ -18,12 +18,13 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.util.hass_dict import HassKey
 
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "envisalink"
 
-DATA_EVL = "envisalink"
+DATA_EVL: HassKey[EnvisalinkAlarmPanel] = HassKey(DOMAIN)
 
 CONF_EVL_KEEPALIVE = "keepalive_interval"
 CONF_EVL_PORT = "port"

homeassistant/components/envisalink/alarm_control_panel.py

@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
+from pyenvisalink import EnvisalinkAlarmPanel
 import voluptuous as vol
 
 from homeassistant.components.alarm_control_panel import (
@@ -22,6 +24,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from . import (
     CONF_PANIC,
     CONF_PARTITIONNAME,
+    CONF_PARTITIONS,
     DATA_EVL,
     DOMAIN,
     PARTITION_SCHEMA,
@@ -51,15 +54,14 @@ async def async_setup_platform(
     """Perform the setup for Envisalink alarm panels."""
     if not discovery_info:
         return
-    configured_partitions = discovery_info["partitions"]
-    code = discovery_info[CONF_CODE]
-    panic_type = discovery_info[CONF_PANIC]
+    configured_partitions: dict[int, dict[str, Any]] = discovery_info[CONF_PARTITIONS]
+    code: str | None = discovery_info[CONF_CODE]
+    panic_type: str = discovery_info[CONF_PANIC]
 
     entities = []
-    for part_num in configured_partitions:
-        entity_config_data = PARTITION_SCHEMA(configured_partitions[part_num])
+    for part_num, part_config in configured_partitions.items():
+        entity_config_data = PARTITION_SCHEMA(part_config)
         entity = EnvisalinkAlarm(
-            hass,
             part_num,
             entity_config_data[CONF_PARTITIONNAME],
             code,
@@ -103,8 +105,14 @@ class EnvisalinkAlarm(EnvisalinkEntity, AlarmControlPanelEntity):
     )
 
     def __init__(
-        self, hass, partition_number, alarm_name, code, panic_type, info, controller
-    ):
+        self,
+        partition_number: int,
+        alarm_name: str,
+        code: str | None,
+        panic_type: str,
+        info: dict[str, Any],
+        controller: EnvisalinkAlarmPanel,
+    ) -> None:
         """Initialize the alarm panel."""
         self._partition_number = partition_number
         self._panic_type = panic_type

homeassistant/components/envisalink/binary_sensor.py

@@ -4,6 +4,9 @@ from __future__ import annotations
 
 import datetime
 import logging
+from typing import Any
+
+from pyenvisalink import EnvisalinkAlarmPanel
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -16,7 +19,14 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
-from . import CONF_ZONENAME, CONF_ZONETYPE, DATA_EVL, SIGNAL_ZONE_UPDATE, ZONE_SCHEMA
+from . import (
+    CONF_ZONENAME,
+    CONF_ZONES,
+    CONF_ZONETYPE,
+    DATA_EVL,
+    SIGNAL_ZONE_UPDATE,
+    ZONE_SCHEMA,
+)
 from .entity import EnvisalinkEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -31,13 +41,12 @@ async def async_setup_platform(
     """Set up the Envisalink binary sensor entities."""
     if not discovery_info:
         return
-    configured_zones = discovery_info["zones"]
+    configured_zones: dict[int, dict[str, Any]] = discovery_info[CONF_ZONES]
 
     entities = []
-    for zone_num in configured_zones:
-        entity_config_data = ZONE_SCHEMA(configured_zones[zone_num])
+    for zone_num, zone_data in configured_zones.items():
+        entity_config_data = ZONE_SCHEMA(zone_data)
         entity = EnvisalinkBinarySensor(
-            hass,
             zone_num,
             entity_config_data[CONF_ZONENAME],
             entity_config_data[CONF_ZONETYPE],
@@ -52,9 +61,16 @@ async def async_setup_platform(
 class EnvisalinkBinarySensor(EnvisalinkEntity, BinarySensorEntity):
     """Representation of an Envisalink binary sensor."""
 
-    def __init__(self, hass, zone_number, zone_name, zone_type, info, controller):
+    def __init__(
+        self,
+        zone_number: int,
+        zone_name: str,
+        zone_type: BinarySensorDeviceClass,
+        info: dict[str, Any],
+        controller: EnvisalinkAlarmPanel,
+    ) -> None:
         """Initialize the binary_sensor."""
-        self._zone_type = zone_type
+        self._attr_device_class = zone_type
         self._zone_number = zone_number
 
         _LOGGER.debug("Setting up zone: %s", zone_name)
@@ -69,9 +85,9 @@ class EnvisalinkBinarySensor(EnvisalinkEntity, BinarySensorEntity):
         )
 
     @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
-        attr = {}
+        attr: dict[str, Any] = {}
 
         # The Envisalink library returns a "last_fault" value that's the
         # number of seconds since the last fault, up to a maximum of 327680
@@ -104,11 +120,6 @@ class EnvisalinkBinarySensor(EnvisalinkEntity, BinarySensorEntity):
         """Return true if sensor is on."""
         return self._info["status"]["open"]
 
-    @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor, from DEVICE_CLASSES."""
-        return self._zone_type
-
     @callback
     def async_update_callback(self, zone):
         """Update the zone's state, if needed."""

homeassistant/components/envisalink/entity.py

@@ -1,5 +1,9 @@
 """Support for Envisalink devices."""
 
+from typing import Any
+
+from pyenvisalink import EnvisalinkAlarmPanel
+
 from homeassistant.helpers.entity import Entity
 
 
@@ -8,13 +12,10 @@ class EnvisalinkEntity(Entity):
 
     _attr_should_poll = False
 
-    def __init__(self, name, info, controller):
+    def __init__(
+        self, name: str, info: dict[str, Any], controller: EnvisalinkAlarmPanel
+    ) -> None:
         """Initialize the device."""
         self._controller = controller
         self._info = info
-        self._name = name
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return self._name
+        self._attr_name = name

homeassistant/components/envisalink/sensor.py

@@ -3,6 +3,9 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
+
+from pyenvisalink import EnvisalinkAlarmPanel
 
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.core import HomeAssistant, callback
@@ -12,6 +15,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from . import (
     CONF_PARTITIONNAME,
+    CONF_PARTITIONS,
     DATA_EVL,
     PARTITION_SCHEMA,
     SIGNAL_KEYPAD_UPDATE,
@@ -31,13 +35,12 @@ async def async_setup_platform(
     """Perform the setup for Envisalink sensor entities."""
     if not discovery_info:
         return
-    configured_partitions = discovery_info["partitions"]
+    configured_partitions: dict[int, dict[str, Any]] = discovery_info[CONF_PARTITIONS]
 
     entities = []
-    for part_num in configured_partitions:
-        entity_config_data = PARTITION_SCHEMA(configured_partitions[part_num])
+    for part_num, part_config in configured_partitions.items():
+        entity_config_data = PARTITION_SCHEMA(part_config)
         entity = EnvisalinkSensor(
-            hass,
             entity_config_data[CONF_PARTITIONNAME],
             part_num,
             hass.data[DATA_EVL].alarm_state["partition"][part_num],
@@ -52,9 +55,16 @@ async def async_setup_platform(
 class EnvisalinkSensor(EnvisalinkEntity, SensorEntity):
     """Representation of an Envisalink keypad."""
 
-    def __init__(self, hass, partition_name, partition_number, info, controller):
+    _attr_icon = "mdi:alarm"
+
+    def __init__(
+        self,
+        partition_name: str,
+        partition_number: int,
+        info: dict[str, Any],
+        controller: EnvisalinkAlarmPanel,
+    ) -> None:
         """Initialize the sensor."""
-        self._icon = "mdi:alarm"
         self._partition_number = partition_number
 
         _LOGGER.debug("Setting up sensor for partition: %s", partition_name)
@@ -73,11 +83,6 @@ class EnvisalinkSensor(EnvisalinkEntity, SensorEntity):
             )
         )
 
-    @property
-    def icon(self):
-        """Return the icon if any."""
-        return self._icon
-
     @property
     def native_value(self):
         """Return the overall state."""

homeassistant/components/envisalink/switch.py

@@ -5,13 +5,21 @@ from __future__ import annotations
 import logging
 from typing import Any
 
+from pyenvisalink import EnvisalinkAlarmPanel
+
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import CONF_ZONENAME, DATA_EVL, SIGNAL_ZONE_BYPASS_UPDATE, ZONE_SCHEMA
+from . import (
+    CONF_ZONENAME,
+    CONF_ZONES,
+    DATA_EVL,
+    SIGNAL_ZONE_BYPASS_UPDATE,
+    ZONE_SCHEMA,
+)
 from .entity import EnvisalinkEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -26,16 +34,15 @@ async def async_setup_platform(
     """Set up the Envisalink switch entities."""
     if not discovery_info:
         return
-    configured_zones = discovery_info["zones"]
+    configured_zones: dict[int, dict[str, Any]] = discovery_info[CONF_ZONES]
 
     entities = []
-    for zone_num in configured_zones:
-        entity_config_data = ZONE_SCHEMA(configured_zones[zone_num])
+    for zone_num, zone_data in configured_zones.items():
+        entity_config_data = ZONE_SCHEMA(zone_data)
         zone_name = f"{entity_config_data[CONF_ZONENAME]}_bypass"
         _LOGGER.debug("Setting up zone_bypass switch: %s", zone_name)
 
         entity = EnvisalinkSwitch(
-            hass,
             zone_num,
             zone_name,
             hass.data[DATA_EVL].alarm_state["zone"][zone_num],
@@ -49,7 +56,13 @@ async def async_setup_platform(
 class EnvisalinkSwitch(EnvisalinkEntity, SwitchEntity):
     """Representation of an Envisalink switch."""
 
-    def __init__(self, hass, zone_number, zone_name, info, controller):
+    def __init__(
+        self,
+        zone_number: int,
+        zone_name: str,
+        info: dict[str, Any],
+        controller: EnvisalinkAlarmPanel,
+    ) -> None:
         """Initialize the switch."""
         self._zone_number = zone_number
 

homeassistant/components/essent/const.py

@@ -7,7 +7,7 @@ from enum import StrEnum
 from typing import Final
 
 DOMAIN: Final = "essent"
-UPDATE_INTERVAL: Final = timedelta(hours=12)
+UPDATE_INTERVAL: Final = timedelta(hours=1)
 ATTRIBUTION: Final = "Data provided by Essent"
 
 

homeassistant/components/frontend/manifest.json

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

homeassistant/components/homematic/binary_sensor.py

@@ -59,7 +59,7 @@ class HMBinarySensor(HMDevice, BinarySensorEntity):
     """Representation of a binary HomeMatic device."""
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if switch is on."""
         if not self.available:
             return False
@@ -73,7 +73,7 @@ class HMBinarySensor(HMDevice, BinarySensorEntity):
             return BinarySensorDeviceClass.MOTION
         return SENSOR_TYPES_CLASS.get(self._hmdevice.__class__.__name__)
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate the data dictionary (self._data) from metadata."""
         # Add state to data struct
         if self._state:
@@ -86,11 +86,11 @@ class HMBatterySensor(HMDevice, BinarySensorEntity):
     _attr_device_class = BinarySensorDeviceClass.BATTERY
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return True if battery is low."""
         return bool(self._hm_get_state())
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate the data dictionary (self._data) from metadata."""
         # Add state to data struct
         if self._state:

homeassistant/components/homematic/climate.py

@@ -178,7 +178,7 @@ class HMThermostat(HMDevice, ClimateEntity):
         # Homematic
         return self._data.get("CONTROL_MODE")
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dict (self._data) from the Homematic metadata."""
         self._state = next(iter(self._hmdevice.WRITENODE.keys()))
         self._data[self._state] = None

homeassistant/components/homematic/cover.py

@@ -78,7 +78,7 @@ class HMCover(HMDevice, CoverEntity):
         """Stop the device if in motion."""
         self._hmdevice.stop(self._channel)
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dictionary (self._data) from metadata."""
         self._state = "LEVEL"
         self._data.update({self._state: None})
@@ -138,7 +138,7 @@ class HMGarage(HMCover):
         """Return whether the cover is closed."""
         return self._hmdevice.is_closed(self._hm_get_state())
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dictionary (self._data) from metadata."""
         self._state = "DOOR_STATE"
         self._data.update({self._state: None})

homeassistant/components/homematic/entity.py

@@ -204,7 +204,7 @@ class HMDevice(Entity):
         self._init_data_struct()
 
     @abstractmethod
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dictionary from the HomeMatic device metadata."""
 
 

homeassistant/components/homematic/light.py

@@ -51,7 +51,7 @@ class HMLight(HMDevice, LightEntity):
     _attr_max_color_temp_kelvin = 6500  # 153 Mireds
 
     @property
-    def brightness(self):
+    def brightness(self) -> int | None:
         """Return the brightness of this light between 0..255."""
         # Is dimmer?
         if self._state == "LEVEL":
@@ -59,7 +59,7 @@ class HMLight(HMDevice, LightEntity):
         return None
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if light is on."""
         try:
             return self._hm_get_state() > 0
@@ -98,7 +98,7 @@ class HMLight(HMDevice, LightEntity):
         return features
 
     @property
-    def hs_color(self):
+    def hs_color(self) -> tuple[float, float] | None:
         """Return the hue and saturation color value [float, float]."""
         if ColorMode.HS not in self.supported_color_modes:
             return None
@@ -116,14 +116,14 @@ class HMLight(HMDevice, LightEntity):
         )
 
     @property
-    def effect_list(self):
+    def effect_list(self) -> list[str] | None:
         """Return the list of supported effects."""
         if not self.supported_features & LightEntityFeature.EFFECT:
             return None
         return self._hmdevice.get_effect_list()
 
     @property
-    def effect(self):
+    def effect(self) -> str | None:
         """Return the current color change program of the light."""
         if not self.supported_features & LightEntityFeature.EFFECT:
             return None
@@ -166,7 +166,7 @@ class HMLight(HMDevice, LightEntity):
 
         self._hmdevice.off(self._channel)
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dict (self._data) from the Homematic metadata."""
         # Use LEVEL
         self._state = "LEVEL"

homeassistant/components/homematic/lock.py

@@ -48,7 +48,7 @@ class HMLock(HMDevice, LockEntity):
         """Open the door latch."""
         self._hmdevice.open()
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate the data dictionary (self._data) from metadata."""
         self._state = "STATE"
         self._data.update({self._state: None})

homeassistant/components/homematic/sensor.py

@@ -339,7 +339,7 @@ class HMSensor(HMDevice, SensorEntity):
         # No cast, return original value
         return self._hm_get_state()
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate a data dictionary (self._data) from metadata."""
         if self._state:
             self._data.update({self._state: None})

homeassistant/components/homematic/switch.py

@@ -35,7 +35,7 @@ class HMSwitch(HMDevice, SwitchEntity):
     """Representation of a HomeMatic switch."""
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return True if switch is on."""
         try:
             return self._hm_get_state() > 0
@@ -43,7 +43,7 @@ class HMSwitch(HMDevice, SwitchEntity):
             return False
 
     @property
-    def today_energy_kwh(self):
+    def today_energy_kwh(self) -> float | None:
         """Return the current power usage in kWh."""
         if "ENERGY_COUNTER" in self._data:
             try:
@@ -61,7 +61,7 @@ class HMSwitch(HMDevice, SwitchEntity):
         """Turn the switch off."""
         self._hmdevice.off(self._channel)
 
-    def _init_data_struct(self):
+    def _init_data_struct(self) -> None:
         """Generate the data dictionary (self._data) from metadata."""
         self._state = "STATE"
         self._data.update({self._state: None})

homeassistant/components/hue/v1/sensor_base.py

@@ -181,7 +181,7 @@ class GenericHueSensor(GenericHueDevice, entity.Entity):  # pylint: disable=hass
         )
 
     @property
-    def state_class(self):
+    def state_class(self) -> SensorStateClass:
         """Return the state class of this entity, from STATE_CLASSES, if any."""
         return SensorStateClass.MEASUREMENT
 

homeassistant/components/knx/manifest.json

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

homeassistant/components/labs/__init__.py

@@ -18,7 +18,11 @@ 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
+from .helpers import (
+    async_is_preview_feature_enabled,
+    async_listen,
+    async_update_preview_feature,
+)
 from .models import (
     EventLabsUpdatedData,
     LabPreviewFeature,
@@ -37,6 +41,7 @@ __all__ = [
     "EventLabsUpdatedData",
     "async_is_preview_feature_enabled",
     "async_listen",
+    "async_update_preview_feature",
 ]
 
 

homeassistant/components/labs/helpers.py

@@ -61,3 +61,32 @@ 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,12 +8,14 @@ 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
-from .models import EventLabsUpdatedData
+from .helpers import (
+    async_is_preview_feature_enabled,
+    async_listen,
+    async_update_preview_feature,
+)
 
 
 @callback
@@ -95,19 +97,7 @@ async def websocket_update_preview_feature(
             )
             return
 
-    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)
+    await async_update_preview_feature(hass, domain, preview_feature, enabled)
 
     connection.send_result(msg["id"])
 

homeassistant/components/light/conditions.yaml

@@ -1,18 +1,4 @@
-is_off:
-  target:
-    entity:
-      domain: light
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-is_on:
+.condition_common: &condition_common
   target:
     entity:
       domain: light
@@ -26,3 +12,6 @@ is_on:
           options:
             - all
             - any
+
+is_off: *condition_common
+is_on: *condition_common

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.SENSOR]
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 

homeassistant/components/mastodon/binary_sensor.py

@@ -0,0 +1,128 @@
+"""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,5 +1,18 @@
 {
   "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,6 +26,16 @@
     }
   },
   "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,6 +489,7 @@ 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/strings.json

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

homeassistant/components/mealie/manifest.json

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

homeassistant/components/mfi/sensor.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from mficlient.client import FailedToLogin, MFiClient
+from mficlient.client import FailedToLogin, MFiClient, Port as MFiPort
 import requests
 import voluptuous as vol
 
@@ -12,6 +12,7 @@ from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
+    StateType,
 )
 from homeassistant.const import (
     CONF_HOST,
@@ -64,24 +65,29 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up mFi sensors."""
-    host = config.get(CONF_HOST)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    use_tls = config.get(CONF_SSL)
-    verify_tls = config.get(CONF_VERIFY_SSL)
+    host: str = config[CONF_HOST]
+    username: str = config[CONF_USERNAME]
+    password: str = config[CONF_PASSWORD]
+    use_tls: bool = config[CONF_SSL]
+    verify_tls: bool = config[CONF_VERIFY_SSL]
     default_port = 6443 if use_tls else 6080
-    port = int(config.get(CONF_PORT, default_port))
+    network_port: int = config.get(CONF_PORT, default_port)
 
     try:
         client = MFiClient(
-            host, username, password, port=port, use_tls=use_tls, verify=verify_tls
+            host,
+            username,
+            password,
+            port=network_port,
+            use_tls=use_tls,
+            verify=verify_tls,
         )
     except (FailedToLogin, requests.exceptions.ConnectionError) as ex:
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
         return
 
     add_entities(
-        MfiSensor(port, hass)
+        MfiSensor(port)
         for device in client.get_devices()
         for port in device.ports.values()
         if port.model in SENSOR_MODELS
@@ -91,18 +97,17 @@ def setup_platform(
 class MfiSensor(SensorEntity):
     """Representation of a mFi sensor."""
 
-    def __init__(self, port, hass):
+    def __init__(self, port: MFiPort) -> None:
         """Initialize the sensor."""
         self._port = port
-        self._hass = hass
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the sensor."""
         return self._port.label
 
     @property
-    def native_value(self):
+    def native_value(self) -> StateType:
         """Return the state of the sensor."""
         try:
             tag = self._port.tag
@@ -129,7 +134,7 @@ class MfiSensor(SensorEntity):
         return None
 
     @property
-    def native_unit_of_measurement(self):
+    def native_unit_of_measurement(self) -> str | None:
         """Return the unit of measurement of this entity, if any."""
         try:
             tag = self._port.tag

homeassistant/components/mfi/switch.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from mficlient.client import FailedToLogin, MFiClient
+from mficlient.client import FailedToLogin, MFiClient, Port as MFiPort
 import requests
 import voluptuous as vol
 
@@ -51,18 +51,23 @@ def setup_platform(
     add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up mFi sensors."""
-    host = config.get(CONF_HOST)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    use_tls = config[CONF_SSL]
-    verify_tls = config.get(CONF_VERIFY_SSL)
+    """Set up mFi switches."""
+    host: str = config[CONF_HOST]
+    username: str = config[CONF_USERNAME]
+    password: str = config[CONF_PASSWORD]
+    use_tls: bool = config[CONF_SSL]
+    verify_tls: bool = config[CONF_VERIFY_SSL]
     default_port = 6443 if use_tls else 6080
-    port = int(config.get(CONF_PORT, default_port))
+    network_port: int = config.get(CONF_PORT, default_port)
 
     try:
         client = MFiClient(
-            host, username, password, port=port, use_tls=use_tls, verify=verify_tls
+            host,
+            username,
+            password,
+            port=network_port,
+            use_tls=use_tls,
+            verify=verify_tls,
         )
     except (FailedToLogin, requests.exceptions.ConnectionError) as ex:
         _LOGGER.error("Unable to connect to mFi: %s", str(ex))
@@ -79,23 +84,23 @@ def setup_platform(
 class MfiSwitch(SwitchEntity):
     """Representation of an mFi switch-able device."""
 
-    def __init__(self, port):
+    def __init__(self, port: MFiPort) -> None:
         """Initialize the mFi device."""
         self._port = port
-        self._target_state = None
+        self._target_state: bool | None = None
 
     @property
-    def unique_id(self):
+    def unique_id(self) -> str:
         """Return the unique ID of the device."""
         return self._port.ident
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the device."""
         return self._port.label
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool | None:
         """Return true if the device is on."""
         return self._port.output
 

homeassistant/components/nina/config_flow.py

@@ -141,7 +141,7 @@ class NinaConfigFlow(ConfigFlow, domain=DOMAIN):
 
             try:
                 self._all_region_codes_sorted = swap_key_value(
-                    await nina.getAllRegionalCodes()
+                    await nina.get_all_regional_codes()
                 )
             except ApiError:
                 return self.async_abort(reason="no_fetch")
@@ -221,7 +221,7 @@ class OptionsFlowHandler(OptionsFlowWithReload):
 
             try:
                 self._all_region_codes_sorted = swap_key_value(
-                    await nina.getAllRegionalCodes()
+                    await nina.get_all_regional_codes()
                 )
             except ApiError:
                 return self.async_abort(reason="no_fetch")

homeassistant/components/nina/coordinator.py

@@ -66,7 +66,7 @@ class NINADataUpdateCoordinator(
 
         regions: dict[str, str] = config_entry.data[CONF_REGIONS]
         for region in regions:
-            self._nina.addRegion(region)
+            self._nina.add_region(region)
 
         super().__init__(
             hass,
@@ -151,7 +151,7 @@ class NINADataUpdateCoordinator(
                     raw_warn.sent or "",
                     raw_warn.start or "",
                     raw_warn.expires or "",
-                    raw_warn.isValid(),
+                    raw_warn.is_valid,
                 )
                 warnings_for_regions.append(warning_data)
 

homeassistant/components/nina/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "cloud_polling",
   "loggers": ["pynina"],
   "quality_scale": "bronze",
-  "requirements": ["pynina==0.3.6"],
+  "requirements": ["pynina==1.0.2"],
   "single_config_entry": true
 }

homeassistant/components/oasa_telematics/sensor.py

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

homeassistant/components/onedrive/manifest.json

@@ -10,5 +10,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["onedrive_personal_sdk"],
   "quality_scale": "platinum",
-  "requirements": ["onedrive-personal-sdk==0.0.17"]
+  "requirements": ["onedrive-personal-sdk==0.1.0"]
 }

homeassistant/components/openai_conversation/__init__.py

@@ -259,7 +259,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: OpenAIConfigEntry) -> bo
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: OpenAIConfigEntry) -> bool:
     """Unload OpenAI."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
@@ -280,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[ConfigEntry, bool]] = {}
+    api_keys_entries: dict[str, tuple[OpenAIConfigEntry, bool]] = {}
     entity_registry = er.async_get(hass)
     device_registry = dr.async_get(hass)
 

homeassistant/components/openai_conversation/ai_task.py

@@ -10,7 +10,6 @@ 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
@@ -35,7 +34,7 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: OpenAIConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up AI Task entities."""

homeassistant/components/openai_conversation/config_flow.py

@@ -112,45 +112,49 @@ class OpenAIConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
-        if user_input is None:
-            return self.async_show_form(
-                step_id="user", data_schema=STEP_USER_DATA_SCHEMA
-            )
 
         errors: dict[str, str] = {}
 
-        self._async_abort_entries_match(user_input)
-        try:
-            await validate_input(self.hass, user_input)
-        except openai.APIConnectionError:
-            errors["base"] = "cannot_connect"
-        except openai.AuthenticationError:
-            errors["base"] = "invalid_auth"
-        except Exception:
-            _LOGGER.exception("Unexpected exception")
-            errors["base"] = "unknown"
-        else:
-            return self.async_create_entry(
-                title="ChatGPT",
-                data=user_input,
-                subentries=[
-                    {
-                        "subentry_type": "conversation",
-                        "data": RECOMMENDED_CONVERSATION_OPTIONS,
-                        "title": DEFAULT_CONVERSATION_NAME,
-                        "unique_id": None,
-                    },
-                    {
-                        "subentry_type": "ai_task_data",
-                        "data": RECOMMENDED_AI_TASK_OPTIONS,
-                        "title": DEFAULT_AI_TASK_NAME,
-                        "unique_id": None,
-                    },
-                ],
-            )
+        if user_input is not None:
+            self._async_abort_entries_match(user_input)
+            try:
+                await validate_input(self.hass, user_input)
+            except openai.APIConnectionError:
+                errors["base"] = "cannot_connect"
+            except openai.AuthenticationError:
+                errors["base"] = "invalid_auth"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(
+                    title="ChatGPT",
+                    data=user_input,
+                    subentries=[
+                        {
+                            "subentry_type": "conversation",
+                            "data": RECOMMENDED_CONVERSATION_OPTIONS,
+                            "title": DEFAULT_CONVERSATION_NAME,
+                            "unique_id": None,
+                        },
+                        {
+                            "subentry_type": "ai_task_data",
+                            "data": RECOMMENDED_AI_TASK_OPTIONS,
+                            "title": DEFAULT_AI_TASK_NAME,
+                            "unique_id": None,
+                        },
+                    ],
+                )
 
         return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(
+                STEP_USER_DATA_SCHEMA, user_input
+            ),
+            errors=errors,
+            description_placeholders={
+                "instructions_url": "https://www.home-assistant.io/integrations/openai_conversation/#generate-an-api-key",
+            },
         )
 
     @classmethod

homeassistant/components/openai_conversation/strings.json

@@ -12,7 +12,11 @@
       "user": {
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]"
-        }
+        },
+        "data_description": {
+          "api_key": "Your OpenAI API key."
+        },
+        "description": "Set up OpenAI Conversation integration by providing your OpenAI API key. Instructions to obtain an API key can be found [here]({instructions_url})."
       }
     }
   },

homeassistant/components/opower/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
   "quality_scale": "bronze",
-  "requirements": ["opower==0.16.2"]
+  "requirements": ["opower==0.16.3"]
 }

homeassistant/components/qwikswitch/__init__.py

@@ -24,9 +24,9 @@ from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
-_LOGGER = logging.getLogger(__name__)
+from .const import DATA_QUIKSWITCH, DOMAIN
 
-DOMAIN = "qwikswitch"
+_LOGGER = logging.getLogger(__name__)
 
 CONF_DIMMER_ADJUST = "dimmer_adjust"
 CONF_BUTTON_EVENTS = "button_events"
@@ -96,7 +96,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if not await qsusb.update_from_devices():
         return False
 
-    hass.data[DOMAIN] = qsusb
+    hass.data[DATA_QUIKSWITCH] = 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[DOMAIN].stop()
+        hass.data[DATA_QUIKSWITCH].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 . import DOMAIN
+from .const import DATA_QUIKSWITCH, 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[DOMAIN]
+    qsusb = hass.data[DATA_QUIKSWITCH]
     _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

@@ -0,0 +1,13 @@
+"""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 . import DOMAIN
+from .const import DATA_QUIKSWITCH
 
 
 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[DOMAIN].devices.set_value(self.qsid, new)
+        self.hass.data[DATA_QUIKSWITCH].devices.set_value(self.qsid, new)
 
     async def async_turn_off(self, **_):
         """Turn the device off."""
-        self.hass.data[DOMAIN].devices.set_value(self.qsid, 0)
+        self.hass.data[DATA_QUIKSWITCH].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 . import DOMAIN
+from .const import DATA_QUIKSWITCH, 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[DOMAIN]
+    qsusb = hass.data[DATA_QUIKSWITCH]
     _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 . import DOMAIN
+from .const import DATA_QUIKSWITCH, DOMAIN
 from .entity import QSToggleEntity
 
 
@@ -21,7 +21,7 @@ async def async_setup_platform(
     if discovery_info is None:
         return
 
-    qsusb = hass.data[DOMAIN]
+    qsusb = hass.data[DATA_QUIKSWITCH]
     devs = [QSSwitch(qsid, qsusb) for qsid in discovery_info[DOMAIN]]
     add_entities(devs)
 

homeassistant/components/sma/config_flow.py

@@ -144,6 +144,51 @@ 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,7 +3,9 @@
     "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%]"
+      "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."
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -29,6 +31,16 @@
         "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",
@@ -44,5 +56,13 @@
         "title": "Set up SMA Solar"
       }
     }
+  },
+  "selector": {
+    "group": {
+      "options": {
+        "installer": "Installer",
+        "user": "User"
+      }
+    }
   }
 }

homeassistant/components/smartthings/audio.py

@@ -1,265 +0,0 @@
-"""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", "http", "ffmpeg"],
+  "dependencies": ["application_credentials"],
   "dhcp": [
     {
       "hostname": "st*",

homeassistant/components/smartthings/media_player.py

@@ -6,22 +6,17 @@ 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
 
@@ -89,7 +84,6 @@ 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,
@@ -134,8 +128,6 @@ 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:
@@ -241,40 +233,6 @@ 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/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sunricher_dali",
   "iot_class": "local_push",
   "quality_scale": "silver",
-  "requirements": ["PySrDaliGateway==0.18.0"]
+  "requirements": ["PySrDaliGateway==0.19.3"]
 }

homeassistant/components/teslemetry/__init__.py

@@ -2,10 +2,10 @@
 
 import asyncio
 from collections.abc import Callable
+from functools import partial
 from typing import Final
 
-from aiohttp import ClientResponseError
-from aiohttp.client_exceptions import ClientError
+from aiohttp import ClientError, ClientResponseError
 from tesla_fleet_api.const import Scope
 from tesla_fleet_api.exceptions import (
     Forbidden,
@@ -27,6 +27,7 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -75,28 +76,48 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
+async def _get_access_token(oauth_session: OAuth2Session) -> str:
+    """Get a valid access token, refreshing if necessary."""
+    LOGGER.debug(
+        "Token valid: %s, expires_at: %s",
+        oauth_session.valid_token,
+        oauth_session.token.get("expires_at"),
+    )
+    try:
+        await oauth_session.async_ensure_token_valid()
+    except ClientResponseError as err:
+        if err.status == 401:
+            raise ConfigEntryAuthFailed from err
+        raise ConfigEntryNotReady from err
+    except (KeyError, TypeError) as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="token_data_malformed",
+        ) from err
+    except ClientError as err:
+        raise ConfigEntryNotReady from err
+    return oauth_session.token[CONF_ACCESS_TOKEN]
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -> bool:
     """Set up Teslemetry config."""
 
     session = async_get_clientsession(hass)
 
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="oauth_implementation_not_available",
+        ) from err
     oauth_session = OAuth2Session(hass, entry, implementation)
 
-    async def _get_access_token() -> str:
-        try:
-            await oauth_session.async_ensure_token_valid()
-        except ClientResponseError as e:
-            if e.status == 401:
-                raise ConfigEntryAuthFailed from e
-            raise ConfigEntryNotReady from e
-        token: str = oauth_session.token[CONF_ACCESS_TOKEN]
-        return token
-
     # Create API connection
+    access_token = partial(_get_access_token, oauth_session)
     teslemetry = Teslemetry(
         session=session,
-        access_token=_get_access_token,
+        access_token=access_token,
     )
     try:
         calls = await asyncio.gather(
@@ -154,7 +175,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
             if not stream:
                 stream = TeslemetryStream(
                     session,
-                    _get_access_token,
+                    access_token,
                     server=f"{region.lower()}.teslemetry.com",
                     parse_timestamp=True,
                     manual=True,

homeassistant/components/teslemetry/strings.json

@@ -997,7 +997,6 @@
       "total_grid_energy_exported": {
         "name": "Grid exported"
       },
-
       "total_home_usage": {
         "name": "Home usage"
       },
@@ -1127,6 +1126,9 @@
     "no_vehicle_data_for_device": {
       "message": "No vehicle data for device ID: {device_id}"
     },
+    "oauth_implementation_not_available": {
+      "message": "OAuth implementation not available, try reauthenticating"
+    },
     "set_scheduled_charging_time": {
       "message": "Scheduled charging time is required when enabling"
     },
@@ -1136,6 +1138,9 @@
     "set_scheduled_departure_preconditioning": {
       "message": "Preconditioning departure time is required when enabling"
     },
+    "token_data_malformed": {
+      "message": "Token data malformed, try reauthenticating"
+    },
     "wake_up_failed": {
       "message": "Failed to wake up vehicle: {message}"
     },

homeassistant/components/tuya/climate.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import collections
 from dataclasses import dataclass
 from typing import Any, Self
 
@@ -140,6 +141,22 @@ class _SwingModeWrapper(DeviceWrapper):
         return commands
 
 
+def _filter_hvac_mode_mappings(tuya_range: list[str]) -> dict[str, HVACMode | None]:
+    """Filter TUYA_HVAC_TO_HA modes that are not in the range.
+
+    If multiple Tuya modes map to the same HA mode, set the mapping to None to avoid
+    ambiguity when converting back from HA to Tuya modes.
+    """
+    modes_in_range = {
+        tuya_mode: TUYA_HVAC_TO_HA.get(tuya_mode) for tuya_mode in tuya_range
+    }
+    modes_occurrences = collections.Counter(modes_in_range.values())
+    for key, value in modes_in_range.items():
+        if value is not None and modes_occurrences[value] > 1:
+            modes_in_range[key] = None
+    return modes_in_range
+
+
 class _HvacModeWrapper(DPCodeEnumWrapper):
     """Wrapper for managing climate HVACMode."""
 
@@ -148,10 +165,9 @@ class _HvacModeWrapper(DPCodeEnumWrapper):
     def __init__(self, dpcode: str, type_information: EnumTypeInformation) -> None:
         """Init _HvacModeWrapper."""
         super().__init__(dpcode, type_information)
+        self._mappings = _filter_hvac_mode_mappings(type_information.range)
         self.options = [
-            TUYA_HVAC_TO_HA[tuya_mode]
-            for tuya_mode in type_information.range
-            if tuya_mode in TUYA_HVAC_TO_HA
+            ha_mode for ha_mode in self._mappings.values() if ha_mode is not None
         ]
 
     def read_device_status(self, device: CustomerDevice) -> HVACMode | None:
@@ -166,7 +182,7 @@ class _HvacModeWrapper(DPCodeEnumWrapper):
         """Convert value to raw value."""
         return next(
             tuya_mode
-            for tuya_mode, ha_mode in TUYA_HVAC_TO_HA.items()
+            for tuya_mode, ha_mode in self._mappings.items()
             if ha_mode == value
         )
 
@@ -179,10 +195,9 @@ class _PresetWrapper(DPCodeEnumWrapper):
     def __init__(self, dpcode: str, type_information: EnumTypeInformation) -> None:
         """Init _PresetWrapper."""
         super().__init__(dpcode, type_information)
+        mappings = _filter_hvac_mode_mappings(type_information.range)
         self.options = [
-            tuya_mode
-            for tuya_mode in type_information.range
-            if tuya_mode not in TUYA_HVAC_TO_HA
+            tuya_mode for tuya_mode, ha_mode in mappings.items() if ha_mode is None
         ]
 
     def read_device_status(self, device: CustomerDevice) -> str | None:

homeassistant/components/unifiprotect/number.py

@@ -5,9 +5,11 @@ from __future__ import annotations
 from collections.abc import Sequence
 from dataclasses import dataclass
 from datetime import timedelta
+import logging
 
 from uiprotect.data import (
     Camera,
+    Chime,
     Doorlock,
     Light,
     ModelType,
@@ -30,6 +32,8 @@ from .entity import (
 )
 from .utils import async_ufp_instance_command
 
+_LOGGER = logging.getLogger(__name__)
+
 PARALLEL_UPDATES = 0
 
 
@@ -245,6 +249,51 @@ _MODEL_DESCRIPTIONS: dict[ModelType, Sequence[ProtectEntityDescription]] = {
 }
 
 
+def _async_chime_ring_volume_entities(
+    data: ProtectData,
+    chime: Chime,
+) -> list[ChimeRingVolumeNumber]:
+    """Generate ring volume entities for each paired camera on a chime."""
+    entities: list[ChimeRingVolumeNumber] = []
+
+    if not chime.is_adopted_by_us:
+        return entities
+
+    auth_user = data.api.bootstrap.auth_user
+    if not chime.can_write(auth_user):
+        return entities
+
+    for ring_setting in chime.ring_settings:
+        camera = data.api.bootstrap.cameras.get(ring_setting.camera_id)
+        if camera is None:
+            _LOGGER.debug(
+                "Camera %s not found for chime %s ring volume",
+                ring_setting.camera_id,
+                chime.display_name,
+            )
+            continue
+        entities.append(ChimeRingVolumeNumber(data, chime, camera))
+
+    return entities
+
+
+def _async_all_chime_ring_volume_entities(
+    data: ProtectData,
+    chime: Chime | None = None,
+) -> list[ChimeRingVolumeNumber]:
+    """Generate all ring volume entities for chimes."""
+    entities: list[ChimeRingVolumeNumber] = []
+
+    if chime is not None:
+        return _async_chime_ring_volume_entities(data, chime)
+
+    for device in data.get_by_types({ModelType.CHIME}):
+        if isinstance(device, Chime):
+            entities.extend(_async_chime_ring_volume_entities(data, device))
+
+    return entities
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: UFPConfigEntry,
@@ -255,23 +304,26 @@ async def async_setup_entry(
 
     @callback
     def _add_new_device(device: ProtectAdoptableDeviceModel) -> None:
-        async_add_entities(
-            async_all_device_entities(
-                data,
-                ProtectNumbers,
-                model_descriptions=_MODEL_DESCRIPTIONS,
-                ufp_device=device,
-            )
-        )
-
-    data.async_subscribe_adopt(_add_new_device)
-    async_add_entities(
-        async_all_device_entities(
+        entities = async_all_device_entities(
             data,
             ProtectNumbers,
             model_descriptions=_MODEL_DESCRIPTIONS,
+            ufp_device=device,
         )
+        # Add ring volume entities for chimes
+        if isinstance(device, Chime):
+            entities += _async_all_chime_ring_volume_entities(data, device)
+        async_add_entities(entities)
+
+    data.async_subscribe_adopt(_add_new_device)
+    entities = async_all_device_entities(
+        data,
+        ProtectNumbers,
+        model_descriptions=_MODEL_DESCRIPTIONS,
     )
+    # Add ring volume entities for all chimes
+    entities += _async_all_chime_ring_volume_entities(data)
+    async_add_entities(entities)
 
 
 class ProtectNumbers(ProtectDeviceEntity, NumberEntity):
@@ -302,3 +354,62 @@ class ProtectNumbers(ProtectDeviceEntity, NumberEntity):
     async def async_set_native_value(self, value: float) -> None:
         """Set new value."""
         await self.entity_description.ufp_set(self.device, value)
+
+
+class ChimeRingVolumeNumber(ProtectDeviceEntity, NumberEntity):
+    """A UniFi Protect Number Entity for ring volume per camera on a chime."""
+
+    device: Chime
+    _state_attrs = ("_attr_available", "_attr_native_value")
+    _attr_native_max_value: float = 100
+    _attr_native_min_value: float = 0
+    _attr_native_step: float = 1
+    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_entity_category = EntityCategory.CONFIG
+
+    def __init__(
+        self,
+        data: ProtectData,
+        chime: Chime,
+        camera: Camera,
+    ) -> None:
+        """Initialize the ring volume number entity."""
+        self._camera_id = camera.id
+        # Use chime MAC and camera ID for unique ID
+        super().__init__(data, chime)
+        self._attr_unique_id = f"{chime.mac}_ring_volume_{camera.id}"
+        self._attr_translation_key = "chime_ring_volume"
+        self._attr_translation_placeholders = {"camera_name": camera.display_name}
+        # BaseProtectEntity sets _attr_name = None when no description is passed,
+        # which prevents translation_key from being used. Delete to enable translations.
+        del self._attr_name
+
+    @callback
+    def _async_update_device_from_protect(self, device: ProtectDeviceType) -> None:
+        """Update entity from protect device."""
+        super()._async_update_device_from_protect(device)
+        self._attr_native_value = self._get_ring_volume()
+
+    def _get_ring_volume(self) -> int | None:
+        """Get the ring volume for this camera from the chime's ring settings."""
+        for ring_setting in self.device.ring_settings:
+            if ring_setting.camera_id == self._camera_id:
+                return ring_setting.volume
+        return None
+
+    @property
+    def available(self) -> bool:
+        """Return if entity is available."""
+        # Entity is unavailable if the camera is no longer paired with the chime
+        return super().available and self._get_ring_volume() is not None
+
+    @async_ufp_instance_command
+    async def async_set_native_value(self, value: float) -> None:
+        """Set new ring volume value."""
+        camera = self.data.api.bootstrap.cameras.get(self._camera_id)
+        if camera is None:
+            _LOGGER.warning(
+                "Cannot set ring volume: camera %s not found", self._camera_id
+            )
+            return
+        await self.device.set_volume_for_camera_public(camera, int(value))

homeassistant/components/unifiprotect/strings.json

@@ -323,6 +323,9 @@
       "chime_duration": {
         "name": "Chime duration"
       },
+      "chime_ring_volume": {
+        "name": "Ring volume ({camera_name})"
+      },
       "doorbell_ring_volume": {
         "name": "Doorbell ring volume"
       },

homeassistant/components/utility_meter/__init__.py

@@ -9,8 +9,8 @@ import voluptuous as vol
 from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, CONF_UNIQUE_ID, Platform
-from homeassistant.core import HomeAssistant, split_entity_id
+from homeassistant.const import CONF_NAME, CONF_UNIQUE_ID, Platform
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import (
     config_validation as cv,
     discovery,
@@ -20,7 +20,6 @@ from homeassistant.helpers.device import (
     async_entity_id_to_device_id,
     async_remove_stale_devices_links_keep_entity_device,
 )
-from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
     async_remove_helper_config_entry_from_source_device,
@@ -44,9 +43,8 @@ from .const import (
     DATA_UTILITY,
     DOMAIN,
     METER_TYPES,
-    SERVICE_RESET,
-    SIGNAL_RESET_METER,
 )
+from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -120,27 +118,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up an Utility Meter."""
     hass.data[DATA_UTILITY] = {}
 
-    async def async_reset_meters(service_call):
-        """Reset all sensors of a meter."""
-        meters = service_call.data["entity_id"]
-
-        for meter in meters:
-            _LOGGER.debug("resetting meter %s", meter)
-            domain, entity = split_entity_id(meter)
-            # backward compatibility up to 2022.07:
-            if domain == DOMAIN:
-                async_dispatcher_send(
-                    hass, SIGNAL_RESET_METER, f"{SELECT_DOMAIN}.{entity}"
-                )
-            else:
-                async_dispatcher_send(hass, SIGNAL_RESET_METER, meter)
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_RESET,
-        async_reset_meters,
-        vol.Schema({ATTR_ENTITY_ID: vol.All(cv.ensure_list, [cv.entity_id])}),
-    )
+    async_setup_services(hass)
 
     if DOMAIN not in config:
         return True

homeassistant/components/utility_meter/sensor.py

@@ -700,7 +700,7 @@ class UtilityMeterSensor(RestoreSensor):
         return None
 
     @property
-    def state_class(self):
+    def state_class(self) -> SensorStateClass:
         """Return the device class of the sensor."""
         return (
             SensorStateClass.TOTAL

homeassistant/components/utility_meter/services.py

@@ -0,0 +1,43 @@
+"""Support for tracking consumption over given periods of time."""
+
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.select import DOMAIN as SELECT_DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.core import HomeAssistant, ServiceCall, callback, split_entity_id
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+from .const import DOMAIN, SERVICE_RESET, SIGNAL_RESET_METER
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_reset_meters(service_call: ServiceCall) -> None:
+    """Reset all sensors of a meter."""
+    meters = service_call.data["entity_id"]
+
+    for meter in meters:
+        _LOGGER.debug("resetting meter %s", meter)
+        domain, entity = split_entity_id(meter)
+        # backward compatibility up to 2022.07:
+        if domain == DOMAIN:
+            async_dispatcher_send(
+                service_call.hass, SIGNAL_RESET_METER, f"{SELECT_DOMAIN}.{entity}"
+            )
+        else:
+            async_dispatcher_send(service_call.hass, SIGNAL_RESET_METER, meter)
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up the services."""
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_RESET,
+        async_reset_meters,
+        vol.Schema({ATTR_ENTITY_ID: vol.All(cv.ensure_list, [cv.entity_id])}),
+    )

homeassistant/components/zwave_js/__init__.py

@@ -840,19 +840,26 @@ class NodeEvents:
         # After ensuring the node is set up in HA, we should check if the node's
         # device config has changed, and if so, issue a repair registry entry for a
         # possible reinterview
-        if not node.is_controller_node and await node.async_has_device_config_changed():
-            device_name = device.name_by_user or device.name or "Unnamed device"
-            async_create_issue(
-                self.hass,
-                DOMAIN,
-                f"device_config_file_changed.{device.id}",
-                data={"device_id": device.id, "device_name": device_name},
-                is_fixable=True,
-                is_persistent=False,
-                translation_key="device_config_file_changed",
-                translation_placeholders={"device_name": device_name},
-                severity=IssueSeverity.WARNING,
-            )
+        if not node.is_controller_node:
+            issue_id = f"device_config_file_changed.{device.id}"
+            if await node.async_has_device_config_changed():
+                device_name = device.name_by_user or device.name or "Unnamed device"
+                async_create_issue(
+                    self.hass,
+                    DOMAIN,
+                    issue_id,
+                    data={"device_id": device.id, "device_name": device_name},
+                    is_fixable=True,
+                    is_persistent=False,
+                    translation_key="device_config_file_changed",
+                    translation_placeholders={"device_name": device_name},
+                    severity=IssueSeverity.WARNING,
+                )
+            else:
+                # Clear any existing repair issue if the device config is not considered
+                # changed. This can happen when the original issue was created by
+                # an upstream bug, or the change has been reverted.
+                async_delete_issue(self.hass, DOMAIN, issue_id)
 
     async def async_handle_discovery_info(
         self,

homeassistant/package_constraints.txt

@@ -39,7 +39,7 @@ habluetooth==5.8.0
 hass-nabucasa==1.9.0
 hassil==3.5.0
 home-assistant-bluetooth==1.13.1
-home-assistant-frontend==20260107.1
+home-assistant-frontend==20260107.2
 home-assistant-intents==2026.1.6
 httpx==0.28.1
 ifaddr==0.2.0

pylint/plugins/hass_enforce_type_hints.py

@@ -700,6 +700,7 @@ _ENTITY_MATCH: list[TypeHintMatch] = [
     TypeHintMatch(
         function_name="device_class",
         return_type=["str", None],
+        mandatory=True,
     ),
     TypeHintMatch(
         function_name="unit_of_measurement",
@@ -2518,10 +2519,12 @@ _INHERITANCE_MATCH: dict[str, list[ClassTypeHintMatch]] = {
                 TypeHintMatch(
                     function_name="state_class",
                     return_type=["SensorStateClass", "str", None],
+                    mandatory=True,
                 ),
                 TypeHintMatch(
                     function_name="last_reset",
                     return_type=["datetime", None],
+                    mandatory=True,
                 ),
                 TypeHintMatch(
                     function_name="native_value",

requirements_all.txt

@@ -80,7 +80,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.sunricher_dali
-PySrDaliGateway==0.18.0
+PySrDaliGateway==0.19.3
 
 # homeassistant.components.switchbot
 PySwitchbot==0.76.0
@@ -319,7 +319,7 @@ aiolookin==1.0.0
 aiolyric==2.0.2
 
 # homeassistant.components.mealie
-aiomealie==1.1.1
+aiomealie==1.2.0
 
 # homeassistant.components.modern_forms
 aiomodernforms==0.1.8
@@ -1215,7 +1215,7 @@ hole==0.9.0
 holidays==0.84
 
 # homeassistant.components.frontend
-home-assistant-frontend==20260107.1
+home-assistant-frontend==20260107.2
 
 # homeassistant.components.conversation
 home-assistant-intents==2026.1.6
@@ -1351,7 +1351,7 @@ kiwiki-client==0.1.1
 knocki==0.4.2
 
 # homeassistant.components.knx
-knx-frontend==2025.12.30.151231
+knx-frontend==2026.1.15.112308
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1646,7 +1646,7 @@ omnilogic==0.4.5
 ondilo==0.5.0
 
 # homeassistant.components.onedrive
-onedrive-personal-sdk==0.0.17
+onedrive-personal-sdk==0.1.0
 
 # homeassistant.components.onvif
 onvif-zeep-async==4.0.4
@@ -1683,7 +1683,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.16.2
+opower==0.16.3
 
 # homeassistant.components.oralb
 oralb-ble==1.0.2
@@ -2234,7 +2234,7 @@ pynetgear==0.10.10
 pynetio==0.1.9.1
 
 # homeassistant.components.nina
-pynina==0.3.6
+pynina==1.0.2
 
 # homeassistant.components.nintendo_parental_controls
 pynintendoauth==1.0.2

requirements_test_all.txt

@@ -80,7 +80,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.sunricher_dali
-PySrDaliGateway==0.18.0
+PySrDaliGateway==0.19.3
 
 # homeassistant.components.switchbot
 PySwitchbot==0.76.0
@@ -304,7 +304,7 @@ aiolookin==1.0.0
 aiolyric==2.0.2
 
 # homeassistant.components.mealie
-aiomealie==1.1.1
+aiomealie==1.2.0
 
 # homeassistant.components.modern_forms
 aiomodernforms==0.1.8
@@ -1073,7 +1073,7 @@ hole==0.9.0
 holidays==0.84
 
 # homeassistant.components.frontend
-home-assistant-frontend==20260107.1
+home-assistant-frontend==20260107.2
 
 # homeassistant.components.conversation
 home-assistant-intents==2026.1.6
@@ -1185,7 +1185,7 @@ kegtron-ble==1.0.2
 knocki==0.4.2
 
 # homeassistant.components.knx
-knx-frontend==2025.12.30.151231
+knx-frontend==2026.1.15.112308
 
 # homeassistant.components.konnected
 konnected==1.2.0
@@ -1429,7 +1429,7 @@ omnilogic==0.4.5
 ondilo==0.5.0
 
 # homeassistant.components.onedrive
-onedrive-personal-sdk==0.0.17
+onedrive-personal-sdk==0.1.0
 
 # homeassistant.components.onvif
 onvif-zeep-async==4.0.4
@@ -1457,7 +1457,7 @@ openrgb-python==0.3.6
 openwebifpy==4.3.1
 
 # homeassistant.components.opower
-opower==0.16.2
+opower==0.16.3
 
 # homeassistant.components.oralb
 oralb-ble==1.0.2
@@ -1887,7 +1887,7 @@ pynecil==4.2.1
 pynetgear==0.10.10
 
 # homeassistant.components.nina
-pynina==0.3.6
+pynina==1.0.2
 
 # homeassistant.components.nintendo_parental_controls
 pynintendoauth==1.0.2

tests/components/__init__.py

@@ -254,13 +254,21 @@ def parametrize_condition_states(
                         state_with_attributes(other_state, False, True)
                         for other_state in other_states
                     ),
-                    (
-                        state_with_attributes(target_state, True, True)
-                        for target_state in target_states
-                    ),
-                )
+                ),
             ),
         ),
+        # Test each target state individually to isolate condition_true expectations
+        *(
+            (
+                condition,
+                condition_options,
+                [
+                    state_with_attributes(other_states[0], False, True),
+                    state_with_attributes(target_state, True, True),
+                ],
+            )
+            for target_state in target_states
+        ),
     ]
 
 

tests/components/alarm_control_panel/test_condition.py

@@ -0,0 +1,275 @@
+"""Test alarm_control_panel conditions."""
+
+from typing import Any
+
+import pytest
+
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanelEntityFeature,
+    AlarmControlPanelState,
+)
+from homeassistant.const import ATTR_SUPPORTED_FEATURES
+from homeassistant.core import HomeAssistant
+
+from tests.components import (
+    ConditionStateDescription,
+    assert_condition_gated_by_labs_flag,
+    create_target_condition,
+    other_states,
+    parametrize_condition_states,
+    parametrize_target_entities,
+    set_or_remove_state,
+    target_entities,
+)
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
+@pytest.fixture
+async def target_alarm_control_panels(hass: HomeAssistant) -> list[str]:
+    """Create multiple alarm_control_panel entities associated with different targets."""
+    return (await target_entities(hass, "alarm_control_panel"))["included"]
+
+
+@pytest.mark.parametrize(
+    "condition",
+    [
+        "alarm_control_panel.is_armed",
+        "alarm_control_panel.is_armed_away",
+        "alarm_control_panel.is_armed_home",
+        "alarm_control_panel.is_armed_night",
+        "alarm_control_panel.is_armed_vacation",
+        "alarm_control_panel.is_disarmed",
+        "alarm_control_panel.is_triggered",
+    ],
+)
+async def test_alarm_control_panel_conditions_gated_by_labs_flag(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, condition: str
+) -> None:
+    """Test the alarm_control_panel conditions are gated by the labs flag."""
+    await assert_condition_gated_by_labs_flag(hass, caplog, condition)
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("alarm_control_panel"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    [
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed",
+            target_states=[
+                AlarmControlPanelState.ARMED_AWAY,
+                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+                AlarmControlPanelState.ARMED_HOME,
+                AlarmControlPanelState.ARMED_NIGHT,
+                AlarmControlPanelState.ARMED_VACATION,
+            ],
+            other_states=[
+                AlarmControlPanelState.ARMING,
+                AlarmControlPanelState.DISARMED,
+                AlarmControlPanelState.DISARMING,
+                AlarmControlPanelState.PENDING,
+                AlarmControlPanelState.TRIGGERED,
+            ],
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_away",
+            target_states=[AlarmControlPanelState.ARMED_AWAY],
+            other_states=other_states(AlarmControlPanelState.ARMED_AWAY),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_AWAY
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_home",
+            target_states=[AlarmControlPanelState.ARMED_HOME],
+            other_states=other_states(AlarmControlPanelState.ARMED_HOME),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_HOME
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_night",
+            target_states=[AlarmControlPanelState.ARMED_NIGHT],
+            other_states=other_states(AlarmControlPanelState.ARMED_NIGHT),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_NIGHT
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_vacation",
+            target_states=[AlarmControlPanelState.ARMED_VACATION],
+            other_states=other_states(AlarmControlPanelState.ARMED_VACATION),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_VACATION
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_disarmed",
+            target_states=[AlarmControlPanelState.DISARMED],
+            other_states=other_states(AlarmControlPanelState.DISARMED),
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_triggered",
+            target_states=[AlarmControlPanelState.TRIGGERED],
+            other_states=other_states(AlarmControlPanelState.TRIGGERED),
+        ),
+    ],
+)
+async def test_alarm_control_panel_state_condition_behavior_any(
+    hass: HomeAssistant,
+    target_alarm_control_panels: list[str],
+    condition_target_config: dict,
+    entity_id: str,
+    entities_in_target: int,
+    condition: str,
+    condition_options: dict[str, Any],
+    states: list[ConditionStateDescription],
+) -> None:
+    """Test the alarm_control_panel state condition with the 'any' behavior."""
+    other_entity_ids = set(target_alarm_control_panels) - {entity_id}
+
+    # Set all alarm_control_panels, including the tested alarm_control_panel, to the initial state
+    for eid in target_alarm_control_panels:
+        set_or_remove_state(hass, eid, states[0]["included"])
+        await hass.async_block_till_done()
+
+    condition = await create_target_condition(
+        hass,
+        condition=condition,
+        target=condition_target_config,
+        behavior="any",
+    )
+
+    for state in states:
+        included_state = state["included"]
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        assert condition(hass) == state["condition_true"]
+
+        # Check if changing other alarm_control_panels also passes the condition
+        for other_entity_id in other_entity_ids:
+            set_or_remove_state(hass, other_entity_id, included_state)
+            await hass.async_block_till_done()
+        assert condition(hass) == state["condition_true"]
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("alarm_control_panel"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    [
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed",
+            target_states=[
+                AlarmControlPanelState.ARMED_AWAY,
+                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
+                AlarmControlPanelState.ARMED_HOME,
+                AlarmControlPanelState.ARMED_NIGHT,
+                AlarmControlPanelState.ARMED_VACATION,
+            ],
+            other_states=[
+                AlarmControlPanelState.ARMING,
+                AlarmControlPanelState.DISARMED,
+                AlarmControlPanelState.DISARMING,
+                AlarmControlPanelState.PENDING,
+                AlarmControlPanelState.TRIGGERED,
+            ],
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_away",
+            target_states=[AlarmControlPanelState.ARMED_AWAY],
+            other_states=other_states(AlarmControlPanelState.ARMED_AWAY),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_AWAY
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_home",
+            target_states=[AlarmControlPanelState.ARMED_HOME],
+            other_states=other_states(AlarmControlPanelState.ARMED_HOME),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_HOME
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_night",
+            target_states=[AlarmControlPanelState.ARMED_NIGHT],
+            other_states=other_states(AlarmControlPanelState.ARMED_NIGHT),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_NIGHT
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_armed_vacation",
+            target_states=[AlarmControlPanelState.ARMED_VACATION],
+            other_states=other_states(AlarmControlPanelState.ARMED_VACATION),
+            additional_attributes={
+                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_VACATION
+            },
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_disarmed",
+            target_states=[AlarmControlPanelState.DISARMED],
+            other_states=other_states(AlarmControlPanelState.DISARMED),
+        ),
+        *parametrize_condition_states(
+            condition="alarm_control_panel.is_triggered",
+            target_states=[AlarmControlPanelState.TRIGGERED],
+            other_states=other_states(AlarmControlPanelState.TRIGGERED),
+        ),
+    ],
+)
+async def test_alarm_control_panel_state_condition_behavior_all(
+    hass: HomeAssistant,
+    target_alarm_control_panels: list[str],
+    condition_target_config: dict,
+    entity_id: str,
+    entities_in_target: int,
+    condition: str,
+    condition_options: dict[str, Any],
+    states: list[ConditionStateDescription],
+) -> None:
+    """Test the alarm_control_panel state condition with the 'all' behavior."""
+    other_entity_ids = set(target_alarm_control_panels) - {entity_id}
+
+    # Set all alarm_control_panels, including the tested alarm_control_panel, to the initial state
+    for eid in target_alarm_control_panels:
+        set_or_remove_state(hass, eid, states[0]["included"])
+        await hass.async_block_till_done()
+
+    condition = await create_target_condition(
+        hass,
+        condition=condition,
+        target=condition_target_config,
+        behavior="all",
+    )
+
+    for state in states:
+        included_state = state["included"]
+
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        # The condition passes if all entities are either in a target state or invalid
+        assert condition(hass) == (
+            (not state["state_valid"])
+            or (state["condition_true"] and entities_in_target == 1)
+        )
+
+        for other_entity_id in other_entity_ids:
+            set_or_remove_state(hass, other_entity_id, included_state)
+            await hass.async_block_till_done()
+
+        # The condition passes if all entities are either in a target state or invalid
+        assert condition(hass) == (
+            (not state["state_valid"]) or state["condition_true"]
+        )

tests/components/assist_satellite/test_condition.py

@@ -0,0 +1,190 @@
+"""Test assist satellite conditions."""
+
+from typing import Any
+
+import pytest
+
+from homeassistant.components.assist_satellite.entity import AssistSatelliteState
+from homeassistant.core import HomeAssistant
+
+from tests.components import (
+    ConditionStateDescription,
+    assert_condition_gated_by_labs_flag,
+    create_target_condition,
+    other_states,
+    parametrize_condition_states,
+    parametrize_target_entities,
+    set_or_remove_state,
+    target_entities,
+)
+
+
+@pytest.fixture(autouse=True, name="stub_blueprint_populate")
+def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
+    """Stub copying the blueprints to the config folder."""
+
+
+@pytest.fixture
+async def target_assist_satellites(hass: HomeAssistant) -> list[str]:
+    """Create multiple assist satellite entities associated with different targets."""
+    return (await target_entities(hass, "assist_satellite"))["included"]
+
+
+@pytest.mark.parametrize(
+    "condition",
+    [
+        "assist_satellite.is_idle",
+        "assist_satellite.is_listening",
+        "assist_satellite.is_processing",
+        "assist_satellite.is_responding",
+    ],
+)
+async def test_assist_satellite_conditions_gated_by_labs_flag(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, condition: str
+) -> None:
+    """Test the assist satellite conditions are gated by the labs flag."""
+    await assert_condition_gated_by_labs_flag(hass, caplog, condition)
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("assist_satellite"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    [
+        *parametrize_condition_states(
+            condition="assist_satellite.is_idle",
+            target_states=[AssistSatelliteState.IDLE],
+            other_states=other_states(AssistSatelliteState.IDLE),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_listening",
+            target_states=[AssistSatelliteState.LISTENING],
+            other_states=other_states(AssistSatelliteState.LISTENING),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_processing",
+            target_states=[AssistSatelliteState.PROCESSING],
+            other_states=other_states(AssistSatelliteState.PROCESSING),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_responding",
+            target_states=[AssistSatelliteState.RESPONDING],
+            other_states=other_states(AssistSatelliteState.RESPONDING),
+        ),
+    ],
+)
+async def test_assist_satellite_state_condition_behavior_any(
+    hass: HomeAssistant,
+    target_assist_satellites: list[str],
+    condition_target_config: dict,
+    entity_id: str,
+    entities_in_target: int,
+    condition: str,
+    condition_options: dict[str, Any],
+    states: list[ConditionStateDescription],
+) -> None:
+    """Test the assist satellite state condition with the 'any' behavior."""
+    other_entity_ids = set(target_assist_satellites) - {entity_id}
+
+    # Set all assist satellites, including the tested one, to the initial state
+    for eid in target_assist_satellites:
+        set_or_remove_state(hass, eid, states[0]["included"])
+        await hass.async_block_till_done()
+
+    condition = await create_target_condition(
+        hass,
+        condition=condition,
+        target=condition_target_config,
+        behavior="any",
+    )
+
+    for state in states:
+        included_state = state["included"]
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        assert condition(hass) == state["condition_true"]
+
+        # Check if changing other assist satellites also passes the condition
+        for other_entity_id in other_entity_ids:
+            set_or_remove_state(hass, other_entity_id, included_state)
+            await hass.async_block_till_done()
+        assert condition(hass) == state["condition_true"]
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("assist_satellite"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    [
+        *parametrize_condition_states(
+            condition="assist_satellite.is_idle",
+            target_states=[AssistSatelliteState.IDLE],
+            other_states=other_states(AssistSatelliteState.IDLE),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_listening",
+            target_states=[AssistSatelliteState.LISTENING],
+            other_states=other_states(AssistSatelliteState.LISTENING),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_processing",
+            target_states=[AssistSatelliteState.PROCESSING],
+            other_states=other_states(AssistSatelliteState.PROCESSING),
+        ),
+        *parametrize_condition_states(
+            condition="assist_satellite.is_responding",
+            target_states=[AssistSatelliteState.RESPONDING],
+            other_states=other_states(AssistSatelliteState.RESPONDING),
+        ),
+    ],
+)
+async def test_assist_satellite_state_condition_behavior_all(
+    hass: HomeAssistant,
+    target_assist_satellites: list[str],
+    condition_target_config: dict,
+    entity_id: str,
+    entities_in_target: int,
+    condition: str,
+    condition_options: dict[str, Any],
+    states: list[ConditionStateDescription],
+) -> None:
+    """Test the assist satellite state condition with the 'all' behavior."""
+    other_entity_ids = set(target_assist_satellites) - {entity_id}
+
+    # Set all assist satellites, including the tested one, to the initial state
+    for eid in target_assist_satellites:
+        set_or_remove_state(hass, eid, states[0]["included"])
+        await hass.async_block_till_done()
+
+    condition = await create_target_condition(
+        hass,
+        condition=condition,
+        target=condition_target_config,
+        behavior="all",
+    )
+
+    for state in states:
+        included_state = state["included"]
+
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        # The condition passes if all entities are either in a target state or invalid
+        assert condition(hass) == (
+            (not state["state_valid"])
+            or (state["condition_true"] and entities_in_target == 1)
+        )
+
+        for other_entity_id in other_entity_ids:
+            set_or_remove_state(hass, other_entity_id, included_state)
+            await hass.async_block_till_done()
+
+        # The condition passes if all entities are either in a target state or invalid
+        assert condition(hass) == (
+            (not state["state_valid"]) or state["condition_true"]
+        )

tests/components/blueprint/test_websocket_api.py

@@ -11,6 +11,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 from homeassistant.util.yaml import UndefinedSubstitution, parse_yaml
 
+from tests.common import MockUser
 from tests.test_util.aiohttp import AiohttpClientMocker
 from tests.typing import WebSocketGenerator
 
@@ -103,6 +104,51 @@ async def test_list_blueprints_non_existing_domain(
     assert blueprints == {}
 
 
+@pytest.mark.parametrize(
+    "message",
+    [
+        {"type": "blueprint/list", "domain": "automation"},
+        {"type": "blueprint/import", "url": "https://example.com/blueprint.yaml"},
+        {
+            "type": "blueprint/save",
+            "path": "test_save",
+            "yaml": "raw_data",
+            "domain": "automation",
+        },
+        {
+            "type": "blueprint/delete",
+            "path": "test_delete",
+            "domain": "automation",
+        },
+        {
+            "type": "blueprint/substitute",
+            "domain": "automation",
+            "path": "test_event_service.yaml",
+            "input": {
+                "trigger_event": "test_event",
+                "service_to_call": "test.automation",
+                "a_number": 5,
+            },
+        },
+    ],
+)
+async def test_blueprint_ws_command_requires_admin(
+    hass: HomeAssistant,
+    hass_ws_client: WebSocketGenerator,
+    hass_admin_user: MockUser,
+    message: dict[str, Any],
+) -> None:
+    """Test that blueprint websocket commands require admin."""
+    hass_admin_user.groups = []  # Remove admin privileges
+    client = await hass_ws_client(hass)
+    await client.send_json_auto_id(message)
+
+    msg = await client.receive_json()
+
+    assert not msg["success"]
+    assert msg["error"]["code"] == "unauthorized"
+
+
 async def test_import_blueprint(
     hass: HomeAssistant,
     aioclient_mock: AiohttpClientMocker,

tests/components/esphome/test_analytics.py

@@ -1,7 +1,5 @@
 """Tests for analytics platform."""
 
-import pytest
-
 from homeassistant.components.analytics import async_devices_payload
 from homeassistant.components.esphome import DOMAIN
 from homeassistant.core import HomeAssistant
@@ -11,7 +9,6 @@ from homeassistant.setup import async_setup_component
 from tests.common import MockConfigEntry
 
 
-@pytest.mark.asyncio
 async def test_analytics(
     hass: HomeAssistant, device_registry: dr.DeviceRegistry
 ) -> None:

tests/components/essent/test_sensor.py

@@ -74,5 +74,5 @@ async def test_sensor_updates_on_hour_tick(
 
     assert (
         hass.states.get("sensor.essent_current_electricity_market_price").state
-        == "0.10417"
+        == "0.24535"
     )

tests/components/fluss/__init__.py

@@ -52,7 +52,6 @@ async def test_async_setup_entry_errors(
     assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
 
 
-@pytest.mark.asyncio
 async def test_async_setup_entry_success(
     hass: HomeAssistant,
     mock_config_entry: MagicMock,
@@ -67,7 +66,6 @@ async def test_async_setup_entry_success(
         )
 
 
-@pytest.mark.asyncio
 async def test_async_unload_entry(
     hass: HomeAssistant,
     mock_config_entry: MagicMock,
@@ -87,7 +85,6 @@ async def test_async_unload_entry(
         assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
 
 
-@pytest.mark.asyncio
 async def test_platforms_forwarded(
     hass: HomeAssistant,
     mock_config_entry: MagicMock,

tests/components/imeon_inverter/test_sensor.py

@@ -38,7 +38,6 @@ async def test_sensors(
         ValueError,
     ],
 )
-@pytest.mark.asyncio
 async def test_sensor_unavailable_on_update_error(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,