Add optional compression to Store

.claude/skills/ha-integration-knowledge/SKILL.md

@@ -15,14 +15,12 @@ description: Everything you need to know to build, test and review Home Assistan
 - For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
 - When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
 - Integrations should be thin wrappers. Protocol parsing, device state machines, or other domain logic belong in a separate PyPI library, not in the integration itself. If unsure, ask before inlining.
+- "potato" is a forbidden word for an integration and should never be used.
 
 The following platforms have extra guidelines:
 - **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection
 - **Repairs**: [`platform-repairs.md`](platform-repairs.md) for user-actionable repair issues
 
-## Entity platforms
-
-- Ensure `async_added_to_hass()` and `async_will_remove_from_hass()` have symmetrical behavior. For example, if a subscription is created in `async_added_to_hass()`, it should be unsubscribed in `async_will_remove_from_hass()`. Also, if something is torn down in `async_will_remove_from_hass()`, it should be set up in `async_added_to_hass()`.
 
 ## Integration Quality Scale
 

.core_files.yaml

@@ -36,7 +36,6 @@ base_platforms: &base_platforms
   - homeassistant/components/image_processing/**
   - homeassistant/components/infrared/**
   - homeassistant/components/lawn_mower/**
-  - homeassistant/components/radio_frequency/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**
   - homeassistant/components/media_player/**

.github/copilot-instructions.md

@@ -5,7 +5,7 @@
 # Copilot code review instructions
 
 - Start review comments with a short, one-sentence summary of the suggested fix.
-- Do not comment on code style, formatting or linting issues.
+- Do not add comments about code style, formatting or linting issues.
 
 # GitHub Copilot & Claude Code Instructions
 
@@ -21,9 +21,7 @@ This repository contains the core of Home Assistant, a Python 3 based home autom
 
 ## Python Syntax Notes
 
-- Home Assistant officially supports Python 3.14 as its minimum version. Do not flag syntax or features that require Python 3.14 as issues, and do not suggest workarounds for older Python versions.
-- Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses. Never flag this as an issue.
-- Python 3.14 evaluates annotations lazily (PEP 649). Forward references in annotations do not need to be quoted — annotations can reference names defined later in the module without quoting them or using `from __future__ import annotations`. Do not flag unquoted forward references in annotations as issues.
+- Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses.
 
 ## Testing
 
@@ -36,3 +34,8 @@ Integrations with Platinum or Gold level in the Integration Quality Scale reflec
 
 When reviewing entity actions, do not suggest extra defensive checks for input fields that are already validated by Home Assistant's service/action schemas and entity selection filters. Suggest additional guards only when data bypasses those validators or is transformed into a less-safe form.
 When validation guarantees a dict key exists, prefer direct key access (`data["key"]`) instead of `.get("key")` so contract violations are surfaced instead of silently masked.
+
+
+# Skills
+
+- ha-integration-knowledge: .claude/skills/ha-integration-knowledge/SKILL.md

.github/instructions/integrations.instructions.md

@@ -1,49 +0,0 @@
----
-applyTo: "homeassistant/components/**, tests/components/**"
-excludeAgent: "cloud-agent"
----
-
-<!-- Automatically generated by gen_copilot_instructions.py, do not edit -->
-
-
-## File Locations
-- **Integration code**: `./homeassistant/components/<integration_domain>/`
-- **Integration tests**: `./tests/components/<integration_domain>/`
-
-## General guidelines
-
-- When looking for examples, prefer integrations with the platinum or gold quality scale level first.
-- Polling intervals are NOT user-configurable. Never add scan_interval, update_interval, or polling frequency options to config flows or config entries.
-- Do NOT allow users to set config entry names in config flows. Names are automatically generated or can be customized later in UI. Exception: helper integrations may allow custom names.
-- For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
-- When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
-- Integrations should be thin wrappers. Protocol parsing, device state machines, or other domain logic belong in a separate PyPI library, not in the integration itself. If unsure, ask before inlining.
-
-The following platforms have extra guidelines:
-- **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection
-- **Repairs**: [`platform-repairs.md`](platform-repairs.md) for user-actionable repair issues
-
-## Entity platforms
-
-- Ensure `async_added_to_hass()` and `async_will_remove_from_hass()` have symmetrical behavior. For example, if a subscription is created in `async_added_to_hass()`, it should be unsubscribed in `async_will_remove_from_hass()`. Also, if something is torn down in `async_will_remove_from_hass()`, it should be set up in `async_added_to_hass()`.
-
-## Integration Quality Scale
-
-- When validating the quality scale rules, check them at https://developers.home-assistant.io/docs/core/integration-quality-scale/rules
-- When implementing or reviewing an integration, always consider the quality scale rules, since they promote best practices.
-
-Template scale file: `./script/scaffold/templates/integration/integration/quality_scale.yaml`
-
-### How Rules Apply
-1. **Check `manifest.json`**: Look for `"quality_scale"` key to determine integration level
-2. **Bronze Rules**: Always required for any integration with quality scale
-3. **Higher Tier Rules**: Only apply if integration targets that tier or higher
-4. **Rule Status**: Check `quality_scale.yaml` in integration folder for:
-   - `done`: Rule implemented
-   - `exempt`: Rule doesn't apply (with reason in comment)
-   - `todo`: Rule needs implementation
-
-
-## Testing Requirements
-
-- Tests should avoid interacting or mocking internal integration details. For more info, see https://developers.home-assistant.io/docs/development_testing/#writing-tests-for-integrations

.github/renovate.json

@@ -6,7 +6,7 @@
     "pep621",
     "pip_requirements",
     "pre-commit",
-    "custom.regex",
+    "regex",
     "homeassistant-manifest"
   ],
 
@@ -27,9 +27,8 @@
     ]
   },
 
-  "customManagers": [
+  "regexManagers": [
     {
-      "customType": "regex",
       "description": "Update ruff required-version in pyproject.toml",
       "managerFilePatterns": ["/^pyproject\\.toml$/"],
       "matchStrings": ["required-version = \">=(?<currentValue>[\\d.]+)\""],

.github/workflows/builder.yml

@@ -14,7 +14,7 @@ env:
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
   # Base image version from https://github.com/home-assistant/docker
-  BASE_IMAGE_VERSION: "2026.04.0"
+  BASE_IMAGE_VERSION: "2026.01.0"
   ARCHITECTURES: '["amd64", "aarch64"]'
 
 permissions: {}

.github/workflows/ci.yaml

@@ -38,8 +38,9 @@ on:
 
 env:
   CACHE_VERSION: 3
+  UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.6"
+  HA_SHORT_VERSION: "2026.5"
   ADDITIONAL_PYTHON_VERSIONS: "[]"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
@@ -357,34 +358,32 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
+      - name: Generate partial uv restore key
+        id: generate-uv-key
+        run: |
+          uv_version=$(cat requirements.txt | grep uv | cut -d '=' -f 3)
+          echo "version=${uv_version}" >> $GITHUB_OUTPUT
+          echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: venv
           key: >-
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
-      - name: Generate partial uv restore key
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        id: generate-uv-key
-        env:
-          RUNNER_OS: ${{ runner.os }}
-          RUNNER_ARCH: ${{ runner.arch }}
-          PYTHON_VERSION: ${{ steps.python.outputs.python-version }}
-          HASH_FILES: ${{ hashFiles('requirements.txt', 'requirements_all.txt', 'requirements_test.txt') }}
-        run: |
-          partial_key="${RUNNER_OS}-${RUNNER_ARCH}-${PYTHON_VERSION}-uv-"
-          echo "partial_key=${partial_key}" >> $GITHUB_OUTPUT
-          echo "full_key=${partial_key}${HASH_FILES}" >> $GITHUB_OUTPUT
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        id: cache-uv
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ${{ env.UV_CACHE_DIR }}
-          key: ${{ steps.generate-uv-key.outputs.full_key }}
-          restore-keys: ${{ steps.generate-uv-key.outputs.partial_key }}
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            steps.generate-uv-key.outputs.key }}
+          restore-keys: |
+            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-uv-${{
+            env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
+            env.HA_SHORT_VERSION }}-
       - name: Check if apt cache exists
         id: cache-apt-check
         uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
@@ -399,7 +398,6 @@ jobs:
         if: |
           steps.cache-venv.outputs.cache-hit != 'true'
           || steps.cache-apt-check.outputs.cache-hit != 'true'
-        id: install-os-deps
         timeout-minutes: 10
         env:
           APT_CACHE_HIT: ${{ steps.cache-apt-check.outputs.cache-hit }}
@@ -433,10 +431,7 @@ jobs:
             sudo chmod -R 755 ${APT_CACHE_BASE}
           fi
       - name: Save apt cache
-        if: |
-          always()
-          && steps.cache-apt-check.outputs.cache-hit != 'true'
-          && steps.install-os-deps.outcome == 'success'
+        if: steps.cache-apt-check.outputs.cache-hit != 'true'
         uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
@@ -446,7 +441,6 @@ jobs:
             ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        id: create-venv
         run: |
           python -m venv venv
           . venv/bin/activate
@@ -454,7 +448,8 @@ jobs:
           pip install "$(grep '^uv' < requirements.txt)"
           uv pip install -U "pip>=25.2"
           uv pip install -r requirements.txt
-          uv pip install -r requirements_all.txt -r requirements_test.txt
+          python -m script.gen_requirements_all ci
+          uv pip install -r requirements_all_pytest.txt -r requirements_test.txt
           uv pip install -e . --config-settings editable_mode=compat
       - name: Dump pip freeze
         run: |
@@ -470,33 +465,12 @@ jobs:
           overwrite: true
       - name: Remove pip_freeze
         run: rm pip_freeze.txt
+      - name: Remove generated requirements_all
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: rm requirements_all_pytest.txt requirements_all_wheels_*.txt
       - name: Check dirty
         run: |
           ./script/check_dirty
-      - name: Prune uv cache
-        if: |
-          steps.cache-hit.outputs.cache-hit != 'true'
-          && (
-            success()
-            || (always() && steps.create-venv.outcome == 'success'))
-        id: prune-uv-cache
-        run: |
-          . venv/bin/activate
-          uv cache prune --ci
-      - name: Save uv wheel cache
-        if: steps.prune-uv-cache.outcome == 'success'
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: ${{ env.UV_CACHE_DIR }}
-          key: ${{ steps.generate-uv-key.outputs.full_key }}
-      - name: Save base Python virtual environment
-        if: always() && steps.create-venv.outcome == 'success'
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: venv
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
-            needs.info.outputs.python_cache_key }}
 
   hassfest:
     name: Check hassfest

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.12
+    rev: v0.15.10
     hooks:
       - id: ruff-check
         args:

.python-version

@@ -1 +1 @@
-3.14.4
+3.14.2

.strict-typing

@@ -599,7 +599,6 @@ homeassistant.components.vallox.*
 homeassistant.components.valve.*
 homeassistant.components.velbus.*
 homeassistant.components.velux.*
-homeassistant.components.victron_gx.*
 homeassistant.components.vivotek.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*

AGENTS.md

@@ -12,9 +12,7 @@ This repository contains the core of Home Assistant, a Python 3 based home autom
 
 ## Python Syntax Notes
 
-- Home Assistant officially supports Python 3.14 as its minimum version. Do not flag syntax or features that require Python 3.14 as issues, and do not suggest workarounds for older Python versions.
-- Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses. Never flag this as an issue.
-- Python 3.14 evaluates annotations lazily (PEP 649). Forward references in annotations do not need to be quoted — annotations can reference names defined later in the module without quoting them or using `from __future__ import annotations`. Do not flag unquoted forward references in annotations as issues.
+- Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses.
 
 ## Testing
 

CODEOWNERS

@@ -758,8 +758,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/honeywell_string_lights/ @balloob
-/tests/components/honeywell_string_lights/ @balloob
 /homeassistant/components/hr_energy_qube/ @MattieGit
 /tests/components/hr_energy_qube/ @MattieGit
 /homeassistant/components/html5/ @alexyao2015 @tr4nt0r
@@ -1203,8 +1201,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/notify_events/ @matrozov @papajojo
 /homeassistant/components/notion/ @bachya
 /tests/components/notion/ @bachya
-/homeassistant/components/novy_cooker_hood/ @piitaya
-/tests/components/novy_cooker_hood/ @piitaya
 /homeassistant/components/nrgkick/ @andijakl
 /tests/components/nrgkick/ @andijakl
 /homeassistant/components/nsw_fuel_station/ @nickw444
@@ -1241,8 +1237,6 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/ollama/ @synesthesiam
 /tests/components/ollama/ @synesthesiam
 /homeassistant/components/ombi/ @larssont
-/homeassistant/components/omie/ @luuuis
-/tests/components/omie/ @luuuis
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
 /homeassistant/components/ondilo_ico/ @JeromeHXP
@@ -1421,8 +1415,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/radarr/ @tkdrob
 /homeassistant/components/radio_browser/ @frenck
 /tests/components/radio_browser/ @frenck
-/homeassistant/components/radio_frequency/ @home-assistant/core
-/tests/components/radio_frequency/ @home-assistant/core
 /homeassistant/components/radiotherm/ @vinnyfuria
 /tests/components/radiotherm/ @vinnyfuria
 /homeassistant/components/rainbird/ @konikvranik @allenporter
@@ -1991,8 +1983,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/wled/ @frenck @mik-laj
 /homeassistant/components/wmspro/ @mback2k
 /tests/components/wmspro/ @mback2k
-/homeassistant/components/wolflink/ @adamkrol93 @EnjoyingM
-/tests/components/wolflink/ @adamkrol93 @EnjoyingM
+/homeassistant/components/wolflink/ @adamkrol93 @mtielen
+/tests/components/wolflink/ @adamkrol93 @mtielen
 /homeassistant/components/workday/ @fabaff @gjohansson-ST
 /tests/components/workday/ @fabaff @gjohansson-ST
 /homeassistant/components/worldclock/ @fabaff

homeassistant/auth/permissions/__init__.py

@@ -2,8 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Iterable
-from typing import TYPE_CHECKING
+from collections.abc import Callable
 
 import voluptuous as vol
 
@@ -14,9 +13,6 @@ from .models import PermissionLookup
 from .types import PolicyType
 from .util import test_all
 
-if TYPE_CHECKING:
-    from ..models import User
-
 POLICY_SCHEMA = vol.Schema({vol.Optional(CAT_ENTITIES): ENTITY_POLICY_SCHEMA})
 
 __all__ = [
@@ -26,21 +22,10 @@ __all__ = [
     "PermissionLookup",
     "PolicyPermissions",
     "PolicyType",
-    "filter_entity_ids_by_permission",
     "merge_policies",
 ]
 
 
-def filter_entity_ids_by_permission(
-    user: User, entity_ids: Iterable[str], key: str
-) -> list[str]:
-    """Filter entity IDs to those the user can access for the given policy key."""
-    if user.is_admin or user.permissions.access_all_entities(key):
-        return list(entity_ids)
-    check_entity = user.permissions.check_entity
-    return [entity_id for entity_id in entity_ids if check_entity(entity_id, key)]
-
-
 class AbstractPermissions:
     """Default permissions class."""
 

homeassistant/brands/honeywell.json

@@ -1,5 +1,5 @@
 {
   "domain": "honeywell",
   "name": "Honeywell",
-  "integrations": ["lyric", "evohome", "honeywell", "honeywell_string_lights"]
+  "integrations": ["lyric", "evohome", "honeywell"]
 }

homeassistant/components/acaia/sensor.py

@@ -143,4 +143,4 @@ class AcaiaRestoreSensor(AcaiaEntity, RestoreSensor):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return super().available or self.native_value is not None
+        return super().available or self._restored_data is not None

homeassistant/components/accuweather/config_flow.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from asyncio import timeout
 from collections.abc import Mapping
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
 from aiohttp import ClientError
@@ -12,7 +12,7 @@ from aiohttp.client_exceptions import ClientConnectorError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -55,11 +55,8 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
                 )
                 self._abort_if_unique_id_configured()
 
-                if TYPE_CHECKING:
-                    assert accuweather.location_name is not None
-
                 return self.async_create_entry(
-                    title=accuweather.location_name, data=user_input
+                    title=user_input[CONF_NAME], data=user_input
                 )
 
         return self.async_show_form(
@@ -73,6 +70,9 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
                     vol.Optional(
                         CONF_LONGITUDE, default=self.hass.config.longitude
                     ): cv.longitude,
+                    vol.Optional(
+                        CONF_NAME, default=self.hass.config.location_name
+                    ): str,
                 }
             ),
             errors=errors,

homeassistant/components/accuweather/coordinator.py

@@ -64,7 +64,7 @@ class AccuWeatherObservationDataUpdateCoordinator(
         """Initialize."""
         self.accuweather = accuweather
         self.location_key = accuweather.location_key
-        name = config_entry.data.get(CONF_NAME) or config_entry.title
+        name = config_entry.data[CONF_NAME]
 
         if TYPE_CHECKING:
             assert self.location_key is not None
@@ -122,7 +122,7 @@ class AccuWeatherForecastDataUpdateCoordinator(
         self.accuweather = accuweather
         self.location_key = accuweather.location_key
         self._fetch_method = fetch_method
-        name = config_entry.data.get(CONF_NAME) or config_entry.title
+        name = config_entry.data[CONF_NAME]
 
         if TYPE_CHECKING:
             assert self.location_key is not None

homeassistant/components/accuweather/strings.json

@@ -25,7 +25,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]"
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "name": "[%key:common::config_flow::data::name%]"
         },
         "data_description": {
           "api_key": "API key generated in the AccuWeather APIs portal."

homeassistant/components/actron_air/climate.py

@@ -38,7 +38,6 @@ HVAC_MODE_MAPPING_ACTRONAIR_TO_HA = {
     "HEAT": HVACMode.HEAT,
     "FAN": HVACMode.FAN_ONLY,
     "AUTO": HVACMode.AUTO,
-    "DRY": HVACMode.DRY,
     "OFF": HVACMode.OFF,
 }
 HVAC_MODE_MAPPING_HA_TO_ACTRONAIR = {
@@ -80,6 +79,7 @@ class ActronAirClimateEntity(ClimateEntity):
     )
     _attr_name = None
     _attr_fan_modes = list(FAN_MODE_MAPPING_ACTRONAIR_TO_HA.values())
+    _attr_hvac_modes = list(HVAC_MODE_MAPPING_ACTRONAIR_TO_HA.values())
 
 
 class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
@@ -93,17 +93,6 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
         super().__init__(coordinator)
         self._attr_unique_id = self._serial_number
 
-    @property
-    def hvac_modes(self) -> list[HVACMode]:
-        """Return the list of supported HVAC modes."""
-        modes = [
-            HVAC_MODE_MAPPING_ACTRONAIR_TO_HA[mode]
-            for mode in self._status.user_aircon_settings.supported_modes
-            if mode in HVAC_MODE_MAPPING_ACTRONAIR_TO_HA
-        ]
-        modes.append(HVACMode.OFF)
-        return modes
-
     @property
     def min_temp(self) -> float:
         """Return the minimum temperature that can be set."""
@@ -147,7 +136,7 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float:
         """Return the target temperature."""
-        return self._status.user_aircon_settings.current_setpoint
+        return self._status.user_aircon_settings.temperature_setpoint_cool_c
 
     @actron_air_command
     async def async_set_fan_mode(self, fan_mode: str) -> None:
@@ -190,18 +179,6 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
         super().__init__(coordinator, zone)
         self._attr_unique_id: str = self._zone_identifier
 
-    @property
-    def hvac_modes(self) -> list[HVACMode]:
-        """Return the list of supported HVAC modes."""
-        status = self.coordinator.data
-        modes = [
-            HVAC_MODE_MAPPING_ACTRONAIR_TO_HA[mode]
-            for mode in status.user_aircon_settings.supported_modes
-            if mode in HVAC_MODE_MAPPING_ACTRONAIR_TO_HA
-        ]
-        modes.append(HVACMode.OFF)
-        return modes
-
     @property
     def min_temp(self) -> float:
         """Return the minimum temperature that can be set."""
@@ -239,7 +216,7 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float | None:
         """Return the target temperature."""
-        return self._zone.current_setpoint
+        return self._zone.temperature_setpoint_cool_c
 
     @actron_air_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:

homeassistant/components/actron_air/manifest.json

@@ -13,5 +13,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "quality_scale": "silver",
-  "requirements": ["actron-neo-api==0.5.6"]
+  "requirements": ["actron-neo-api==0.5.3"]
 }

homeassistant/components/ai_task/media_source.py

@@ -25,7 +25,7 @@ async def async_get_media_source(hass: HomeAssistant) -> MediaSource:
     hass.data[DATA_MEDIA_SOURCE] = source = local_source.LocalSource(
         hass,
         DOMAIN,
-        "AI generated images",
+        "AI Generated Images",
         {IMAGE_DIR: str(media_dir)},
         f"/{DOMAIN}",
     )

homeassistant/components/air_quality/conditions.yaml

@@ -4,8 +4,11 @@
   required: true
   default: any
   selector:
-    automation_behavior:
-      mode: condition
+    select:
+      translation_key: condition_behavior
+      options:
+        - all
+        - any
 
 # --- Unit lists for multi-unit pollutants ---
 

homeassistant/components/air_quality/strings.json

@@ -237,6 +237,21 @@
       "name": "Volatile organic compounds value"
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "title": "Air Quality",
   "triggers": {
     "co2_changed": {

homeassistant/components/air_quality/triggers.yaml

@@ -3,8 +3,12 @@
     required: true
     default: any
     selector:
-      automation_behavior:
-        mode: trigger
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
   for: &trigger_for
     required: true
     default: 00:00:00

homeassistant/components/airly/config_flow.py

@@ -12,11 +12,11 @@ from airly.exceptions import AirlyError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_USE_NEAREST, DEFAULT_NAME, DOMAIN, NO_AIRLY_SENSORS
+from .const import CONF_USE_NEAREST, DOMAIN, NO_AIRLY_SENSORS
 
 DESCRIPTION_PLACEHOLDERS = {
     "developer_registration_url": "https://developer.airly.eu/register",
@@ -45,16 +45,16 @@ class AirlyFlowHandler(ConfigFlow, domain=DOMAIN):
             try:
                 location_point_valid = await check_location(
                     websession,
-                    user_input[CONF_API_KEY],
-                    user_input[CONF_LATITUDE],
-                    user_input[CONF_LONGITUDE],
+                    user_input["api_key"],
+                    user_input["latitude"],
+                    user_input["longitude"],
                 )
                 if not location_point_valid:
                     location_nearest_valid = await check_location(
                         websession,
-                        user_input[CONF_API_KEY],
-                        user_input[CONF_LATITUDE],
-                        user_input[CONF_LONGITUDE],
+                        user_input["api_key"],
+                        user_input["latitude"],
+                        user_input["longitude"],
                         use_nearest=True,
                     )
             except AirlyError as err:
@@ -68,7 +68,7 @@ class AirlyFlowHandler(ConfigFlow, domain=DOMAIN):
                         return self.async_abort(reason="wrong_location")
                     use_nearest = True
                 return self.async_create_entry(
-                    title=DEFAULT_NAME,
+                    title=user_input[CONF_NAME],
                     data={**user_input, CONF_USE_NEAREST: use_nearest},
                 )
 
@@ -83,6 +83,9 @@ class AirlyFlowHandler(ConfigFlow, domain=DOMAIN):
                     vol.Optional(
                         CONF_LONGITUDE, default=self.hass.config.longitude
                     ): cv.longitude,
+                    vol.Optional(
+                        CONF_NAME, default=self.hass.config.location_name
+                    ): str,
                 }
             ),
             errors=errors,

homeassistant/components/airly/const.py

@@ -37,5 +37,3 @@ MAX_UPDATE_INTERVAL: Final = 90
 MIN_UPDATE_INTERVAL: Final = 5
 NO_AIRLY_SENSORS: Final = "There are no Airly sensors in this area yet."
 URL = "https://airly.org/map/#{latitude},{longitude}"
-
-DEFAULT_NAME: Final = "Airly"

homeassistant/components/airly/sensor.py

@@ -127,7 +127,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
     ),
     AirlySensorEntityDescription(
         key=ATTR_API_CO,
-        device_class=SensorDeviceClass.CO,
+        translation_key="co",
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -178,7 +178,7 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Airly sensor entities based on a config entry."""
-    name = entry.data.get(CONF_NAME) or entry.title
+    name = entry.data[CONF_NAME]
 
     coordinator = entry.runtime_data
 

homeassistant/components/airly/strings.json

@@ -13,7 +13,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "latitude": "[%key:common::config_flow::data::latitude%]",
-          "longitude": "[%key:common::config_flow::data::longitude%]"
+          "longitude": "[%key:common::config_flow::data::longitude%]",
+          "name": "[%key:common::config_flow::data::name%]"
         },
         "description": "To generate API key go to {developer_registration_url}"
       }
@@ -23,6 +24,9 @@
     "sensor": {
       "caqi": {
         "name": "Common air quality index"
+      },
+      "co": {
+        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
       }
     }
   },

homeassistant/components/airos/manifest.json

@@ -8,5 +8,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "platinum",
-  "requirements": ["airos==0.6.5"]
+  "requirements": ["airos==0.6.4"]
 }

homeassistant/components/airtouch5/config_flow.py

@@ -36,8 +36,6 @@ class AirTouch5ConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected exception")
                 errors = {"base": "cannot_connect"}
             else:
-                # Uses the host/IP value from CONF_HOST as unique ID, which is no longer allowed
-                # pylint: disable-next=hass-unique-id-ip-based
                 await self.async_set_unique_id(user_input[CONF_HOST])
                 self._abort_if_unique_id_configured()
                 return self.async_create_entry(

homeassistant/components/alarm_control_panel/conditions.yaml

@@ -7,8 +7,11 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: condition
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
 
 .condition_common_for: &condition_common_for
   target: *condition_common_target

homeassistant/components/alarm_control_panel/strings.json

@@ -160,6 +160,21 @@
       "message": "Arming requires a code but none was given for {entity_id}."
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "alarm_arm_away": {
       "description": "Arms an alarm in the away mode.",

homeassistant/components/alarm_control_panel/triggers.yaml

@@ -7,8 +7,12 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: trigger
+        select:
+          options:
+            - first
+            - last
+            - any
+          translation_key: trigger_behavior
     for:
       required: true
       default: 00:00:00

homeassistant/components/alexa_devices/__init__.py

@@ -11,7 +11,6 @@ from .services import async_setup_services
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
-    Platform.BUTTON,
     Platform.NOTIFY,
     Platform.SENSOR,
     Platform.SWITCH,

homeassistant/components/alexa_devices/button.py

@@ -1,55 +0,0 @@
-"""Support for buttons."""
-
-from homeassistant.components.button import ButtonEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.util import slugify
-
-from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
-from .entity import AmazonServiceEntity
-
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up button entities for Alexa Devices."""
-    coordinator = entry.runtime_data
-
-    known_routines: set[str] = set()
-
-    def _check_routines() -> None:
-        current_routines = set(coordinator.api.routines)
-        new_routines = current_routines - known_routines
-        if new_routines:
-            known_routines.update(new_routines)
-            async_add_entities(
-                AmazonRoutineButton(coordinator, routine) for routine in new_routines
-            )
-
-    _check_routines()
-    entry.async_on_unload(coordinator.async_add_listener(_check_routines))
-
-
-class AmazonRoutineButton(AmazonServiceEntity, ButtonEntity):
-    """Button entity for Alexa routine."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: AmazonDevicesCoordinator, routine: str) -> None:
-        """Initialize the routine button entity."""
-        self._coordinator = coordinator
-        self._routine = routine
-        super().__init__(
-            coordinator,
-            EntityDescription(key=slugify(routine), name=routine),
-        )
-
-    async def async_press(self) -> None:
-        """Handle button press action."""
-        await self._coordinator.api.call_routine(self._routine)

homeassistant/components/alexa_devices/coordinator.py

@@ -12,13 +12,12 @@ from aioamazondevices.structures import AmazonDevice
 from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import slugify
 
 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
 
@@ -65,13 +64,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             for identifier_domain, identifier in device.identifiers
             if identifier_domain == DOMAIN
         }
-        self.previous_routines: set[str] = {
-            routine.unique_id
-            for routine in er.async_entries_for_config_entry(
-                er.async_get(hass), entry.entry_id
-            )
-            if routine.domain == Platform.BUTTON
-        }
 
     async def _async_update_data(self) -> dict[str, AmazonDevice]:
         """Update device data."""
@@ -100,13 +92,8 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             current_devices = set(data.keys())
             if stale_devices := self.previous_devices - current_devices:
                 await self._async_remove_device_stale(stale_devices)
+
             self.previous_devices = current_devices
-
-            current_routines = {slugify(routine) for routine in self.api.routines}
-            if stale_routines := self.previous_routines - current_routines:
-                await self._async_remove_routine_stale(stale_routines)
-            self.previous_routines = current_routines
-
             return data
 
     async def _async_remove_device_stale(
@@ -129,23 +116,3 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
                     device_id=device.id,
                     remove_config_entry_id=self.config_entry.entry_id,
                 )
-
-    async def _async_remove_routine_stale(
-        self,
-        stale_routines: set[str],
-    ) -> None:
-        """Remove stale routine."""
-        entity_registry = er.async_get(self.hass)
-
-        for routine in stale_routines:
-            _LOGGER.debug(
-                "Detected change in routines: routine %s removed",
-                routine,
-            )
-            entity_id = entity_registry.async_get_entity_id(
-                Platform.BUTTON,
-                DOMAIN,
-                f"{slugify(self.config_entry.unique_id)}-{slugify(routine)}",
-            )
-            if entity_id:
-                entity_registry.async_remove(entity_id)

homeassistant/components/alexa_devices/entity.py

@@ -2,10 +2,9 @@
 
 from aioamazondevices.structures import AmazonDevice
 
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util import slugify
 
 from .const import DOMAIN
 from .coordinator import AmazonDevicesCoordinator
@@ -51,32 +50,3 @@ class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
             and self._serial_num in self.coordinator.data
             and self.device.online
         )
-
-
-class AmazonServiceEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
-    """Defines Alexa Devices entity for service device."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AmazonDevicesCoordinator,
-        description: EntityDescription,
-    ) -> None:
-        """Initialize the service entity."""
-
-        super().__init__(coordinator)
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, service_device_id(coordinator))},
-            manufacturer="Amazon",
-            entry_type=DeviceEntryType.SERVICE,
-        )
-        self.entity_description = description
-        self._attr_unique_id = (
-            f"{slugify(coordinator.config_entry.unique_id)}-{description.key}"
-        )
-
-
-def service_device_id(coordinator: AmazonDevicesCoordinator) -> str:
-    """Return service device id."""
-    return slugify(f"{coordinator.config_entry.unique_id}_service_device")

homeassistant/components/amcrest/__init__.py

@@ -39,6 +39,7 @@ from homeassistant.helpers.typing import ConfigType
 from .binary_sensor import BINARY_SENSOR_KEYS, BINARY_SENSORS, check_binary_sensors
 from .camera import STREAM_SOURCE_LIST
 from .const import (
+    CAMERAS,
     COMM_RETRIES,
     COMM_TIMEOUT,
     DATA_AMCREST,
@@ -358,7 +359,7 @@ def _start_event_monitor(
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Amcrest IP Camera component."""
-    hass.data.setdefault(DATA_AMCREST, {DEVICES: {}})
+    hass.data.setdefault(DATA_AMCREST, {DEVICES: {}, CAMERAS: []})
 
     for device in config[DOMAIN]:
         name: str = device[CONF_NAME]

homeassistant/components/amcrest/camera.py

@@ -12,11 +12,13 @@ import aiohttp
 from aiohttp import web
 from amcrest import AmcrestError
 from haffmpeg.camera import CameraMjpeg
+import voluptuous as vol
 
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.components.ffmpeg import FFmpegManager, get_ffmpeg_manager
-from homeassistant.const import CONF_NAME, STATE_OFF, STATE_ON
+from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import (
     async_aiohttp_proxy_stream,
     async_aiohttp_proxy_web,
@@ -27,13 +29,11 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
-    ATTR_COLOR_BW,
     CAMERA_WEB_SESSION_TIMEOUT,
-    CBW,
+    CAMERAS,
     COMM_TIMEOUT,
     DATA_AMCREST,
     DEVICES,
-    MOV,
     RESOLUTION_TO_STREAM,
     SERVICE_UPDATE,
     SNAPSHOT_TIMEOUT,
@@ -49,11 +49,65 @@ SCAN_INTERVAL = timedelta(seconds=15)
 
 STREAM_SOURCE_LIST = ["snapshot", "mjpeg", "rtsp"]
 
+_ATTR_PTZ_TT = "travel_time"
+_ATTR_PTZ_MOV = "movement"
+_MOV = [
+    "zoom_out",
+    "zoom_in",
+    "right",
+    "left",
+    "up",
+    "down",
+    "right_down",
+    "right_up",
+    "left_down",
+    "left_up",
+]
 _ZOOM_ACTIONS = ["ZoomWide", "ZoomTele"]
 _MOVE_1_ACTIONS = ["Right", "Left", "Up", "Down"]
 _MOVE_2_ACTIONS = ["RightDown", "RightUp", "LeftDown", "LeftUp"]
 _ACTION = _ZOOM_ACTIONS + _MOVE_1_ACTIONS + _MOVE_2_ACTIONS
 
+_DEFAULT_TT = 0.2
+
+_ATTR_PRESET = "preset"
+_ATTR_COLOR_BW = "color_bw"
+
+_CBW_COLOR = "color"
+_CBW_AUTO = "auto"
+_CBW_BW = "bw"
+_CBW = [_CBW_COLOR, _CBW_AUTO, _CBW_BW]
+
+_SRV_SCHEMA = vol.Schema({vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids})
+_SRV_GOTO_SCHEMA = _SRV_SCHEMA.extend(
+    {vol.Required(_ATTR_PRESET): vol.All(vol.Coerce(int), vol.Range(min=1))}
+)
+_SRV_CBW_SCHEMA = _SRV_SCHEMA.extend({vol.Required(_ATTR_COLOR_BW): vol.In(_CBW)})
+_SRV_PTZ_SCHEMA = _SRV_SCHEMA.extend(
+    {
+        vol.Required(_ATTR_PTZ_MOV): vol.In(_MOV),
+        vol.Optional(_ATTR_PTZ_TT, default=_DEFAULT_TT): cv.small_float,
+    }
+)
+
+CAMERA_SERVICES = {
+    "enable_recording": (_SRV_SCHEMA, "async_enable_recording", ()),
+    "disable_recording": (_SRV_SCHEMA, "async_disable_recording", ()),
+    "enable_audio": (_SRV_SCHEMA, "async_enable_audio", ()),
+    "disable_audio": (_SRV_SCHEMA, "async_disable_audio", ()),
+    "enable_motion_recording": (_SRV_SCHEMA, "async_enable_motion_recording", ()),
+    "disable_motion_recording": (_SRV_SCHEMA, "async_disable_motion_recording", ()),
+    "goto_preset": (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
+    "set_color_bw": (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
+    "start_tour": (_SRV_SCHEMA, "async_start_tour", ()),
+    "stop_tour": (_SRV_SCHEMA, "async_stop_tour", ()),
+    "ptz_control": (
+        _SRV_PTZ_SCHEMA,
+        "async_ptz_control",
+        (_ATTR_PTZ_MOV, _ATTR_PTZ_TT),
+    ),
+}
+
 _BOOL_TO_STATE = {True: STATE_ON, False: STATE_OFF}
 
 
@@ -221,7 +275,7 @@ class AmcrestCam(Camera):
                 self._motion_recording_enabled
             )
         if self._color_bw is not None:
-            attr[ATTR_COLOR_BW] = self._color_bw
+            attr[_ATTR_COLOR_BW] = self._color_bw
         return attr
 
     @property
@@ -268,7 +322,15 @@ class AmcrestCam(Camera):
         self.async_schedule_update_ha_state(True)
 
     async def async_added_to_hass(self) -> None:
-        """Subscribe to signals."""
+        """Subscribe to signals and add camera to list."""
+        self._unsub_dispatcher.extend(
+            async_dispatcher_connect(
+                self.hass,
+                service_signal(service, self.entity_id),
+                getattr(self, callback_name),
+            )
+            for service, (_, callback_name, _) in CAMERA_SERVICES.items()
+        )
         self._unsub_dispatcher.append(
             async_dispatcher_connect(
                 self.hass,
@@ -276,9 +338,11 @@ class AmcrestCam(Camera):
                 self.async_on_demand_update,
             )
         )
+        self.hass.data[DATA_AMCREST][CAMERAS].append(self.entity_id)
 
     async def async_will_remove_from_hass(self) -> None:
-        """Disconnect from signals."""
+        """Remove camera from list and disconnect from signals."""
+        self.hass.data[DATA_AMCREST][CAMERAS].remove(self.entity_id)
         for unsub_dispatcher in self._unsub_dispatcher:
             unsub_dispatcher()
 
@@ -392,7 +456,7 @@ class AmcrestCam(Camera):
 
     async def async_ptz_control(self, movement: str, travel_time: float) -> None:
         """Move or zoom camera in specified direction."""
-        code = _ACTION[MOV.index(movement)]
+        code = _ACTION[_MOV.index(movement)]
 
         kwargs = {"code": code, "arg1": 0, "arg2": 0, "arg3": 0}
         if code in _MOVE_1_ACTIONS:
@@ -549,10 +613,10 @@ class AmcrestCam(Camera):
             )
 
     async def _async_get_color_mode(self) -> str:
-        return CBW[await self._api.async_day_night_color]
+        return _CBW[await self._api.async_day_night_color]
 
     async def _async_set_color_mode(self, cbw: str) -> None:
-        await self._api.async_set_day_night_color(CBW.index(cbw), channel=0)
+        await self._api.async_set_day_night_color(_CBW.index(cbw), channel=0)
 
     async def _async_set_color_bw(self, cbw: str) -> None:
         """Set camera color mode."""

homeassistant/components/amcrest/const.py

@@ -2,6 +2,7 @@
 
 DOMAIN = "amcrest"
 DATA_AMCREST = DOMAIN
+CAMERAS = "cameras"
 DEVICES = "devices"
 
 BINARY_SENSOR_SCAN_INTERVAL_SECS = 5
@@ -16,18 +17,3 @@ SERVICE_UPDATE = "update"
 
 RESOLUTION_LIST = {"high": 0, "low": 1}
 RESOLUTION_TO_STREAM = {0: "Main", 1: "Extra"}
-
-ATTR_COLOR_BW = "color_bw"
-CBW = ["color", "auto", "bw"]
-MOV = [
-    "zoom_out",
-    "zoom_in",
-    "right",
-    "left",
-    "up",
-    "down",
-    "right_down",
-    "right_up",
-    "left_down",
-    "left_up",
-]

homeassistant/components/amcrest/services.py

@@ -1,67 +1,62 @@
-"""Services for Amcrest IP cameras."""
+"""Support for Amcrest IP cameras."""
 
 from __future__ import annotations
 
-import voluptuous as vol
+from homeassistant.auth.models import User
+from homeassistant.auth.permissions.const import POLICY_CONTROL
+from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, ENTITY_MATCH_NONE
+from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import Unauthorized, UnknownUser
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.service import async_extract_entity_ids
 
-from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
-
-from .const import ATTR_COLOR_BW, CBW, DOMAIN, MOV
-
-_ATTR_PRESET = "preset"
-_ATTR_PTZ_MOV = "movement"
-_ATTR_PTZ_TT = "travel_time"
-_DEFAULT_TT = 0.2
+from .camera import CAMERA_SERVICES
+from .const import CAMERAS, DATA_AMCREST, DOMAIN
+from .helpers import service_signal
 
 
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the Amcrest IP Camera services."""
-    for service_name, func in (
-        ("enable_recording", "async_enable_recording"),
-        ("disable_recording", "async_disable_recording"),
-        ("enable_audio", "async_enable_audio"),
-        ("disable_audio", "async_disable_audio"),
-        ("enable_motion_recording", "async_enable_motion_recording"),
-        ("disable_motion_recording", "async_disable_motion_recording"),
-        ("start_tour", "async_start_tour"),
-        ("stop_tour", "async_stop_tour"),
-    ):
-        service.async_register_platform_entity_service(
-            hass,
-            DOMAIN,
-            service_name,
-            entity_domain=CAMERA_DOMAIN,
-            schema=None,
-            func=func,
-        )
 
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        "goto_preset",
-        entity_domain=CAMERA_DOMAIN,
-        schema={vol.Required(_ATTR_PRESET): vol.All(vol.Coerce(int), vol.Range(min=1))},
-        func="async_goto_preset",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        "set_color_bw",
-        entity_domain=CAMERA_DOMAIN,
-        schema={vol.Required(ATTR_COLOR_BW): vol.In(CBW)},
-        func="async_set_color_bw",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        "ptz_control",
-        entity_domain=CAMERA_DOMAIN,
-        schema={
-            vol.Required(_ATTR_PTZ_MOV): vol.In(MOV),
-            vol.Optional(_ATTR_PTZ_TT, default=_DEFAULT_TT): cv.small_float,
-        },
-        func="async_ptz_control",
-    )
+    def have_permission(user: User | None, entity_id: str) -> bool:
+        return not user or user.permissions.check_entity(entity_id, POLICY_CONTROL)
+
+    async def async_extract_from_service(call: ServiceCall) -> list[str]:
+        if call.context.user_id:
+            user = await hass.auth.async_get_user(call.context.user_id)
+            if user is None:
+                raise UnknownUser(context=call.context)
+        else:
+            user = None
+
+        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_ALL:
+            # Return all entity_ids user has permission to control.
+            return [
+                entity_id
+                for entity_id in hass.data[DATA_AMCREST][CAMERAS]
+                if have_permission(user, entity_id)
+            ]
+
+        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_NONE:
+            return []
+
+        call_ids = await async_extract_entity_ids(call)
+        entity_ids = []
+        for entity_id in hass.data[DATA_AMCREST][CAMERAS]:
+            if entity_id not in call_ids:
+                continue
+            if not have_permission(user, entity_id):
+                raise Unauthorized(
+                    context=call.context, entity_id=entity_id, permission=POLICY_CONTROL
+                )
+            entity_ids.append(entity_id)
+        return entity_ids
+
+    async def async_service_handler(call: ServiceCall) -> None:
+        args = [call.data[arg] for arg in CAMERA_SERVICES[call.service][2]]
+        for entity_id in await async_extract_from_service(call):
+            async_dispatcher_send(hass, service_signal(call.service, entity_id), *args)
+
+    for service, params in CAMERA_SERVICES.items():
+        hass.services.async_register(DOMAIN, service, async_service_handler, params[0])

homeassistant/components/anthropic/entity.py

@@ -1,8 +1,7 @@
 """Base entity for Anthropic."""
 
 import base64
-from collections import deque
-from collections.abc import AsyncIterator, Callable, Iterable
+from collections.abc import AsyncGenerator, Callable, Iterable
 from dataclasses import dataclass, field
 from datetime import UTC, datetime
 import json
@@ -21,22 +20,18 @@ from anthropic.types import (
     CitationWebSearchResultLocationParam,
     CodeExecutionTool20250825Param,
     CodeExecutionToolResultBlock,
-    CodeExecutionToolResultBlockContent,
     CodeExecutionToolResultBlockParamContentParam,
     Container,
-    ContentBlock,
     ContentBlockParam,
     DocumentBlockParam,
     ImageBlockParam,
     InputJSONDelta,
     JSONOutputFormatParam,
-    Message,
     MessageDeltaUsage,
     MessageParam,
     MessageStreamEvent,
     ModelInfo,
     OutputConfigParam,
-    RawContentBlockDelta,
     RawContentBlockDeltaEvent,
     RawContentBlockStartEvent,
     RawContentBlockStopEvent,
@@ -73,30 +68,18 @@ from anthropic.types import (
     WebSearchTool20250305Param,
     WebSearchTool20260209Param,
     WebSearchToolResultBlock,
-    WebSearchToolResultBlockContent,
     WebSearchToolResultBlockParamContentParam,
 )
-from anthropic.types.bash_code_execution_tool_result_block import (
-    Content as BashCodeExecutionToolResultBlockContent,
-)
 from anthropic.types.bash_code_execution_tool_result_block_param import (
     Content as BashCodeExecutionToolResultBlockParamContentParam,
 )
 from anthropic.types.message_create_params import MessageCreateParamsStreaming
-from anthropic.types.raw_message_delta_event import Delta
-from anthropic.types.text_editor_code_execution_tool_result_block import (
-    Content as TextEditorCodeExecutionToolResultBlockContent,
-)
 from anthropic.types.text_editor_code_execution_tool_result_block_param import (
     Content as TextEditorCodeExecutionToolResultBlockParamContentParam,
 )
-from anthropic.types.tool_search_tool_result_block import (
-    Content as ToolSearchToolResultBlockContent,
-)
 from anthropic.types.tool_search_tool_result_block_param import (
     Content as ToolSearchToolResultBlockParamContentParam,
 )
-from anthropic.types.tool_use_block import Caller
 import voluptuous as vol
 from voluptuous_openapi import convert
 
@@ -108,7 +91,7 @@ from homeassistant.helpers import device_registry as dr, llm
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import slugify
-from homeassistant.util.json import JsonArrayType, JsonObjectType
+from homeassistant.util.json import JsonObjectType
 
 from .const import (
     CONF_CHAT_MODEL,
@@ -462,7 +445,13 @@ def _convert_content(  # noqa: C901
     return messages, container_id
 
 
-class AnthropicDeltaStream:
+async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
+    chat_log: conversation.ChatLog,
+    stream: AsyncStream[MessageStreamEvent],
+    output_tool: str | None = None,
+) -> AsyncGenerator[
+    conversation.AssistantContentDeltaDict | conversation.ToolResultContentDeltaDict
+]:
     """Transform the response stream into HA format.
 
     A typical stream of responses might look something like the following:
@@ -492,376 +481,201 @@ class AnthropicDeltaStream:
 
     Each message could contain multiple blocks of the same type.
     """
-
-    def __init__(
-        self,
-        chat_log: conversation.ChatLog,
-        stream: AsyncStream[MessageStreamEvent],
-        output_tool: str | None = None,
-    ) -> None:
-        """Initialize the delta stream."""
-        self._chat_log: conversation.ChatLog = chat_log
-        self._stream: AsyncStream[MessageStreamEvent] = stream
-        self._output_tool: str | None = output_tool
-
-        self._buffer: deque[
-            conversation.AssistantContentDeltaDict
-            | conversation.ToolResultContentDeltaDict
-        ] = deque()
-        self._stream_iterator: AsyncIterator[MessageStreamEvent] | None = None
-
-        self._current_tool_block: ToolUseBlockParam | ServerToolUseBlockParam | None = (
-            None
+    if stream is None or not hasattr(stream, "__aiter__"):
+        raise HomeAssistantError(
+            translation_domain=DOMAIN, translation_key="unexpected_stream_object"
         )
-        self._current_tool_args: str = ""
-        self._content_details = ContentDetails()
-        self._content_details.add_citation_detail()
-        self._input_usage: Usage | None = None
-        self._first_block: bool = True
 
-    def __aiter__(
-        self,
-    ) -> AsyncIterator[
-        conversation.AssistantContentDeltaDict | conversation.ToolResultContentDeltaDict
-    ]:
-        """Initialize the stream and return the async iterator."""
-        if self._stream is None or not hasattr(self._stream, "__aiter__"):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="unexpected_stream_object"
-            )
-        if self._stream_iterator is None:
-            self._stream_iterator = self._stream.__aiter__()
-        return self
+    current_tool_block: ToolUseBlockParam | ServerToolUseBlockParam | None = None
+    current_tool_args: str
+    content_details = ContentDetails()
+    content_details.add_citation_detail()
+    input_usage: Usage | None = None
+    first_block: bool = True
 
-    async def __anext__(
-        self,
-    ) -> (
-        conversation.AssistantContentDeltaDict | conversation.ToolResultContentDeltaDict
-    ):
-        """Get the next item from the stream."""
-        while True:
-            if self._buffer:
-                return self._buffer.popleft()
+    async for response in stream:
+        LOGGER.debug("Received response: %s", response)
 
-            response = await self._stream_iterator.__anext__()  # type: ignore[union-attr]
-
-            LOGGER.debug("Received response: %s", response)
-            self.on_message_stream_event(response)
-
-    def on_message_stream_event(self, event: MessageStreamEvent) -> None:
-        """Handle MessageStreamEvent."""
-        if isinstance(event, RawMessageStartEvent):
-            self.on_message_start_event(event.message)
-            return
-        if isinstance(event, RawContentBlockStartEvent):
-            self.on_content_block_start_event(event.content_block, event.index)
-            return
-        if isinstance(event, RawContentBlockDeltaEvent):
-            self.on_content_block_delta_event(event.delta)
-            return
-        if isinstance(event, RawContentBlockStopEvent):
-            self.on_content_block_stop_event(event.index)
-            return
-        if isinstance(event, RawMessageDeltaEvent):
-            self.on_message_delta_event(event.delta, event.usage)
-            return
-        if isinstance(event, RawMessageStopEvent):
-            self.on_message_stop_event()
-            return
-        LOGGER.debug("Unhandled event type: %s", event.type)  # type: ignore[unreachable]  # pragma: no cover - All types are handled but we want to verify that
-
-    def on_message_start_event(self, message: Message) -> None:
-        """Handle RawMessageStartEvent."""
-        self._input_usage = message.usage
-        self._first_block = True
-
-    def on_content_block_start_event(
-        self, content_block: ContentBlock, index: int
-    ) -> None:
-        """Handle RawContentBlockStartEvent."""
-        if isinstance(content_block, ToolUseBlock):
-            self.on_tool_use_block(
-                content_block.id,
-                content_block.input,
-                content_block.name,
-                content_block.caller,
-            )
-            return
-        if isinstance(content_block, TextBlock):
-            self.on_text_block(content_block.text, content_block.citations)
-            return
-        if isinstance(content_block, ThinkingBlock):
-            self.on_thinking_block(content_block.thinking, content_block.signature)
-            return
-        if isinstance(content_block, RedactedThinkingBlock):
-            self.on_redacted_thinking_block(content_block.data)
-            return
-        if isinstance(content_block, ServerToolUseBlock):
-            self.on_server_tool_use_block(
-                content_block.id,
-                content_block.name,
-                content_block.input,
-                content_block.caller,
-            )
-            return
-        if isinstance(
-            content_block,
-            (
-                WebSearchToolResultBlock,
-                CodeExecutionToolResultBlock,
-                BashCodeExecutionToolResultBlock,
-                TextEditorCodeExecutionToolResultBlock,
-                ToolSearchToolResultBlock,
-            ),
-        ):
-            self.on_server_tool_result_block(
-                content_block.tool_use_id,
-                content_block.type,
-                content_block.content,
-                content_block.caller if hasattr(content_block, "caller") else None,
-            )
-            return
-        LOGGER.debug("Unhandled content block type: %s", content_block.type)
-
-    def on_tool_use_block(
-        self, id: str, input: dict[str, Any], name: str, caller: Caller | None
-    ) -> None:
-        """Handle ToolUseBlock."""
-        self._current_tool_block = ToolUseBlockParam(
-            type="tool_use",
-            id=id,
-            name=name,
-            input=input,
-        )
-        self._current_tool_args = ""
-        if name == self._output_tool:
-            if self._first_block or self._content_details.has_content():
-                if self._content_details:
-                    self._content_details.delete_empty()
-                    self._buffer.append({"native": self._content_details})
-                self._content_details = ContentDetails()
-                self._content_details.add_citation_detail()
-                self._buffer.append({"role": "assistant"})
-                self._first_block = False
-
-    def on_text_block(self, text: str, citations: list[TextCitation] | None) -> None:
-        """Handle TextBlock."""
-        if (  # Do not start a new assistant content just for citations, concatenate consecutive blocks with citations instead.
-            self._first_block
-            or (
-                not self._content_details.has_citations()
-                and citations is None
-                and self._content_details.has_content()
-            )
-        ):
-            if self._content_details:
-                self._content_details.delete_empty()
-                self._buffer.append({"native": self._content_details})
-            self._content_details = ContentDetails()
-            self._buffer.append({"role": "assistant"})
-            self._first_block = False
-        self._content_details.add_citation_detail()
-        if text:
-            self._content_details.citation_details[-1].length += len(text)
-            self._buffer.append({"content": text})
-
-    def on_thinking_block(self, thinking: str, signature: str) -> None:
-        """Handle ThinkingBlock."""
-        if self._first_block or self._content_details.thinking_signature:
-            if self._content_details:
-                self._content_details.delete_empty()
-                self._buffer.append({"native": self._content_details})
-            self._content_details = ContentDetails()
-            self._content_details.add_citation_detail()
-            self._buffer.append({"role": "assistant"})
-            self._first_block = False
-
-    def on_redacted_thinking_block(self, data: str) -> None:
-        """Handle RedactedThinkingBlock."""
-        LOGGER.debug(
-            "Some of Claude’s internal reasoning has been automatically "
-            "encrypted for safety reasons. This doesn’t affect the quality of "
-            "responses"
-        )
-        if self._first_block or self._content_details.redacted_thinking:
-            if self._content_details:
-                self._content_details.delete_empty()
-                self._buffer.append({"native": self._content_details})
-            self._content_details = ContentDetails()
-            self._content_details.add_citation_detail()
-            self._buffer.append({"role": "assistant"})
-            self._first_block = False
-        self._content_details.redacted_thinking = data
-
-    def on_server_tool_use_block(
-        self,
-        id: str,
-        name: Literal[
-            "web_search",
-            "web_fetch",
-            "code_execution",
-            "bash_code_execution",
-            "text_editor_code_execution",
-            "tool_search_tool_regex",
-            "tool_search_tool_bm25",
-        ],
-        input: dict[str, Any],
-        caller: Caller | None,
-    ) -> None:
-        """Handle ServerToolUseBlock."""
-        self._current_tool_block = ServerToolUseBlockParam(
-            type="server_tool_use",
-            id=id,
-            name=name,
-            input=input,
-        )
-        self._current_tool_args = ""
-
-    def on_server_tool_result_block(
-        self,
-        tool_use_id: str,
-        tool_name: Literal[
-            "web_search_tool_result",
-            "code_execution_tool_result",
-            "bash_code_execution_tool_result",
-            "text_editor_code_execution_tool_result",
-            "tool_search_tool_result",
-        ],
-        content: WebSearchToolResultBlockContent
-        | CodeExecutionToolResultBlockContent
-        | BashCodeExecutionToolResultBlockContent
-        | TextEditorCodeExecutionToolResultBlockContent
-        | ToolSearchToolResultBlockContent,
-        caller: Caller | None,
-    ) -> None:
-        """Handle various server tool result blocks."""
-        if self._content_details:
-            self._content_details.delete_empty()
-            self._buffer.append({"native": self._content_details})
-        self._content_details = ContentDetails()
-        self._content_details.add_citation_detail()
-        self._buffer.append(
-            {
-                "role": "tool_result",
-                "tool_call_id": tool_use_id,
-                "tool_name": tool_name.removesuffix("_tool_result"),
-                "tool_result": {
-                    "content": cast(JsonArrayType, [x.to_dict() for x in content])
+        if isinstance(response, RawMessageStartEvent):
+            input_usage = response.message.usage
+            first_block = True
+        elif isinstance(response, RawContentBlockStartEvent):
+            if isinstance(response.content_block, ToolUseBlock):
+                current_tool_block = ToolUseBlockParam(
+                    type="tool_use",
+                    id=response.content_block.id,
+                    name=response.content_block.name,
+                    input=response.content_block.input or {},
+                )
+                current_tool_args = ""
+                if response.content_block.name == output_tool:
+                    if first_block or content_details.has_content():
+                        if content_details:
+                            content_details.delete_empty()
+                            yield {"native": content_details}
+                        content_details = ContentDetails()
+                        content_details.add_citation_detail()
+                        yield {"role": "assistant"}
+                        first_block = False
+            elif isinstance(response.content_block, TextBlock):
+                if (  # Do not start a new assistant content just for citations, concatenate consecutive blocks with citations instead.
+                    first_block
+                    or (
+                        not content_details.has_citations()
+                        and response.content_block.citations is None
+                        and content_details.has_content()
+                    )
+                ):
+                    if content_details:
+                        content_details.delete_empty()
+                        yield {"native": content_details}
+                    content_details = ContentDetails()
+                    yield {"role": "assistant"}
+                    first_block = False
+                content_details.add_citation_detail()
+                if response.content_block.text:
+                    content_details.citation_details[-1].length += len(
+                        response.content_block.text
+                    )
+                    yield {"content": response.content_block.text}
+            elif isinstance(response.content_block, ThinkingBlock):
+                if first_block or content_details.thinking_signature:
+                    if content_details:
+                        content_details.delete_empty()
+                        yield {"native": content_details}
+                    content_details = ContentDetails()
+                    content_details.add_citation_detail()
+                    yield {"role": "assistant"}
+                    first_block = False
+            elif isinstance(response.content_block, RedactedThinkingBlock):
+                LOGGER.debug(
+                    "Some of Claude’s internal reasoning has been automatically "
+                    "encrypted for safety reasons. This doesn’t affect the quality of "
+                    "responses"
+                )
+                if first_block or content_details.redacted_thinking:
+                    if content_details:
+                        content_details.delete_empty()
+                        yield {"native": content_details}
+                    content_details = ContentDetails()
+                    content_details.add_citation_detail()
+                    yield {"role": "assistant"}
+                    first_block = False
+                content_details.redacted_thinking = response.content_block.data
+            elif isinstance(response.content_block, ServerToolUseBlock):
+                current_tool_block = ServerToolUseBlockParam(
+                    type="server_tool_use",
+                    id=response.content_block.id,
+                    name=response.content_block.name,
+                    input=response.content_block.input or {},
+                )
+                current_tool_args = ""
+            elif isinstance(
+                response.content_block,
+                (
+                    WebSearchToolResultBlock,
+                    CodeExecutionToolResultBlock,
+                    BashCodeExecutionToolResultBlock,
+                    TextEditorCodeExecutionToolResultBlock,
+                    ToolSearchToolResultBlock,
+                ),
+            ):
+                if content_details:
+                    content_details.delete_empty()
+                    yield {"native": content_details}
+                content_details = ContentDetails()
+                content_details.add_citation_detail()
+                yield {
+                    "role": "tool_result",
+                    "tool_call_id": response.content_block.tool_use_id,
+                    "tool_name": response.content_block.type.removesuffix(
+                        "_tool_result"
+                    ),
+                    "tool_result": {
+                        "content": cast(
+                            JsonObjectType, response.content_block.to_dict()["content"]
+                        )
+                    }
+                    if isinstance(response.content_block.content, list)
+                    else cast(JsonObjectType, response.content_block.content.to_dict()),
                 }
-                if isinstance(content, list)
-                else cast(JsonObjectType, content.to_dict()),
-            }
-        )
-        self._first_block = True
-
-    def on_content_block_delta_event(self, delta: RawContentBlockDelta) -> None:
-        """Handle RawContentBlockDeltaEvent."""
-        if isinstance(delta, InputJSONDelta):
-            self.on_input_json_delta(delta.partial_json)
-            return
-        if isinstance(delta, TextDelta):
-            self.on_text_delta(delta.text)
-            return
-        if isinstance(delta, ThinkingDelta):
-            self.on_thinking_delta(delta.thinking)
-            return
-        if isinstance(delta, SignatureDelta):
-            self.on_signature_delta(delta.signature)
-            return
-        if isinstance(delta, CitationsDelta):
-            self.on_citations_delta(delta.citation)
-            return
-        LOGGER.debug("Unhandled content delta type: %s", delta.type)  # type: ignore[unreachable]  # pragma: no cover - All types are handled but we want to verify that
-
-    def on_input_json_delta(self, partial_json: str) -> None:
-        """Handle InputJSONDelta."""
-        if (
-            self._current_tool_block is not None
-            and self._current_tool_block["name"] == self._output_tool
-        ):
-            self._content_details.citation_details[-1].length += len(partial_json)
-            self._buffer.append({"content": partial_json})
-        else:
-            self._current_tool_args += partial_json
-
-    def on_text_delta(self, text: str) -> None:
-        """Handle TextDelta."""
-        if text:
-            self._content_details.citation_details[-1].length += len(text)
-            self._buffer.append({"content": text})
-
-    def on_thinking_delta(self, thinking: str) -> None:
-        """Handle ThinkingDelta."""
-        if thinking:
-            self._buffer.append({"thinking_content": thinking})
-
-    def on_signature_delta(self, signature: str) -> None:
-        """Handle SignatureDelta."""
-        self._content_details.thinking_signature = signature
-
-    def on_citations_delta(self, citation: TextCitation) -> None:
-        """Handle CitationsDelta."""
-        self._content_details.add_citation(citation)
-
-    def on_content_block_stop_event(self, index: int) -> None:
-        """Handle RawContentBlockStopEvent."""
-        if self._current_tool_block is not None:
-            if self._current_tool_block["name"] == self._output_tool:
-                self._current_tool_block = None
-                return
-            tool_args = (
-                json.loads(self._current_tool_args) if self._current_tool_args else {}
-            )
-            self._current_tool_block["input"] |= tool_args
-            self._buffer.append(
-                {
+                first_block = True
+        elif isinstance(response, RawContentBlockDeltaEvent):
+            if isinstance(response.delta, InputJSONDelta):
+                if (
+                    current_tool_block is not None
+                    and current_tool_block["name"] == output_tool
+                ):
+                    content_details.citation_details[-1].length += len(
+                        response.delta.partial_json
+                    )
+                    yield {"content": response.delta.partial_json}
+                else:
+                    current_tool_args += response.delta.partial_json
+            elif isinstance(response.delta, TextDelta):
+                if response.delta.text:
+                    content_details.citation_details[-1].length += len(
+                        response.delta.text
+                    )
+                    yield {"content": response.delta.text}
+            elif isinstance(response.delta, ThinkingDelta):
+                if response.delta.thinking:
+                    yield {"thinking_content": response.delta.thinking}
+            elif isinstance(response.delta, SignatureDelta):
+                content_details.thinking_signature = response.delta.signature
+            elif isinstance(response.delta, CitationsDelta):
+                content_details.add_citation(response.delta.citation)
+        elif isinstance(response, RawContentBlockStopEvent):
+            if current_tool_block is not None:
+                if current_tool_block["name"] == output_tool:
+                    current_tool_block = None
+                    continue
+                tool_args = json.loads(current_tool_args) if current_tool_args else {}
+                current_tool_block["input"] |= tool_args
+                yield {
                     "tool_calls": [
                         llm.ToolInput(
-                            id=self._current_tool_block["id"],
-                            tool_name=self._current_tool_block["name"],
-                            tool_args=self._current_tool_block["input"],
-                            external=self._current_tool_block["type"]
-                            == "server_tool_use",
+                            id=current_tool_block["id"],
+                            tool_name=current_tool_block["name"],
+                            tool_args=current_tool_block["input"],
+                            external=current_tool_block["type"] == "server_tool_use",
                         )
                     ]
                 }
-            )
-            self._current_tool_block = None
+                current_tool_block = None
+        elif isinstance(response, RawMessageDeltaEvent):
+            if (usage := response.usage) is not None:
+                chat_log.async_trace(_create_token_stats(input_usage, usage))
+            content_details.container = response.delta.container
+            if response.delta.stop_reason == "refusal":
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN, translation_key="api_refusal"
+                )
+        elif isinstance(response, RawMessageStopEvent):
+            if content_details:
+                content_details.delete_empty()
+                yield {"native": content_details}
+            content_details = ContentDetails()
+            content_details.add_citation_detail()
 
-    def on_message_delta_event(self, delta: Delta, usage: MessageDeltaUsage) -> None:
-        """Handle RawMessageDeltaEvent."""
-        self._chat_log.async_trace(self._create_token_stats(self._input_usage, usage))
-        self._content_details.container = delta.container
-        if delta.stop_reason == "refusal":
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="api_refusal"
-            )
 
-    def on_message_stop_event(self) -> None:
-        """Handle RawMessageStopEvent."""
-        if self._content_details:
-            self._content_details.delete_empty()
-            self._buffer.append({"native": self._content_details})
-        self._content_details = ContentDetails()
-        self._content_details.add_citation_detail()
-
-    def _create_token_stats(
-        self, input_usage: Usage | None, response_usage: MessageDeltaUsage
-    ) -> dict[str, Any]:
-        """Create token stats for conversation agent tracing."""
-        input_tokens = 0
-        cached_input_tokens = 0
-        if input_usage:
-            input_tokens = input_usage.input_tokens
-            cached_input_tokens = input_usage.cache_creation_input_tokens or 0
-        output_tokens = response_usage.output_tokens
-        return {
-            "stats": {
-                "input_tokens": input_tokens,
-                "cached_input_tokens": cached_input_tokens,
-                "output_tokens": output_tokens,
-            }
+def _create_token_stats(
+    input_usage: Usage | None, response_usage: MessageDeltaUsage
+) -> dict[str, Any]:
+    """Create token stats for conversation agent tracing."""
+    input_tokens = 0
+    cached_input_tokens = 0
+    if input_usage:
+        input_tokens = input_usage.input_tokens
+        cached_input_tokens = input_usage.cache_creation_input_tokens or 0
+    output_tokens = response_usage.output_tokens
+    return {
+        "stats": {
+            "input_tokens": input_tokens,
+            "cached_input_tokens": cached_input_tokens,
+            "output_tokens": output_tokens,
         }
+    }
 
 
 class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
@@ -889,14 +703,15 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
             entry_type=dr.DeviceEntryType.SERVICE,
         )
 
-    async def _get_model_args(  # noqa: C901
+    async def _async_handle_chat_log(  # noqa: C901
         self,
         chat_log: conversation.ChatLog,
         structure_name: str | None = None,
         structure: vol.Schema | None = None,
-    ) -> tuple[MessageCreateParamsStreaming, str | None]:
-        """Get the model arguments."""
-        options: dict[str, Any] = DEFAULT | self.subentry.data
+        max_iterations: int = MAX_TOOL_ITERATIONS,
+    ) -> None:
+        """Generate an answer for the chat log."""
+        options = self.subentry.data
 
         preloaded_tools = [
             "HassTurnOn",
@@ -914,18 +729,21 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
 
         messages, container_id = _convert_content(chat_log.content[1:])
 
-        model = options[CONF_CHAT_MODEL]
+        model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
 
         model_args = MessageCreateParamsStreaming(
             model=model,
             messages=messages,
-            max_tokens=options[CONF_MAX_TOKENS],
+            max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
             system=system.content,
             stream=True,
             container=container_id,
         )
 
-        if options[CONF_PROMPT_CACHING] == PromptCaching.PROMPT:
+        if (
+            options.get(CONF_PROMPT_CACHING, DEFAULT[CONF_PROMPT_CACHING])
+            == PromptCaching.PROMPT
+        ):
             model_args["system"] = [
                 {
                     "type": "text",
@@ -933,14 +751,19 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                     "cache_control": {"type": "ephemeral"},
                 }
             ]
-        elif options[CONF_PROMPT_CACHING] == PromptCaching.AUTOMATIC:
+        elif (
+            options.get(CONF_PROMPT_CACHING, DEFAULT[CONF_PROMPT_CACHING])
+            == PromptCaching.AUTOMATIC
+        ):
             model_args["cache_control"] = {"type": "ephemeral"}
 
         if (
             self.model_info.capabilities
             and self.model_info.capabilities.thinking.types.adaptive.supported
         ):
-            thinking_effort = options[CONF_THINKING_EFFORT]
+            thinking_effort = options.get(
+                CONF_THINKING_EFFORT, DEFAULT[CONF_THINKING_EFFORT]
+            )
             if thinking_effort != "none":
                 model_args["thinking"] = ThinkingConfigAdaptiveParam(
                     type="adaptive", display="summarized"
@@ -949,7 +772,9 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
             else:
                 model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
         else:
-            thinking_budget = options[CONF_THINKING_BUDGET]
+            thinking_budget = options.get(
+                CONF_THINKING_BUDGET, DEFAULT[CONF_THINKING_BUDGET]
+            )
             if (
                 self.model_info.capabilities
                 and self.model_info.capabilities.thinking.types.enabled.supported
@@ -966,7 +791,9 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 and self.model_info.capabilities.effort.supported
             ):
                 model_args["output_config"] = OutputConfigParam(
-                    effort=options[CONF_THINKING_EFFORT]
+                    effort=options.get(
+                        CONF_THINKING_EFFORT, DEFAULT[CONF_THINKING_EFFORT]
+                    )
                 )
 
         tools: list[ToolUnionParam] = []
@@ -976,12 +803,12 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 for tool in chat_log.llm_api.tools
             ]
 
-        if options[CONF_CODE_EXECUTION]:
+        if options.get(CONF_CODE_EXECUTION):
             # The `web_search_20260209` tool automatically enables `code_execution_20260120` tool
             if (
                 not self.model_info.capabilities
                 or not self.model_info.capabilities.code_execution.supported
-                or not options[CONF_WEB_SEARCH]
+                or not options.get(CONF_WEB_SEARCH)
             ):
                 tools.append(
                     CodeExecutionTool20250825Param(
@@ -990,26 +817,26 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                     ),
                 )
 
-        if options[CONF_WEB_SEARCH]:
+        if options.get(CONF_WEB_SEARCH):
             if (
                 not self.model_info.capabilities
                 or not self.model_info.capabilities.code_execution.supported
-                or not options[CONF_CODE_EXECUTION]
+                or not options.get(CONF_CODE_EXECUTION)
             ):
                 web_search: WebSearchTool20250305Param | WebSearchTool20260209Param = (
                     WebSearchTool20250305Param(
                         name="web_search",
                         type="web_search_20250305",
-                        max_uses=options[CONF_WEB_SEARCH_MAX_USES],
+                        max_uses=options.get(CONF_WEB_SEARCH_MAX_USES),
                     )
                 )
             else:
                 web_search = WebSearchTool20260209Param(
                     name="web_search",
                     type="web_search_20260209",
-                    max_uses=options[CONF_WEB_SEARCH_MAX_USES],
+                    max_uses=options.get(CONF_WEB_SEARCH_MAX_USES),
                 )
-            if options[CONF_WEB_SEARCH_USER_LOCATION]:
+            if options.get(CONF_WEB_SEARCH_USER_LOCATION):
                 web_search["user_location"] = {
                     "type": "approximate",
                     "city": options.get(CONF_WEB_SEARCH_CITY, ""),
@@ -1110,7 +937,10 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 preloaded_tools.append(structure_name)
 
         if tools:
-            if options[CONF_TOOL_SEARCH] and len(tools) > len(preloaded_tools) + 1:
+            if (
+                options.get(CONF_TOOL_SEARCH, DEFAULT[CONF_TOOL_SEARCH])
+                and len(tools) > len(preloaded_tools) + 1
+            ):
                 for tool in tools:
                     if not tool["name"].endswith(tuple(preloaded_tools)):
                         tool["defer_loading"] = True
@@ -1123,19 +953,6 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
 
             model_args["tools"] = tools
 
-        return model_args, structure_name
-
-    async def _async_handle_chat_log(
-        self,
-        chat_log: conversation.ChatLog,
-        structure_name: str | None = None,
-        structure: vol.Schema | None = None,
-        max_iterations: int = MAX_TOOL_ITERATIONS,
-    ) -> None:
-        """Generate an answer for the chat log."""
-        model_args, structure_name = await self._get_model_args(
-            chat_log, structure_name, structure
-        )
         coordinator = self.entry.runtime_data
         client = coordinator.client
 
@@ -1149,7 +966,7 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                         content
                         async for content in chat_log.async_add_delta_content_stream(
                             self.entity_id,
-                            AnthropicDeltaStream(
+                            _transform_stream(
                                 chat_log,
                                 stream,
                                 output_tool=structure_name or None,
@@ -1157,7 +974,7 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                         )
                     ]
                 )
-                cast(list[MessageParam], model_args["messages"]).extend(new_messages)
+                messages.extend(new_messages)
             except anthropic.AuthenticationError as err:
                 # Trigger coordinator to confirm the auth failure and trigger the reauth flow.
                 await coordinator.async_request_refresh()

homeassistant/components/application_credentials/__init__.py

@@ -155,12 +155,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     hass.data[DATA_COMPONENT] = storage_collection
 
     collection.DictStorageCollectionWebsocket(
-        storage_collection,
-        DOMAIN,
-        DOMAIN,
-        CREATE_FIELDS,
-        UPDATE_FIELDS,
-        admin_only=True,
+        storage_collection, DOMAIN, DOMAIN, CREATE_FIELDS, UPDATE_FIELDS
     ).async_setup(hass)
 
     websocket_api.async_register_command(hass, handle_integration_list)
@@ -346,7 +341,6 @@ async def handle_integration_list(
         vol.Required("config_entry_id"): str,
     }
 )
-@websocket_api.require_admin
 @websocket_api.async_response
 async def handle_config_entry(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]

homeassistant/components/aquacell/entity.py

@@ -28,7 +28,7 @@ class AquacellEntity(CoordinatorEntity[AquacellCoordinator]):
         self._attr_unique_id = f"{softener_key}-{entity_key}"
         self._attr_device_info = DeviceInfo(
             name=self.softener.name,
-            hw_version=self.softener.diagnostics.fw_version,
+            hw_version=self.softener.fwVersion,
             identifiers={(DOMAIN, str(softener_key))},
             manufacturer=self.softener.brand,
             model=self.softener.ssn,

homeassistant/components/aquacell/manifest.json

@@ -8,5 +8,5 @@
   "integration_type": "device",
   "iot_class": "cloud_polling",
   "loggers": ["aioaquacell"],
-  "requirements": ["aioaquacell==1.0.0"]
+  "requirements": ["aioaquacell==0.2.0"]
 }

homeassistant/components/aquacell/sensor.py

@@ -38,39 +38,39 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
         translation_key="salt_left_side_percentage",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda softener: softener.salt.left_percent,
+        value_fn=lambda softener: softener.salt.leftPercent,
     ),
     SoftenerSensorEntityDescription(
         key="salt_right_side_percentage",
         translation_key="salt_right_side_percentage",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda softener: softener.salt.right_percent,
+        value_fn=lambda softener: softener.salt.rightPercent,
     ),
     SoftenerSensorEntityDescription(
         key="salt_left_side_time_remaining",
         translation_key="salt_left_side_time_remaining",
         device_class=SensorDeviceClass.DURATION,
         native_unit_of_measurement=UnitOfTime.DAYS,
-        value_fn=lambda softener: softener.salt.left_days,
+        value_fn=lambda softener: softener.salt.leftDays,
     ),
     SoftenerSensorEntityDescription(
         key="salt_right_side_time_remaining",
         translation_key="salt_right_side_time_remaining",
         device_class=SensorDeviceClass.DURATION,
         native_unit_of_measurement=UnitOfTime.DAYS,
-        value_fn=lambda softener: softener.salt.right_days,
+        value_fn=lambda softener: softener.salt.rightDays,
     ),
     SoftenerSensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda softener: softener.diagnostics.battery,
+        value_fn=lambda softener: softener.battery,
     ),
     SoftenerSensorEntityDescription(
         key="wi_fi_strength",
         translation_key="wi_fi_strength",
-        value_fn=lambda softener: softener.diagnostics.wifi_level,
+        value_fn=lambda softener: softener.wifiLevel,
         device_class=SensorDeviceClass.ENUM,
         options=[
             "high",
@@ -82,7 +82,7 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
         key="last_update",
         translation_key="last_update",
         device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda softener: softener.diagnostics.last_update,
+        value_fn=lambda softener: softener.lastUpdate,
     ),
 )
 

homeassistant/components/arcam_fmj/sensor.py

@@ -4,9 +4,8 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-import logging
 
-from arcam.fmj import IncomingVideoAspectRatio, IncomingVideoColorspace, IntOrTypeEnum
+from arcam.fmj import IncomingVideoAspectRatio, IncomingVideoColorspace
 from arcam.fmj.state import IncomingAudioConfig, IncomingAudioFormat, State
 
 from homeassistant.components.sensor import (
@@ -22,25 +21,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import ArcamFmjConfigEntry
 from .entity import ArcamFmjEntity
 
-_LOGGER = logging.getLogger(__name__)
-
-
-def _enum_options(value: type[IntOrTypeEnum]) -> list[str]:
-    return [
-        member.name.lower() for member in value if not member.name.startswith("CODE_")
-    ]
-
-
-def _enum_value(value: IntOrTypeEnum | None) -> str | None:
-    if value is None:
-        return None
-
-    if value.name.startswith("CODE_"):
-        _LOGGER.debug("Undefined enum value %s ignored", value)
-        return None
-
-    return value.name.lower()
-
 
 @dataclass(frozen=True, kw_only=True)
 class ArcamFmjSensorEntityDescription(SensorEntityDescription):
@@ -95,9 +75,9 @@ SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
         translation_key="incoming_video_aspect_ratio",
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.ENUM,
-        options=_enum_options(IncomingVideoAspectRatio),
+        options=[member.name.lower() for member in IncomingVideoAspectRatio],
         value_fn=lambda state: (
-            _enum_value(vp.aspect_ratio)
+            vp.aspect_ratio.name.lower()
             if (vp := state.get_incoming_video_parameters()) is not None
             else None
         ),
@@ -107,10 +87,11 @@ SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
         translation_key="incoming_video_colorspace",
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.ENUM,
-        options=_enum_options(IncomingVideoColorspace),
+        options=[member.name.lower() for member in IncomingVideoColorspace],
         value_fn=lambda state: (
-            _enum_value(vp.colorspace)
+            vp.colorspace.name.lower()
             if (vp := state.get_incoming_video_parameters()) is not None
+            and vp.colorspace is not None
             else None
         ),
     ),
@@ -119,16 +100,24 @@ SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
         translation_key="incoming_audio_format",
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.ENUM,
-        options=_enum_options(IncomingAudioFormat),
-        value_fn=lambda state: _enum_value(state.get_incoming_audio_format()[0]),
+        options=[member.name.lower() for member in IncomingAudioFormat],
+        value_fn=lambda state: (
+            result.name.lower()
+            if (result := state.get_incoming_audio_format()[0]) is not None
+            else None
+        ),
     ),
     ArcamFmjSensorEntityDescription(
         key="incoming_audio_config",
         translation_key="incoming_audio_config",
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.ENUM,
-        options=_enum_options(IncomingAudioConfig),
-        value_fn=lambda state: _enum_value(state.get_incoming_audio_format()[1]),
+        options=[member.name.lower() for member in IncomingAudioConfig],
+        value_fn=lambda state: (
+            result.name.lower()
+            if (result := state.get_incoming_audio_format()[1]) is not None
+            else None
+        ),
     ),
     ArcamFmjSensorEntityDescription(
         key="incoming_audio_sample_rate",

homeassistant/components/assist_satellite/__init__.py

@@ -13,12 +13,11 @@ from hassil.util import (
 )
 import voluptuous as vol
 
-from homeassistant.auth.permissions.const import CAT_ENTITIES, POLICY_CONTROL
 from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse
-from homeassistant.exceptions import HomeAssistantError, Unauthorized, UnknownUser
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
@@ -104,22 +103,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     async def handle_ask_question(call: ServiceCall) -> dict[str, Any]:
         """Handle a Show View service call."""
         satellite_entity_id: str = call.data[ATTR_ENTITY_ID]
-        if call.context.user_id:
-            user = await hass.auth.async_get_user(call.context.user_id)
-            if user is None:
-                raise UnknownUser(
-                    context=call.context,
-                    permission=POLICY_CONTROL,
-                    user_id=call.context.user_id,
-                )
-            if not user.permissions.check_entity(satellite_entity_id, POLICY_CONTROL):
-                raise Unauthorized(
-                    context=call.context,
-                    permission=POLICY_CONTROL,
-                    user_id=call.context.user_id,
-                    perm_category=CAT_ENTITIES,
-                )
-
         satellite_entity: AssistSatelliteEntity | None = component.get_entity(
             satellite_entity_id
         )

homeassistant/components/assist_satellite/conditions.yaml

@@ -7,8 +7,11 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: condition
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
     for:
       required: true
       default: 00:00:00

homeassistant/components/assist_satellite/strings.json

@@ -72,6 +72,19 @@
         "id": "Answer ID",
         "sentences": "Sentences"
       }
+    },
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
     }
   },
   "services": {

homeassistant/components/assist_satellite/triggers.yaml

@@ -7,8 +7,12 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: trigger
+        select:
+          options:
+            - first
+            - last
+            - any
+          translation_key: trigger_behavior
     for:
       required: true
       default: 00:00:00

homeassistant/components/assist_satellite/websocket_api.py

@@ -165,7 +165,6 @@ async def websocket_set_wake_words(
         vol.Required("entity_id"): cv.entity_domain(DOMAIN),
     }
 )
-@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_test_connection(
     hass: HomeAssistant,

homeassistant/components/auth/mfa_setup_flow.py

@@ -15,6 +15,24 @@ from homeassistant.data_entry_flow import FlowContext
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util.hass_dict import HassKey
 
+WS_TYPE_SETUP_MFA = "auth/setup_mfa"
+SCHEMA_WS_SETUP_MFA = vol.All(
+    websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend(
+        {
+            vol.Required("type"): WS_TYPE_SETUP_MFA,
+            vol.Exclusive("mfa_module_id", "module_or_flow_id"): str,
+            vol.Exclusive("flow_id", "module_or_flow_id"): str,
+            vol.Optional("user_input"): object,
+        }
+    ),
+    cv.has_at_least_one_key("mfa_module_id", "flow_id"),
+)
+
+WS_TYPE_DEPOSE_MFA = "auth/depose_mfa"
+SCHEMA_WS_DEPOSE_MFA = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend(
+    {vol.Required("type"): WS_TYPE_DEPOSE_MFA, vol.Required("mfa_module_id"): str}
+)
+
 DATA_SETUP_FLOW_MGR: HassKey[MfaFlowManager] = HassKey("auth_mfa_setup_flow_manager")
 
 _LOGGER = logging.getLogger(__name__)
@@ -55,24 +73,16 @@ def async_setup(hass: HomeAssistant) -> None:
     """Init mfa setup flow manager."""
     hass.data[DATA_SETUP_FLOW_MGR] = MfaFlowManager(hass)
 
-    websocket_api.async_register_command(hass, websocket_setup_mfa)
-    websocket_api.async_register_command(hass, websocket_depose_mfa)
+    websocket_api.async_register_command(
+        hass, WS_TYPE_SETUP_MFA, websocket_setup_mfa, SCHEMA_WS_SETUP_MFA
+    )
+
+    websocket_api.async_register_command(
+        hass, WS_TYPE_DEPOSE_MFA, websocket_depose_mfa, SCHEMA_WS_DEPOSE_MFA
+    )
 
 
 @callback
-@websocket_api.websocket_command(
-    vol.All(
-        vol.Schema(
-            {
-                vol.Required("type"): "auth/setup_mfa",
-                vol.Exclusive("mfa_module_id", "module_or_flow_id"): str,
-                vol.Exclusive("flow_id", "module_or_flow_id"): str,
-                vol.Optional("user_input"): object,
-            }
-        ),
-        cv.has_at_least_one_key("mfa_module_id", "flow_id"),
-    )
-)
 @websocket_api.ws_require_user(allow_system_user=False)
 def websocket_setup_mfa(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
@@ -111,9 +121,6 @@ def websocket_setup_mfa(
 
 
 @callback
-@websocket_api.websocket_command(
-    {vol.Required("type"): "auth/depose_mfa", vol.Required("mfa_module_id"): str}
-)
 @websocket_api.ws_require_user(allow_system_user=False)
 def websocket_depose_mfa(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]

homeassistant/components/automation/__init__.py

@@ -4,10 +4,10 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 import asyncio
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from dataclasses import dataclass
 import logging
-from typing import Any, cast
+from typing import Any, Protocol, cast
 
 from propcache.api import cached_property
 import voluptuous as vol
@@ -194,7 +194,6 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
-    "timer",
     "todo",
     "update",
     "vacuum",
@@ -230,11 +229,14 @@ def is_disabled_experimental_trigger(hass: HomeAssistant, platform: str) -> bool
     )
 
 
-class IfAction(condition_helper.ConditionsChecker):
+class IfAction(Protocol):
     """Define the format of if_action."""
 
     config: list[ConfigType]
 
+    def __call__(self, variables: Mapping[str, Any] | None = None) -> bool:
+        """AND all conditions."""
+
 
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return true if specified automation entity_id is on.
@@ -833,7 +835,7 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
             if (
                 not skip_condition
                 and self._condition is not None
-                and not self._condition.async_check(variables=variables)
+                and not self._condition(variables)
             ):
                 self._logger.debug(
                     "Conditions not met, aborting automation. Condition summary: %s",
@@ -902,13 +904,6 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
         """Remove listeners when removing automation from Home Assistant."""
         await super().async_will_remove_from_hass()
         await self._async_disable()
-        if self.registry_entry and self.registry_entry.entity_id != self.entity_id:
-            # Entity ID change, do not unload the script or conditions as they will
-            # be reused.
-            return
-        self.action_script.async_unload()
-        if self._condition is not None:
-            self._condition.async_unload()
 
     async def _async_enable_automation(self, event: Event) -> None:
         """Start automation on startup."""
@@ -1281,7 +1276,6 @@ async def _async_process_if(
 
 
 @websocket_api.websocket_command({"type": "automation/config", "entity_id": str})
-@websocket_api.require_admin
 def websocket_config(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,

homeassistant/components/axis/const.py

@@ -18,10 +18,4 @@ DEFAULT_STREAM_PROFILE = "No stream profile"
 DEFAULT_TRIGGER_TIME = 0
 DEFAULT_VIDEO_SOURCE = "No video source"
 
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.CAMERA,
-    Platform.EVENT,
-    Platform.LIGHT,
-    Platform.SWITCH,
-]
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.CAMERA, Platform.LIGHT, Platform.SWITCH]

homeassistant/components/axis/event.py

@@ -1,62 +0,0 @@
-"""Support for Axis event entities."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from axis.models.event import Event, EventTopic
-
-from homeassistant.components.event import (
-    DoorbellEventType,
-    EventDeviceClass,
-    EventEntity,
-    EventEntityDescription,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import AxisConfigEntry
-from .entity import AxisEventDescription, AxisEventEntity
-
-DOORBELL_CONFIG = ("I8116-E", "0")
-
-
-@dataclass(frozen=True, kw_only=True)
-class AxisEventPlatformDescription(AxisEventDescription, EventEntityDescription):
-    """Axis event entity description."""
-
-
-ENTITY_DESCRIPTIONS = (
-    AxisEventPlatformDescription(
-        key="Doorbell",
-        device_class=EventDeviceClass.DOORBELL,
-        event_types=[DoorbellEventType.RING],
-        event_topic=EventTopic.PORT_INPUT,
-        name_fn=lambda _hub, _event: "Doorbell",
-        supported_fn=lambda hub, event: (hub.config.model, event.id) == DOORBELL_CONFIG,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AxisConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up an Axis event platform."""
-    config_entry.runtime_data.entity_loader.register_platform(
-        async_add_entities, AxisEvent, ENTITY_DESCRIPTIONS
-    )
-
-
-class AxisEvent(AxisEventEntity, EventEntity):
-    """Representation of an Axis event entity."""
-
-    entity_description: AxisEventPlatformDescription
-
-    @callback
-    def async_event_callback(self, event: Event) -> None:
-        """Handle Axis event updates."""
-        if event.is_tripped:
-            self._trigger_event(DoorbellEventType.RING)
-            self.async_write_ha_state()

homeassistant/components/axis/hub/api.py

@@ -36,7 +36,6 @@ async def get_axis_api(
             username=config[CONF_USERNAME],
             password=config[CONF_PASSWORD],
             web_proto=config.get(CONF_PROTOCOL, "http"),
-            websocket_enabled=True,
         )
     )
 

homeassistant/components/axis/manifest.json

@@ -29,7 +29,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["axis"],
-  "requirements": ["axis==69"],
+  "requirements": ["axis==68"],
   "ssdp": [
     {
       "manufacturer": "AXIS"

homeassistant/components/backup/services.py

@@ -2,7 +2,6 @@
 
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.hassio import is_hassio
-from homeassistant.helpers.service import async_register_admin_service
 
 from .const import DATA_MANAGER, DOMAIN
 
@@ -31,9 +30,7 @@ async def _async_handle_create_automatic_service(call: ServiceCall) -> None:
 def async_setup_services(hass: HomeAssistant) -> None:
     """Register services."""
     if not is_hassio(hass):
-        async_register_admin_service(
-            hass, DOMAIN, "create", _async_handle_create_service
-        )
-    async_register_admin_service(
-        hass, DOMAIN, "create_automatic", _async_handle_create_automatic_service
+        hass.services.async_register(DOMAIN, "create", _async_handle_create_service)
+    hass.services.async_register(
+        DOMAIN, "create_automatic", _async_handle_create_automatic_service
     )

homeassistant/components/bang_olufsen/__init__.py

@@ -21,9 +21,8 @@ from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.ssl import get_default_context
 
-from .const import DOMAIN, MANUFACTURER, BeoModel
+from .const import DOMAIN
 from .services import async_setup_services
-from .util import get_remotes
 from .websocket import BeoWebsocket
 
 
@@ -59,6 +58,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
     # Remove casts to str
     assert entry.unique_id
 
+    # Create device now as BeoWebsocket needs a device for debug logging, firing events etc.
+    device_registry = dr.async_get(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={(DOMAIN, entry.unique_id)},
+        name=entry.title,
+        model=entry.data[CONF_MODEL],
+    )
+
     client = MozartClient(host=entry.data[CONF_HOST], ssl_context=get_default_context())
 
     # Check API and WebSocket connection
@@ -75,27 +83,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
         await client.close_api_client()
         raise ConfigEntryNotReady(f"Unable to connect to {entry.title}") from error
 
-    # Create device now as BeoWebsocket needs a device for debug logging, firing events etc.
-    device_registry = dr.async_get(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        identifiers={(DOMAIN, entry.unique_id)},
-        model=entry.data[CONF_MODEL],
-    )
-
-    # Create devices for paired Beoremote One remotes
-    for remote in await get_remotes(client):
-        device_registry.async_get_or_create(
-            config_entry_id=entry.entry_id,
-            identifiers={(DOMAIN, f"{remote.serial_number}_{entry.unique_id}")},
-            name=f"{BeoModel.BEOREMOTE_ONE}-{remote.serial_number}-{entry.unique_id}",
-            model=BeoModel.BEOREMOTE_ONE,
-            serial_number=remote.serial_number,
-            sw_version=remote.app_version,
-            manufacturer=MANUFACTURER,
-            via_device=(DOMAIN, entry.unique_id),
-        )
-
     websocket = BeoWebsocket(hass, entry, client)
 
     # Add the websocket and API client

homeassistant/components/bang_olufsen/config_flow.py

@@ -52,7 +52,6 @@ class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 
     _beolink_jid = ""
     _client: MozartClient
-    _friendly_name = ""
     _host = ""
     _model = ""
     _name = ""
@@ -112,7 +111,6 @@ class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
                     )
 
             self._beolink_jid = beolink_self.jid
-            self._friendly_name = beolink_self.friendly_name
             self._serial_number = get_serial_number_from_jid(beolink_self.jid)
 
             await self.async_set_unique_id(self._serial_number)
@@ -151,7 +149,6 @@ class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
                 return self.async_abort(reason="invalid_address")
 
         self._model = discovery_info.hostname[:-16].replace("-", " ")
-        self._friendly_name = discovery_info.properties[ATTR_FRIENDLY_NAME]
         self._serial_number = discovery_info.properties[ATTR_SERIAL_NUMBER]
         self._beolink_jid = f"{discovery_info.properties[ATTR_TYPE_NUMBER]}.{discovery_info.properties[ATTR_ITEM_NUMBER]}.{self._serial_number}@products.bang-olufsen.com"
 
@@ -167,13 +164,16 @@ class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
 
     async def _create_entry(self) -> ConfigFlowResult:
         """Create the config entry for a discovered or manually configured Bang & Olufsen device."""
+        # Ensure that created entities have a unique and easily identifiable id and not a "friendly name"
+        self._name = f"{self._model}-{self._serial_number}"
+
         return self.async_create_entry(
-            title=self._friendly_name,
+            title=self._name,
             data=EntryData(
                 host=self._host,
                 jid=self._beolink_jid,
                 model=self._model,
-                name=self._friendly_name,
+                name=self._name,
             ),
         )
 

homeassistant/components/bang_olufsen/event.py

@@ -20,6 +20,7 @@ from .const import (
     CONNECTION_STATUS,
     DEVICE_BUTTON_EVENTS,
     DOMAIN,
+    MANUFACTURER,
     BeoModel,
     WebsocketNotification,
 )
@@ -141,6 +142,12 @@ class BeoRemoteKeyEvent(BeoEvent):
         self._attr_unique_id = f"{remote.serial_number}_{self._unique_id}_{key_type}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")},
+            name=f"{BeoModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
+            model=BeoModel.BEOREMOTE_ONE,
+            serial_number=remote.serial_number,
+            sw_version=remote.app_version,
+            manufacturer=MANUFACTURER,
+            via_device=(DOMAIN, self._unique_id),
         )
 
         # Make the native key name Home Assistant compatible

homeassistant/components/bang_olufsen/sensor.py

@@ -115,7 +115,7 @@ class BeoSensorRemoteBatteryLevel(BeoSensor):
             f"{remote.serial_number}_{self._unique_id}_remote_battery_level"
         )
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")},
+            identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")}
         )
         self._attr_native_value = remote.battery_level
         self._remote = remote

homeassistant/components/battery/condition.py

@@ -30,33 +30,19 @@ BATTERY_PERCENTAGE_DOMAIN_SPECS = {
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_low": make_entity_state_condition(
-        BATTERY_DOMAIN_SPECS,
-        STATE_ON,
-        support_duration=True,
-        primary_entities_only=False,
+        BATTERY_DOMAIN_SPECS, STATE_ON, support_duration=True
     ),
     "is_not_low": make_entity_state_condition(
-        BATTERY_DOMAIN_SPECS,
-        STATE_OFF,
-        support_duration=True,
-        primary_entities_only=False,
+        BATTERY_DOMAIN_SPECS, STATE_OFF, support_duration=True
     ),
     "is_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS,
-        STATE_ON,
-        support_duration=True,
-        primary_entities_only=False,
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON, support_duration=True
     ),
     "is_not_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS,
-        STATE_OFF,
-        support_duration=True,
-        primary_entities_only=False,
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF, support_duration=True
     ),
     "is_level": make_entity_numerical_condition(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS,
-        PERCENTAGE,
-        primary_entities_only=False,
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
     ),
 }
 

homeassistant/components/battery/conditions.yaml

@@ -3,14 +3,16 @@
     entity:
       - domain: binary_sensor
         device_class: battery
-    primary_entities_only: false
   fields:
     behavior: &condition_behavior
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: condition
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
     for: &condition_for
       required: true
       default: 00:00:00
@@ -40,7 +42,6 @@ is_charging:
     entity:
       - domain: binary_sensor
         device_class: battery_charging
-    primary_entities_only: false
   fields:
     behavior: *condition_behavior
     for: *condition_for
@@ -50,7 +51,6 @@ is_not_charging:
     entity:
       - domain: binary_sensor
         device_class: battery_charging
-    primary_entities_only: false
   fields:
     behavior: *condition_behavior
     for: *condition_for
@@ -60,7 +60,6 @@ is_level:
     entity:
       - domain: sensor
         device_class: battery
-    primary_entities_only: false
   fields:
     behavior: *condition_behavior
     threshold:

homeassistant/components/battery/strings.json

@@ -69,6 +69,21 @@
       "name": "Battery is not low"
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "title": "Battery",
   "triggers": {
     "level_changed": {

homeassistant/components/battery/trigger.py

@@ -32,27 +32,19 @@ BATTERY_PERCENTAGE_DOMAIN_SPECS: dict[str, DomainSpec] = {
 }
 
 TRIGGERS: dict[str, type[Trigger]] = {
-    "low": make_entity_target_state_trigger(
-        BATTERY_LOW_DOMAIN_SPECS, STATE_ON, primary_entities_only=False
-    ),
-    "not_low": make_entity_target_state_trigger(
-        BATTERY_LOW_DOMAIN_SPECS, STATE_OFF, primary_entities_only=False
-    ),
+    "low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_ON),
+    "not_low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_OFF),
     "started_charging": make_entity_target_state_trigger(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON, primary_entities_only=False
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON
     ),
     "stopped_charging": make_entity_target_state_trigger(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF, primary_entities_only=False
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
     ),
     "level_changed": make_entity_numerical_state_changed_trigger(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS,
-        valid_unit="%",
-        primary_entities_only=False,
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
     ),
     "level_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS,
-        valid_unit="%",
-        primary_entities_only=False,
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
     ),
 }
 

homeassistant/components/battery/triggers.yaml

@@ -3,8 +3,12 @@
     required: true
     default: any
     selector:
-      automation_behavior:
-        mode: trigger
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
   for: &trigger_for
     required: true
     default: 00:00:00
@@ -29,19 +33,16 @@
   entity:
     - domain: binary_sensor
       device_class: battery
-  primary_entities_only: false
 
 .trigger_target_charging: &trigger_target_charging
   entity:
     - domain: binary_sensor
       device_class: battery_charging
-  primary_entities_only: false
 
 .trigger_target_percentage: &trigger_target_percentage
   entity:
     - domain: sensor
       device_class: battery
-  primary_entities_only: false
 
 low:
   fields:

homeassistant/components/bayesian/config_flow.py

@@ -33,13 +33,11 @@ from homeassistant.components.update import DOMAIN as UPDATE_DOMAIN
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 from homeassistant.components.zone import DOMAIN as ZONE_DOMAIN
 from homeassistant.config_entries import (
-    SOURCE_USER,
     ConfigEntry,
     ConfigFlowResult,
     ConfigSubentry,
+    ConfigSubentryData,
     ConfigSubentryFlow,
-    FlowType,
-    SubentryFlowContext,
     SubentryFlowResult,
 )
 from homeassistant.const import (
@@ -64,6 +62,7 @@ from homeassistant.helpers.schema_config_entry_flow import (
 
 from .binary_sensor import above_greater_than_below, no_overlapping
 from .const import (
+    CONF_OBSERVATIONS,
     CONF_P_GIVEN_F,
     CONF_P_GIVEN_T,
     CONF_PRIOR,
@@ -374,6 +373,26 @@ def _validate_observation_subentry(
     return user_input
 
 
+async def _validate_subentry_from_config_entry(
+    handler: SchemaCommonFlowHandler, user_input: dict[str, Any]
+) -> dict[str, Any]:
+    # Standard behavior is to merge the result with the options.
+    # In this case, we want to add a subentry so we update the options directly.
+    observations: list[dict[str, Any]] = handler.options.setdefault(
+        CONF_OBSERVATIONS, []
+    )
+
+    if handler.parent_handler.cur_step is not None:
+        user_input[CONF_PLATFORM] = handler.parent_handler.cur_step["step_id"]
+        user_input = _validate_observation_subentry(
+            user_input[CONF_PLATFORM],
+            user_input,
+            other_subentries=handler.options[CONF_OBSERVATIONS],
+        )
+    observations.append(user_input)
+    return {}
+
+
 async def _get_description_placeholders(
     handler: SchemaCommonFlowHandler,
 ) -> dict[str, str]:
@@ -401,12 +420,48 @@ async def _get_description_placeholders(
     }
 
 
+async def _get_observation_menu_options(handler: SchemaCommonFlowHandler) -> list[str]:
+    """Return the menu options for the observation selector."""
+    options = [typ.value for typ in ObservationTypes]
+    if handler.options.get(CONF_OBSERVATIONS):
+        options.append("finish")
+    return options
+
+
 CONFIG_FLOW: dict[str, SchemaFlowMenuStep | SchemaFlowFormStep] = {
     str(USER): SchemaFlowFormStep(
         CONFIG_SCHEMA,
         validate_user_input=_validate_user,
+        next_step=str(OBSERVATION_SELECTOR),
         description_placeholders=_get_description_placeholders,
-    )
+    ),
+    str(OBSERVATION_SELECTOR): SchemaFlowMenuStep(
+        _get_observation_menu_options,
+    ),
+    str(ObservationTypes.STATE): SchemaFlowFormStep(
+        STATE_SUBSCHEMA,
+        next_step=str(OBSERVATION_SELECTOR),
+        validate_user_input=_validate_subentry_from_config_entry,
+        # Prevent the name of the bayesian sensor from being used as the suggested
+        # name of the observations
+        suggested_values=None,
+        description_placeholders=_get_description_placeholders,
+    ),
+    str(ObservationTypes.NUMERIC_STATE): SchemaFlowFormStep(
+        NUMERIC_STATE_SUBSCHEMA,
+        next_step=str(OBSERVATION_SELECTOR),
+        validate_user_input=_validate_subentry_from_config_entry,
+        suggested_values=None,
+        description_placeholders=_get_description_placeholders,
+    ),
+    str(ObservationTypes.TEMPLATE): SchemaFlowFormStep(
+        TEMPLATE_SUBSCHEMA,
+        next_step=str(OBSERVATION_SELECTOR),
+        validate_user_input=_validate_subentry_from_config_entry,
+        suggested_values=None,
+        description_placeholders=_get_description_placeholders,
+    ),
+    "finish": SchemaFlowFormStep(),
 }
 
 
@@ -442,17 +497,27 @@ class BayesianConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
         name: str = options[CONF_NAME]
         return name
 
-    async def async_on_create_entry(self, result: ConfigFlowResult) -> ConfigFlowResult:
-        """Start subentry flow when config entry has been created."""
-        subentry_result = await self.hass.config_entries.subentries.async_init(
-            (result["result"].entry_id, "observation"),
-            context=SubentryFlowContext(source=SOURCE_USER),
-        )
-        result["next_flow"] = (
-            FlowType.CONFIG_SUBENTRIES_FLOW,
-            subentry_result["flow_id"],
-        )
-        return result
+    @callback
+    def async_create_entry(
+        self,
+        data: Mapping[str, Any],
+        **kwargs: Any,
+    ) -> ConfigFlowResult:
+        """Finish config flow and create a config entry."""
+        data = dict(data)
+        observations = data.pop(CONF_OBSERVATIONS)
+        subentries: list[ConfigSubentryData] = [
+            ConfigSubentryData(
+                data=observation,
+                title=observation[CONF_NAME],
+                subentry_type="observation",
+                unique_id=None,
+            )
+            for observation in observations
+        ]
+
+        self.async_config_flow_finished(data)
+        return super().async_create_entry(data=data, subentries=subentries, **kwargs)
 
 
 class ObservationSubentryFlowHandler(ConfigSubentryFlow):

homeassistant/components/blebox/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["blebox_uniapi"],
-  "requirements": ["blebox-uniapi==2.5.2"],
+  "requirements": ["blebox-uniapi==2.5.1"],
   "zeroconf": ["_bbxsrv._tcp.local."]
 }

homeassistant/components/blink/icons.json

@@ -21,6 +21,9 @@
     "save_video": {
       "service": "mdi:file-video"
     },
+    "send_pin": {
+      "service": "mdi:two-factor-authentication"
+    },
     "trigger_camera": {
       "service": "mdi:image-refresh"
     }

homeassistant/components/blink/services.py

@@ -5,9 +5,15 @@ from __future__ import annotations
 import voluptuous as vol
 
 from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
-from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
+from homeassistant.const import (
+    ATTR_CONFIG_ENTRY_ID,
+    CONF_FILE_PATH,
+    CONF_FILENAME,
+    CONF_PIN,
+)
+from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv, issue_registry as ir, service
 
 from .const import DOMAIN
 
@@ -17,10 +23,50 @@ SERVICE_SAVE_VIDEO = "save_video"
 SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
 
 
+# Deprecated
+SERVICE_SEND_PIN = "send_pin"
+SERVICE_SEND_PIN_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY_ID): vol.All(cv.ensure_list, [cv.string]),
+        vol.Optional(CONF_PIN): cv.string,
+    }
+)
+
+
+async def _send_pin(call: ServiceCall) -> None:
+    """Call blink to send new pin."""
+    # Create repair issue to inform user about service removal
+    ir.async_create_issue(
+        call.hass,
+        DOMAIN,
+        "service_send_pin_deprecation",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        severity=ir.IssueSeverity.ERROR,
+        breaks_in_ha_version="2026.5.0",
+        translation_key="service_send_pin_deprecation",
+        translation_placeholders={"service_name": f"{DOMAIN}.{SERVICE_SEND_PIN}"},
+    )
+
+    # Service has been removed - raise exception
+    raise HomeAssistantError(
+        translation_domain=DOMAIN,
+        translation_key="service_removed",
+        translation_placeholders={"service_name": f"{DOMAIN}.{SERVICE_SEND_PIN}"},
+    )
+
+
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the services for the Blink integration."""
 
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SEND_PIN,
+        _send_pin,
+        schema=SERVICE_SEND_PIN_SCHEMA,
+    )
+
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,

homeassistant/components/blink/services.yaml

@@ -35,3 +35,15 @@ save_recent_clips:
       example: "/tmp"
       selector:
         text:
+
+send_pin:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: blink
+    pin:
+      example: "abc123"
+      selector:
+        text:

homeassistant/components/blink/strings.json

@@ -82,6 +82,9 @@
     },
     "not_loaded": {
       "message": "{target} is not loaded."
+    },
+    "service_removed": {
+      "message": "The service {service_name} has been removed and is no longer needed. Home Assistant will automatically prompt for reauthentication when required."
     }
   },
   "issues": {
@@ -95,6 +98,10 @@
         }
       },
       "title": "Blink update service is being removed"
+    },
+    "service_send_pin_deprecation": {
+      "description": "The service {service_name} has been removed and is no longer needed. When a new two-factor authentication code is required, Home Assistant will automatically prompt you to reauthenticate through the integration configuration. Please remove any automations or scripts that call this service.",
+      "title": "Blink send PIN service has been removed"
     }
   },
   "options": {
@@ -133,6 +140,20 @@
       },
       "name": "Save video"
     },
+    "send_pin": {
+      "description": "Sends a new PIN to Blink for 2FA.",
+      "fields": {
+        "config_entry_id": {
+          "description": "The Blink integration ID.",
+          "name": "Integration ID"
+        },
+        "pin": {
+          "description": "PIN received from Blink. Leave empty if you only received a verification email.",
+          "name": "PIN"
+        }
+      },
+      "name": "Send PIN"
+    },
     "trigger_camera": {
       "description": "Requests camera to take new image.",
       "name": "Trigger camera"

homeassistant/components/bluetooth/__init__.py

@@ -58,7 +58,6 @@ from .api import (
     async_address_present,
     async_ble_device_from_address,
     async_clear_address_from_match_history,
-    async_clear_advertisement_history,
     async_current_scanners,
     async_discovered_service_info,
     async_get_advertisement_callback,
@@ -117,7 +116,6 @@ __all__ = [
     "async_address_present",
     "async_ble_device_from_address",
     "async_clear_address_from_match_history",
-    "async_clear_advertisement_history",
     "async_current_scanners",
     "async_discovered_service_info",
     "async_get_advertisement_callback",

homeassistant/components/bluetooth/api.py

@@ -207,19 +207,6 @@ def async_clear_address_from_match_history(hass: HomeAssistant, address: str) ->
     _get_manager(hass).async_clear_address_from_match_history(address)
 
 
-@hass_callback
-def async_clear_advertisement_history(hass: HomeAssistant, address: str) -> None:
-    """Clear cached advertisement history for a device.
-
-    Causes the next advertisement from this address to be treated as new
-    data, bypassing the change-detection guard in the Bluetooth manager.
-    Intended for devices that emit static advertisements as a wake-up
-    signal, for example, devices that require an active GATT connection
-    to read sensor data and whose advertisement payload never changes.
-    """
-    _get_manager(hass).async_clear_advertisement_history(address)
-
-
 @hass_callback
 def async_register_scanner(
     hass: HomeAssistant,

homeassistant/components/broadlink/const.py

@@ -6,9 +6,7 @@ DOMAIN = "broadlink"
 
 DOMAINS_AND_TYPES = {
     Platform.CLIMATE: {"HYS"},
-    Platform.INFRARED: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},
     Platform.LIGHT: {"LB1", "LB2"},
-    Platform.RADIO_FREQUENCY: {"RM4PRO", "RMPRO"},
     Platform.REMOTE: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},
     Platform.SELECT: {"HYS"},
     Platform.SENSOR: {

homeassistant/components/broadlink/infrared.py

@@ -1,69 +0,0 @@
-"""Infrared platform for Broadlink remotes."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from broadlink.exceptions import BroadlinkException
-from broadlink.remote import pulses_to_data as _bl_pulses_to_data
-
-from homeassistant.components.infrared import InfraredCommand, InfraredEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import DOMAIN
-from .entity import BroadlinkEntity
-
-if TYPE_CHECKING:
-    from .device import BroadlinkDevice
-
-PARALLEL_UPDATES = 1
-
-
-def _timings_to_broadlink_packet(timings: list[int]) -> bytes:
-    """Convert signed microsecond timings to a Broadlink IR packet.
-
-    Positive values are pulse (high) durations; negative values are space
-    (low) durations. The Broadlink library's encoder expects absolute
-    durations.
-    """
-    pulses = [abs(t) for t in timings]
-    return _bl_pulses_to_data(pulses)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Broadlink infrared entity."""
-    # Uses legacy hass.data[DOMAIN] pattern
-    # pylint: disable-next=hass-use-runtime-data
-    device = hass.data[DOMAIN].devices[config_entry.entry_id]
-    async_add_entities([BroadlinkInfraredEntity(device)])
-
-
-class BroadlinkInfraredEntity(BroadlinkEntity, InfraredEntity):
-    """Broadlink infrared transmitter entity."""
-
-    _attr_has_entity_name = True
-    _attr_translation_key = "infrared_emitter"
-
-    def __init__(self, device: BroadlinkDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(device)
-        self._attr_unique_id = f"{device.unique_id}-emitter"
-
-    async def async_send_command(self, command: InfraredCommand) -> None:
-        """Send an IR command via the Broadlink device."""
-        packet = _timings_to_broadlink_packet(command.get_raw_timings())
-        try:
-            await self._device.async_request(self._device.api.send_data, packet)
-        except (BroadlinkException, OSError) as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="send_command_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err

homeassistant/components/broadlink/radio_frequency.py

@@ -1,132 +0,0 @@
-"""Radio Frequency platform for Broadlink."""
-
-from __future__ import annotations
-
-import logging
-
-from broadlink.exceptions import BroadlinkException
-from rf_protocols import RadioFrequencyCommand
-
-from homeassistant.components.radio_frequency import RadioFrequencyTransmitterEntity
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import DOMAIN
-from .device import BroadlinkDevice
-from .entity import BroadlinkEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-PARALLEL_UPDATES = 0
-
-_TICK_US = 32.84
-
-_RF_433_TYPE_BYTE = 0xB2
-_RF_315_TYPE_BYTE = 0xB4
-
-_RF_433_RANGE = (433_050_000, 434_790_000)
-_RF_315_RANGE = (314_950_000, 315_250_000)
-
-SUPPORTED_FREQUENCY_RANGES: list[tuple[int, int]] = [_RF_433_RANGE, _RF_315_RANGE]
-
-
-def _type_byte_for_frequency(frequency: int) -> int:
-    """Return the Broadlink RF type byte for a given carrier frequency."""
-    if _RF_433_RANGE[0] <= frequency <= _RF_433_RANGE[1]:
-        return _RF_433_TYPE_BYTE
-    if _RF_315_RANGE[0] <= frequency <= _RF_315_RANGE[1]:
-        return _RF_315_TYPE_BYTE
-    raise HomeAssistantError(
-        translation_domain=DOMAIN,
-        translation_key="frequency_not_supported",
-        translation_placeholders={"frequency": f"{frequency / 1_000_000:g}"},
-    )
-
-
-def encode_rf_packet(
-    *,
-    type_byte: int,
-    repeat_count: int,
-    timings_us: list[int],
-) -> bytes:
-    """Encode raw OOK timings as a Broadlink RF pulse-length packet.
-
-    The layout is::
-
-        byte 0           type byte (0xB2 for 433 MHz, 0xB4 for 315 MHz)
-        byte 1           repeat count (additional transmissions after the first)
-        bytes 2..3       payload length (little-endian), counted from byte 4
-        bytes 4..N-1     pulses: 1 byte when ticks < 256, otherwise
-                         0x00 followed by a 2-byte big-endian tick count
-
-    Each pulse is expressed as multiples of 32.84 µs ticks, which is the
-    timing resolution of the Broadlink RF front-end.
-    """
-    buf = bytearray([type_byte, repeat_count, 0, 0])
-    for duration in timings_us:
-        ticks = round(abs(duration) / _TICK_US)
-        div, mod = divmod(ticks, 256)
-        if div:
-            buf.append(0x00)
-            buf.append(div)
-        buf.append(mod)
-    payload_len = len(buf) - 4
-    buf[2] = payload_len & 0xFF
-    buf[3] = (payload_len >> 8) & 0xFF
-    return bytes(buf)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up a Broadlink radio frequency transmitter."""
-    # Uses legacy hass.data[DOMAIN] pattern
-    # pylint: disable-next=hass-use-runtime-data
-    device: BroadlinkDevice = hass.data[DOMAIN].devices[config_entry.entry_id]
-    async_add_entities([BroadlinkRadioFrequency(device)])
-
-
-class BroadlinkRadioFrequency(BroadlinkEntity, RadioFrequencyTransmitterEntity):
-    """Representation of a Broadlink RF transmitter."""
-
-    _attr_has_entity_name = True
-    _attr_name = None
-
-    def __init__(self, device: BroadlinkDevice) -> None:
-        """Initialize the entity."""
-        super().__init__(device)
-        self._attr_unique_id = device.unique_id
-
-    @property
-    def supported_frequency_ranges(self) -> list[tuple[int, int]]:
-        """Return the Broadlink-supported narrow RF bands."""
-        return SUPPORTED_FREQUENCY_RANGES
-
-    async def async_send_command(self, command: RadioFrequencyCommand) -> None:
-        """Encode an OOK command and transmit it via the Broadlink device."""
-        type_byte = _type_byte_for_frequency(command.frequency)
-        packet = encode_rf_packet(
-            type_byte=type_byte,
-            repeat_count=command.repeat_count,
-            timings_us=command.get_raw_timings(),
-        )
-        _LOGGER.debug(
-            "Transmitting RF packet: %d bytes on %d Hz (repeat=%d)",
-            len(packet),
-            command.frequency,
-            command.repeat_count,
-        )
-
-        device = self._device
-        try:
-            await device.async_request(device.api.send_data, packet)
-        except (BroadlinkException, OSError) as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="transmit_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err

homeassistant/components/broadlink/strings.json

@@ -49,11 +49,6 @@
     }
   },
   "entity": {
-    "infrared": {
-      "infrared_emitter": {
-        "name": "IR emitter"
-      }
-    },
     "select": {
       "day_of_week": {
         "name": "Day of week",
@@ -82,16 +77,5 @@
         "name": "Total consumption"
       }
     }
-  },
-  "exceptions": {
-    "frequency_not_supported": {
-      "message": "Broadlink devices cannot transmit on {frequency} MHz"
-    },
-    "send_command_failed": {
-      "message": "Failed to send IR command: {error}"
-    },
-    "transmit_failed": {
-      "message": "Failed to transmit RF command: {error}"
-    }
   }
 }

homeassistant/components/brother/sensor.py

@@ -293,8 +293,9 @@ SENSOR_TYPES: tuple[BrotherSensorEntityDescription, ...] = (
     ),
     BrotherSensorEntityDescription(
         key="uptime",
+        translation_key="last_restart",
         entity_registry_enabled_default=False,
-        device_class=SensorDeviceClass.UPTIME,
+        device_class=SensorDeviceClass.TIMESTAMP,
         entity_category=EntityCategory.DIAGNOSTIC,
         value=lambda data: data.uptime,
     ),

homeassistant/components/brother/strings.json

@@ -151,6 +151,9 @@
       "laser_remaining_life": {
         "name": "Laser remaining lifetime"
       },
+      "last_restart": {
+        "name": "Last restart"
+      },
       "magenta_drum_page_counter": {
         "name": "Magenta drum page counter",
         "unit_of_measurement": "[%key:component::brother::entity::sensor::page_counter::unit_of_measurement%]"

homeassistant/components/bsblan/__init__.py

@@ -13,7 +13,6 @@ from bsblan import (
     Info,
     StaticState,
 )
-from yarl import URL
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -29,16 +28,11 @@ from homeassistant.exceptions import (
     ConfigEntryError,
     ConfigEntryNotReady,
 )
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.device_registry import (
-    CONNECTION_NETWORK_MAC,
-    DeviceInfo,
-    format_mac,
-)
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_HEATING_CIRCUITS, CONF_PASSKEY, DEFAULT_PORT, DOMAIN, LOGGER
+from .const import CONF_PASSKEY, DOMAIN, LOGGER
 from .coordinator import BSBLanFastCoordinator, BSBLanSlowCoordinator
 from .services import async_setup_services
 
@@ -58,35 +52,7 @@ class BSBLanData:
     client: BSBLAN
     device: Device
     info: Info
-    static: dict[int, StaticState | None]
-    available_circuits: list[int]
-
-
-def get_bsblan_device_info(
-    device: Device, info: Info, host: str, port: int
-) -> DeviceInfo:
-    """Build DeviceInfo for the main BSB-LAN controller device."""
-    return DeviceInfo(
-        identifiers={(DOMAIN, device.MAC)},
-        connections={(CONNECTION_NETWORK_MAC, format_mac(device.MAC))},
-        name=device.name,
-        manufacturer="BSBLAN Inc.",
-        model=(
-            info.device_identification.value
-            if info.device_identification and info.device_identification.value
-            else None
-        ),
-        model_id=(
-            f"{info.controller_family.value}_{info.controller_variant.value}"
-            if info.controller_family
-            and info.controller_variant
-            and info.controller_family.value
-            and info.controller_variant.value
-            else None
-        ),
-        sw_version=device.version,
-        configuration_url=str(URL.build(scheme="http", host=host, port=port)),
-    )
+    static: StaticState | None
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -109,17 +75,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
 
     # create BSBLAN client
     session = async_get_clientsession(hass)
-    bsblan = BSBLAN(config=config, session=session)
+    bsblan = BSBLAN(config, session)
 
     try:
         # Initialize the client first - this sets up internal caches and validates
         # the connection by fetching firmware version
         await bsblan.initialize()
 
-        # Read available heating circuits from config entry data
-        # (populated by config flow or migration)
-        circuits: list[int] = entry.data[CONF_HEATING_CIRCUITS]
-
         # Fetch required device metadata in parallel for faster startup
         device, info = await asyncio.gather(
             bsblan.device(),
@@ -148,25 +110,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
             translation_key="setup_general_error",
         ) from err
 
-    # Fetch static values per configured circuit.
-    # BSB-LAN is a serial bus — it processes one parameter at a time,
-    # so concurrent requests offer no speed benefit over sequential.
-    # Static values are optional — some devices may not support them.
-    static_per_circuit: dict[int, StaticState | None] = {}
-    for circuit in circuits:
-        try:
-            static_per_circuit[circuit] = await bsblan.static_values(circuit=circuit)
-        except (BSBLANError, TimeoutError) as err:
-            LOGGER.debug(
-                "Static values not available for %s circuit %d: %s",
-                entry.data[CONF_HOST],
-                circuit,
-                err,
-            )
-            static_per_circuit[circuit] = None
+    try:
+        static = await bsblan.static_values()
+    except (BSBLANError, TimeoutError) as err:
+        LOGGER.debug(
+            "Static values not available for %s: %s",
+            entry.data[CONF_HOST],
+            err,
+        )
+        static = None
 
     # Create coordinators with the already-initialized client
-    fast_coordinator = BSBLanFastCoordinator(hass, entry, bsblan, circuits)
+    fast_coordinator = BSBLanFastCoordinator(hass, entry, bsblan)
     slow_coordinator = BSBLanSlowCoordinator(hass, entry, bsblan)
 
     # Perform first refresh of fast coordinator (required for entities)
@@ -182,25 +137,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
         slow_coordinator=slow_coordinator,
         device=device,
         info=info,
-        static=static_per_circuit,
-        available_circuits=circuits,
-    )
-
-    # Register main device before forwarding platforms, so sub-devices
-    # (heating circuits, water heater) can reference it via via_device
-    device_registry = dr.async_get(hass)
-    port = entry.data.get(CONF_PORT, DEFAULT_PORT)
-    main_device_info = get_bsblan_device_info(device, info, entry.data[CONF_HOST], port)
-    device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        identifiers=main_device_info["identifiers"],
-        connections=main_device_info["connections"],
-        name=main_device_info["name"],
-        manufacturer=main_device_info["manufacturer"],
-        model=main_device_info.get("model"),
-        model_id=main_device_info.get("model_id"),
-        sw_version=main_device_info.get("sw_version"),
-        configuration_url=main_device_info.get("configuration_url"),
+        static=static,
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -211,56 +148,3 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
 async def async_unload_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bool:
     """Unload BSBLAN config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-
-async def async_migrate_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bool:
-    """Migrate old config entries to the latest schema."""
-    LOGGER.debug(
-        "Migrating BSB-LAN entry from version %s.%s",
-        entry.version,
-        entry.minor_version,
-    )
-
-    if entry.version > 1:
-        # Downgraded from a future version; cannot migrate.
-        return False
-
-    # 1.1 -> 1.2: Add CONF_HEATING_CIRCUITS. Attempt to discover available
-    # heating circuits from the device; fall back to [1] (pre-multi-circuit
-    # default) if the device is unreachable or the endpoint is unsupported.
-    if entry.version == 1 and entry.minor_version < 2:
-        circuits: list[int] = [1]
-        config = BSBLANConfig(
-            host=entry.data[CONF_HOST],
-            passkey=entry.data[CONF_PASSKEY],
-            port=entry.data[CONF_PORT],
-            username=entry.data.get(CONF_USERNAME),
-            password=entry.data.get(CONF_PASSWORD),
-        )
-        session = async_get_clientsession(hass)
-        bsblan = BSBLAN(config=config, session=session)
-        try:
-            await bsblan.initialize()
-            circuits = await bsblan.get_available_circuits()
-        except (BSBLANError, TimeoutError) as err:
-            LOGGER.warning(
-                "Circuit discovery during migration failed for %s (%s); "
-                "defaulting to single circuit [1]. Use Reconfigure to "
-                "rediscover additional circuits later",
-                entry.data[CONF_HOST],
-                err,
-            )
-
-        hass.config_entries.async_update_entry(
-            entry,
-            data={**entry.data, CONF_HEATING_CIRCUITS: circuits},
-            minor_version=2,
-        )
-        LOGGER.debug(
-            "Migrated BSB-LAN entry to version %s.%s with circuits %s",
-            entry.version,
-            entry.minor_version,
-            circuits,
-        )
-
-    return True

homeassistant/components/bsblan/climate.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from bsblan import BSBLANError, State, get_hvac_action_category
+from bsblan import BSBLANError, get_hvac_action_category
 
 from homeassistant.components.climate import (
     ATTR_HVAC_MODE,
@@ -24,7 +24,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BSBLanConfigEntry, BSBLanData
 from .const import ATTR_TARGET_TEMPERATURE, DOMAIN
-from .entity import BSBLanCircuitEntity
+from .entity import BSBLanEntity
 
 PARALLEL_UPDATES = 1
 
@@ -63,12 +63,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up BSBLAN device based on a config entry."""
     data = entry.runtime_data
-    async_add_entities(
-        BSBLANClimate(data, circuit) for circuit in data.available_circuits
-    )
+    async_add_entities([BSBLANClimate(data)])
 
 
-class BSBLANClimate(BSBLanCircuitEntity, ClimateEntity):
+class BSBLANClimate(BSBLanEntity, ClimateEntity):
     """Defines a BSBLAN climate device."""
 
     _attr_name = None
@@ -86,50 +84,37 @@ class BSBLANClimate(BSBLanCircuitEntity, ClimateEntity):
     def __init__(
         self,
         data: BSBLanData,
-        circuit: int,
     ) -> None:
         """Initialize BSBLAN climate device."""
-        super().__init__(data.fast_coordinator, data, circuit)
-        self._circuit = circuit
-        mac = format_mac(data.device.MAC)
+        super().__init__(data.fast_coordinator, data)
+        self._attr_unique_id = f"{format_mac(data.device.MAC)}-climate"
 
-        # Backward compatible unique ID: circuit 1 keeps old format
-        if circuit == 1:
-            self._attr_unique_id = f"{mac}-climate"
-        else:
-            self._attr_unique_id = f"{mac}-climate-{circuit}"
-
-        # Set temperature range from per-circuit static data
-        if (static := data.static.get(circuit)) is not None:
+        # Set temperature range if available, otherwise use Home Assistant defaults
+        if (static := data.static) is not None:
             if (min_temp := static.min_temp) is not None and min_temp.value is not None:
                 self._attr_min_temp = min_temp.value
             if (max_temp := static.max_temp) is not None and max_temp.value is not None:
                 self._attr_max_temp = max_temp.value
         self._attr_temperature_unit = data.fast_coordinator.client.get_temperature_unit
 
-    @property
-    def _circuit_state(self) -> State:
-        """Return the state for this circuit."""
-        return self.coordinator.data.states[self._circuit]
-
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
-        if (current_temp := self._circuit_state.current_temperature) is None:
+        if (current_temp := self.coordinator.data.state.current_temperature) is None:
             return None
         return current_temp.value
 
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
-        if (target_temp := self._circuit_state.target_temperature) is None:
+        if (target_temp := self.coordinator.data.state.target_temperature) is None:
             return None
         return target_temp.value
 
     @property
     def _hvac_mode_value(self) -> int | None:
         """Return the raw hvac_mode value from the coordinator."""
-        if (hvac_mode := self._circuit_state.hvac_mode) is None:
+        if (hvac_mode := self.coordinator.data.state.hvac_mode) is None:
             return None
         return hvac_mode.value
 
@@ -143,7 +128,9 @@ class BSBLANClimate(BSBLanCircuitEntity, ClimateEntity):
     @property
     def hvac_action(self) -> HVACAction | None:
         """Return the current running hvac action."""
-        if (action := self._circuit_state.hvac_action) is None or action.value is None:
+        if (
+            action := self.coordinator.data.state.hvac_action
+        ) is None or action.value is None:
             return None
         category = get_hvac_action_category(action.value)
         return HVACAction(category.name.lower())
@@ -183,7 +170,7 @@ class BSBLANClimate(BSBLanCircuitEntity, ClimateEntity):
                 data[ATTR_HVAC_MODE] = 1
 
         try:
-            await self.coordinator.client.thermostat(**data, circuit=self._circuit)
+            await self.coordinator.client.thermostat(**data)
         except BSBLANError as err:
             raise HomeAssistantError(
                 "An error occurred while updating the BSBLAN device",

homeassistant/components/bsblan/config_flow.py

@@ -15,21 +15,19 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_HEATING_CIRCUITS, CONF_PASSKEY, DEFAULT_PORT, DOMAIN, LOGGER
+from .const import CONF_PASSKEY, DEFAULT_PORT, DOMAIN
 
 
 class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a BSBLAN config flow."""
 
     VERSION = 1
-    MINOR_VERSION = 2
 
     def __init__(self) -> None:
         """Initialize BSBLan flow."""
         self.host: str = ""
         self.port: int = DEFAULT_PORT
         self.mac: str | None = None
-        self.circuits: list[int] = [1]
         self.passkey: str | None = None
         self.username: str | None = None
         self.password: str | None = None
@@ -79,7 +77,7 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
             # Try to get device info without authentication to minimize discovery popup
             config = BSBLANConfig(host=self.host, port=self.port)
             session = async_get_clientsession(self.hass)
-            bsblan = BSBLAN(config=config, session=session)
+            bsblan = BSBLAN(config, session)
             try:
                 device = await bsblan.device()
             except BSBLANError:
@@ -125,8 +123,6 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
             )
 
         if not self._auth_required:
-            # Discover available heating circuits
-            await self._discover_circuits()
             return self._async_create_entry()
 
         self.passkey = user_input.get(CONF_PASSKEY)
@@ -141,7 +137,6 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
         """Validate device connection and create entry."""
         try:
             await self._get_bsblan_info()
-            await self._discover_circuits()
         except BSBLANAuthError:
             if is_discovery:
                 return self.async_show_form(
@@ -235,12 +230,9 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
         # it gets the unique ID from the device info when it validates credentials
         self._abort_if_unique_id_mismatch()
 
-        # Rediscover circuits in case hardware changed
-        await self._discover_circuits()
-
         return self.async_update_reload_and_abort(
             existing_entry,
-            data_updates={**user_input, CONF_HEATING_CIRCUITS: self.circuits},
+            data_updates=user_input,
             reason="reconfigure_successful",
         )
 
@@ -324,14 +316,13 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
     def _async_create_entry(self) -> ConfigFlowResult:
         """Create the config entry."""
         return self.async_create_entry(
-            title="BSB-LAN",
+            title=format_mac(self.mac),
             data={
                 CONF_HOST: self.host,
                 CONF_PORT: self.port,
                 CONF_PASSKEY: self.passkey,
                 CONF_USERNAME: self.username,
                 CONF_PASSWORD: self.password,
-                CONF_HEATING_CIRCUITS: self.circuits,
             },
         )
 
@@ -349,7 +340,7 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
             password=self.password,
         )
         session = async_get_clientsession(self.hass)
-        bsblan = BSBLAN(config=config, session=session)
+        bsblan = BSBLAN(config, session)
         device = await bsblan.device()
         retrieved_mac = device.MAC
 
@@ -371,27 +362,3 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
                     CONF_PORT: self.port,
                 }
             )
-
-    async def _discover_circuits(self) -> None:
-        """Discover available heating circuits."""
-        config = BSBLANConfig(
-            host=self.host,
-            passkey=self.passkey,
-            port=self.port,
-            username=self.username,
-            password=self.password,
-        )
-        session = async_get_clientsession(self.hass)
-        bsblan = BSBLAN(config=config, session=session)
-        try:
-            await bsblan.initialize()
-            self.circuits = await bsblan.get_available_circuits()
-        except (
-            BSBLANError,
-            TimeoutError,
-        ):
-            LOGGER.debug(
-                "Circuit discovery not available for %s, defaulting to single circuit",
-                self.host,
-            )
-            self.circuits = [1]

homeassistant/components/bsblan/const.py

@@ -22,6 +22,5 @@ ATTR_INSIDE_TEMPERATURE: Final = "inside_temperature"
 ATTR_OUTSIDE_TEMPERATURE: Final = "outside_temperature"
 
 CONF_PASSKEY: Final = "passkey"
-CONF_HEATING_CIRCUITS: Final = "heating_circuits"
 
 DEFAULT_PORT: Final = 80

homeassistant/components/bsblan/coordinator.py

@@ -49,7 +49,7 @@ DHW_CONFIG_INCLUDE = ["reduced_setpoint", "nominal_setpoint_max"]
 class BSBLanFastData:
     """BSBLan fast-polling data."""
 
-    states: dict[int, State]
+    state: State
     sensor: Sensor
     dhw: HotWaterState | None = None
 
@@ -94,7 +94,6 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
         hass: HomeAssistant,
         config_entry: BSBLanConfigEntry,
         client: BSBLAN,
-        circuits: list[int],
     ) -> None:
         """Initialize the BSB-LAN fast coordinator."""
         super().__init__(
@@ -104,19 +103,14 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
             name=f"{DOMAIN}_fast_{config_entry.data[CONF_HOST]}",
             update_interval=SCAN_INTERVAL_FAST,
         )
-        self.circuits: list[int] = circuits
 
     async def _async_update_data(self) -> BSBLanFastData:
         """Fetch fast-changing data from the BSB-LAN device."""
-        states: dict[int, State] = {}
         try:
-            # Use include filtering to only fetch parameters we actually use.
-            # BSB-LAN is a serial bus — it processes one parameter at a time,
-            # so concurrent requests offer no speed benefit over sequential.
-            for circuit in self.circuits:
-                states[circuit] = await self.client.state(
-                    include=STATE_INCLUDE, circuit=circuit
-                )
+            # Client is already initialized in async_setup_entry
+            # Use include filtering to only fetch parameters we actually use
+            # This reduces response time significantly (~0.2s per parameter)
+            state = await self.client.state(include=STATE_INCLUDE)
             sensor = await self.client.sensor(include=SENSOR_INCLUDE)
 
         except BSBLANAuthError as err:
@@ -146,7 +140,7 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
             )
 
         return BSBLanFastData(
-            states=states,
+            state=state,
             sensor=sensor,
             dhw=dhw,
         )

homeassistant/components/bsblan/diagnostics.py

@@ -20,20 +20,13 @@ async def async_get_config_entry_diagnostics(
         "info": data.info.model_dump(),
         "device": data.device.model_dump(),
         "fast_coordinator_data": {
-            "states": {
-                str(circuit): state.model_dump()
-                for circuit, state in data.fast_coordinator.data.states.items()
-            },
+            "state": data.fast_coordinator.data.state.model_dump(),
             "sensor": data.fast_coordinator.data.sensor.model_dump(),
             "dhw": data.fast_coordinator.data.dhw.model_dump()
             if data.fast_coordinator.data.dhw
             else None,
         },
-        "static": {
-            str(circuit): static.model_dump() if static is not None else None
-            for circuit, static in data.static.items()
-        },
-        "available_circuits": data.available_circuits,
+        "static": data.static.model_dump() if data.static is not None else None,
     }
 
     # Add DHW config and schedule from slow coordinator if available

homeassistant/components/bsblan/entity.py

@@ -2,11 +2,17 @@
 
 from __future__ import annotations
 
+from yarl import URL
+
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import (
+    CONNECTION_NETWORK_MAC,
+    DeviceInfo,
+    format_mac,
+)
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import BSBLanData, get_bsblan_device_info
+from . import BSBLanData
 from .const import DEFAULT_PORT, DOMAIN
 from .coordinator import BSBLanCoordinator, BSBLanFastCoordinator, BSBLanSlowCoordinator
 
@@ -21,8 +27,28 @@ class BSBLanEntityBase[_T: BSBLanCoordinator](CoordinatorEntity[_T]):
         super().__init__(coordinator)
         host = coordinator.config_entry.data[CONF_HOST]
         port = coordinator.config_entry.data.get(CONF_PORT, DEFAULT_PORT)
-        self._attr_device_info = get_bsblan_device_info(
-            data.device, data.info, host, port
+        mac = data.device.MAC
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, mac)},
+            connections={(CONNECTION_NETWORK_MAC, format_mac(mac))},
+            name=data.device.name,
+            manufacturer="BSBLAN Inc.",
+            model=(
+                data.info.device_identification.value
+                if data.info.device_identification
+                and data.info.device_identification.value
+                else None
+            ),
+            model_id=(
+                f"{data.info.controller_family.value}_{data.info.controller_variant.value}"
+                if data.info.controller_family
+                and data.info.controller_variant
+                and data.info.controller_family.value
+                and data.info.controller_variant.value
+                else None
+            ),
+            sw_version=data.device.version,
+            configuration_url=str(URL.build(scheme="http", host=host, port=port)),
         )
 
 
@@ -34,32 +60,6 @@ class BSBLanEntity(BSBLanEntityBase[BSBLanFastCoordinator]):
         super().__init__(coordinator, data)
 
 
-class BSBLanCircuitEntity(BSBLanEntity):
-    """BSBLan entity belonging to a heating circuit sub-device."""
-
-    def __init__(
-        self,
-        coordinator: BSBLanFastCoordinator,
-        data: BSBLanData,
-        circuit: int,
-    ) -> None:
-        """Initialize BSBLan circuit entity with sub-device info."""
-        super().__init__(coordinator, data)
-        mac = data.device.MAC
-        host = coordinator.config_entry.data[CONF_HOST]
-        port = coordinator.config_entry.data.get(CONF_PORT, DEFAULT_PORT)
-        main_info = get_bsblan_device_info(data.device, data.info, host, port)
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{mac}-circuit-{circuit}")},
-            translation_key="heating_circuit",
-            translation_placeholders={"circuit": str(circuit)},
-            via_device=(DOMAIN, mac),
-            manufacturer=main_info["manufacturer"],
-            model=main_info.get("model"),
-            model_id=main_info.get("model_id"),
-        )
-
-
 class BSBLanDualCoordinatorEntity(BSBLanEntity):
     """Entity that listens to both fast and slow coordinators."""
 
@@ -80,28 +80,3 @@ class BSBLanDualCoordinatorEntity(BSBLanEntity):
         self.async_on_remove(
             self.slow_coordinator.async_add_listener(self._handle_coordinator_update)
         )
-
-
-class BSBLanWaterHeaterDeviceEntity(BSBLanDualCoordinatorEntity):
-    """BSBLan entity belonging to the water heater sub-device."""
-
-    def __init__(
-        self,
-        fast_coordinator: BSBLanFastCoordinator,
-        slow_coordinator: BSBLanSlowCoordinator,
-        data: BSBLanData,
-    ) -> None:
-        """Initialize BSBLan water heater sub-device entity."""
-        super().__init__(fast_coordinator, slow_coordinator, data)
-        mac = data.device.MAC
-        host = fast_coordinator.config_entry.data[CONF_HOST]
-        port = fast_coordinator.config_entry.data.get(CONF_PORT, DEFAULT_PORT)
-        main_info = get_bsblan_device_info(data.device, data.info, host, port)
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{mac}-water-heater")},
-            translation_key="water_heater",
-            via_device=(DOMAIN, mac),
-            manufacturer=main_info["manufacturer"],
-            model=main_info.get("model"),
-            model_id=main_info.get("model_id"),
-        )

homeassistant/components/bsblan/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
   "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.2.0"],
+  "requirements": ["python-bsblan==5.1.4"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/bsblan/quality_scale.yaml

@@ -48,10 +48,13 @@ rules:
   dynamic-devices:
     status: exempt
     comment: |
-      Devices and sub-devices are determined at config entry setup and do not change at runtime.
+      This integration has a fixed single device.
   entity-category: done
   entity-device-class: done
-  entity-disabled-by-default: done
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      This integration provides a limited number of entities, all of which are useful to users.
   entity-translations: done
   exception-translations: done
   icon-translations: todo
@@ -63,7 +66,7 @@ rules:
   stale-devices:
     status: exempt
     comment: |
-      Devices and sub-devices are determined at config entry setup and do not change at runtime.
+      This integration has a fixed single device.
 
   # Platinum
   async-dependency: done

homeassistant/components/bsblan/strings.json

@@ -79,14 +79,6 @@
       }
     }
   },
-  "device": {
-    "heating_circuit": {
-      "name": "Heating circuit {circuit}"
-    },
-    "water_heater": {
-      "name": "Water heater"
-    }
-  },
   "entity": {
     "button": {
       "sync_time": {

homeassistant/components/bsblan/water_heater.py

@@ -21,7 +21,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BSBLanConfigEntry, BSBLanData
 from .const import DOMAIN
-from .entity import BSBLanWaterHeaterDeviceEntity
+from .entity import BSBLanDualCoordinatorEntity
 
 PARALLEL_UPDATES = 1
 
@@ -61,7 +61,7 @@ async def async_setup_entry(
     async_add_entities([BSBLANWaterHeater(data)])
 
 
-class BSBLANWaterHeater(BSBLanWaterHeaterDeviceEntity, WaterHeaterEntity):
+class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
     """Defines a BSBLAN water heater entity."""
 
     _attr_name = None

homeassistant/components/calendar/__init__.py

@@ -15,10 +15,7 @@ from aiohttp import web
 from dateutil.rrule import rrulestr
 import voluptuous as vol
 
-from homeassistant.auth.models import User
-from homeassistant.auth.permissions.const import POLICY_CONTROL, POLICY_READ
 from homeassistant.components import frontend, http, websocket_api
-from homeassistant.components.http import KEY_HASS_USER
 from homeassistant.components.websocket_api import (
     ERR_INVALID_FORMAT,
     ERR_NOT_FOUND,
@@ -35,7 +32,7 @@ from homeassistant.core import (
     SupportsResponse,
     callback,
 )
-from homeassistant.exceptions import HomeAssistantError, Unauthorized
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.entity import Entity, EntityDescription
@@ -789,10 +786,6 @@ class CalendarEventView(http.HomeAssistantView):
 
     async def get(self, request: web.Request, entity_id: str) -> web.Response:
         """Return calendar events."""
-        user: User = request[KEY_HASS_USER]
-        if not user.permissions.check_entity(entity_id, POLICY_READ):
-            raise Unauthorized(entity_id=entity_id)
-
         if not (entity := self.component.get_entity(entity_id)) or not isinstance(
             entity, CalendarEntity
         ):
@@ -844,14 +837,10 @@ class CalendarListView(http.HomeAssistantView):
 
     async def get(self, request: web.Request) -> web.Response:
         """Retrieve calendar list."""
-        user: User = request[KEY_HASS_USER]
         hass = request.app[http.KEY_HASS]
-        entity_perm = user.permissions.check_entity
         calendar_list: list[dict[str, str]] = []
 
         for entity in self.component.entities:
-            if not entity_perm(entity.entity_id, POLICY_READ):
-                continue
             state = hass.states.get(entity.entity_id)
             assert state
             calendar_list.append({"name": state.name, "entity_id": entity.entity_id})
@@ -871,9 +860,6 @@ async def handle_calendar_event_create(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle creation of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
-
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
         return
@@ -913,8 +899,6 @@ async def handle_calendar_event_delete(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle delete of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
 
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
@@ -960,10 +944,7 @@ async def handle_calendar_event_delete(
 async def handle_calendar_event_update(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
-    """Handle update of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
-
+    """Handle creation of a calendar event."""
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
         return
@@ -1008,9 +989,6 @@ async def handle_calendar_event_subscribe(
     """Subscribe to calendar event updates."""
     entity_id: str = msg["entity_id"]
 
-    if not connection.user.permissions.check_entity(entity_id, POLICY_READ):
-        raise Unauthorized(entity_id=entity_id)
-
     if not (entity := hass.data[DATA_COMPONENT].get_entity(entity_id)):
         connection.send_error(
             msg["id"],

homeassistant/components/calendar/conditions.yaml

@@ -7,8 +7,11 @@ is_event_active:
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: condition
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
     for:
       required: true
       default: 00:00:00

homeassistant/components/calendar/strings.json

@@ -64,6 +64,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/camera/__init__.py

@@ -926,7 +926,6 @@ async def websocket_get_prefs(
         vol.Optional(PREF_ORIENTATION): vol.Coerce(Orientation),
     }
 )
-@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_update_prefs(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]

homeassistant/components/climate/conditions.yaml

@@ -7,8 +7,11 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: condition
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
 
 .humidity_threshold_entity: &humidity_threshold_entity
   - domain: input_number

homeassistant/components/climate/strings.json

@@ -271,6 +271,21 @@
       "message": "Provided temperature {check_temp} is not valid. Accepted range is {min_temp} to {max_temp}."
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "set_fan_mode": {
       "description": "Sets the fan mode of a thermostat.",

homeassistant/components/climate/triggers.yaml

@@ -7,8 +7,12 @@
       required: true
       default: any
       selector:
-        automation_behavior:
-          mode: trigger
+        select:
+          translation_key: trigger_behavior
+          options:
+            - first
+            - last
+            - any
     for: &trigger_for
       required: true
       default: 00:00:00