Bump version to 2025.4.0b15

Translation key for device disconnected

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
 name: Report an issue with Home Assistant Core
 description: Report an issue with Home Assistant Core.
-type: Bug
 body:
   - type: markdown
     attributes:

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 12
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 9
-  HA_SHORT_VERSION: "2025.5"
+  HA_SHORT_VERSION: "2025.4"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -653,7 +653,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Dependency review
-        uses: actions/dependency-review-action@v4.6.0
+        uses: actions/dependency-review-action@v4.5.0
         with:
           license-check: false # We use our own license audit checks
 
@@ -1317,7 +1317,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1459,7 +1459,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql.yml

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

.strict-typing

@@ -291,7 +291,6 @@ homeassistant.components.kaleidescape.*
 homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
-homeassistant.components.kulersky.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -365,7 +364,6 @@ homeassistant.components.notify.*
 homeassistant.components.notion.*
 homeassistant.components.number.*
 homeassistant.components.nut.*
-homeassistant.components.ohme.*
 homeassistant.components.onboarding.*
 homeassistant.components.oncue.*
 homeassistant.components.onedrive.*

CODEOWNERS

@@ -432,7 +432,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
-/homeassistant/components/ephember/ @ttroy50 @roberty99
+/homeassistant/components/ephember/ @ttroy50
 /homeassistant/components/epic_games_store/ @hacf-fr @Quentame
 /tests/components/epic_games_store/ @hacf-fr @Quentame
 /homeassistant/components/epion/ @lhgravendeel
@@ -704,8 +704,6 @@ build.json @home-assistant/supervisor
 /tests/components/image_upload/ @home-assistant/core
 /homeassistant/components/imap/ @jbouwh
 /tests/components/imap/ @jbouwh
-/homeassistant/components/imeon_inverter/ @Imeon-Energy
-/tests/components/imeon_inverter/ @Imeon-Energy
 /homeassistant/components/imgw_pib/ @bieniu
 /tests/components/imgw_pib/ @bieniu
 /homeassistant/components/improv_ble/ @emontnemery
@@ -937,8 +935,6 @@ build.json @home-assistant/supervisor
 /tests/components/metoffice/ @MrHarcombe @avee87
 /homeassistant/components/microbees/ @microBeesTech
 /tests/components/microbees/ @microBeesTech
-/homeassistant/components/miele/ @astrandb
-/tests/components/miele/ @astrandb
 /homeassistant/components/mikrotik/ @engrbm87
 /tests/components/mikrotik/ @engrbm87
 /homeassistant/components/mill/ @danielhiversen
@@ -1391,6 +1387,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/siren/ @home-assistant/core @raman325
 /tests/components/siren/ @home-assistant/core @raman325
 /homeassistant/components/sisyphus/ @jkeljo
+/homeassistant/components/sky_hub/ @rogerselwyn
 /homeassistant/components/sky_remote/ @dunnmj @saty9
 /tests/components/sky_remote/ @dunnmj @saty9
 /homeassistant/components/skybell/ @tkdrob

homeassistant/bootstrap.py

@@ -53,7 +53,6 @@ from .components import (
     logbook as logbook_pre_import,  # noqa: F401
     lovelace as lovelace_pre_import,  # noqa: F401
     onboarding as onboarding_pre_import,  # noqa: F401
-    person as person_pre_import,  # noqa: F401
     recorder as recorder_import,  # noqa: F401 - not named pre_import since it has requirements
     repairs as repairs_pre_import,  # noqa: F401
     search as search_pre_import,  # noqa: F401
@@ -860,14 +859,8 @@ async def _async_set_up_integrations(
     integrations, all_integrations = await _async_resolve_domains_and_preload(
         hass, config
     )
-    # Detect all cycles
-    integrations_after_dependencies = (
-        await loader.resolve_integrations_after_dependencies(
-            hass, all_integrations.values(), set(all_integrations)
-        )
-    )
-    all_domains = set(integrations_after_dependencies)
-    domains = set(integrations) & all_domains
+    all_domains = set(all_integrations)
+    domains = set(integrations)
 
     _LOGGER.info(
         "Domains to be set up: %s | %s",
@@ -875,8 +868,6 @@ async def _async_set_up_integrations(
         all_domains - domains,
     )
 
-    async_set_domains_to_be_loaded(hass, all_domains)
-
     # Initialize recorder
     if "recorder" in all_domains:
         recorder.async_initialize_recorder(hass)
@@ -909,12 +900,24 @@ async def _async_set_up_integrations(
         stage_dep_domains_unfiltered = {
             dep
             for domain in stage_domains
-            for dep in integrations_after_dependencies[domain]
+            for dep in all_integrations[domain].all_dependencies
             if dep not in stage_domains
         }
         stage_dep_domains = stage_dep_domains_unfiltered - hass.config.components
 
         stage_all_domains = stage_domains | stage_dep_domains
+        stage_all_integrations = {
+            domain: all_integrations[domain] for domain in stage_all_domains
+        }
+        # Detect all cycles
+        stage_integrations_after_dependencies = (
+            await loader.resolve_integrations_after_dependencies(
+                hass, stage_all_integrations.values(), stage_all_domains
+            )
+        )
+        stage_all_domains = set(stage_integrations_after_dependencies)
+        stage_domains &= stage_all_domains
+        stage_dep_domains &= stage_all_domains
 
         _LOGGER.info(
             "Setting up stage %s: %s | %s\nDependencies: %s | %s",
@@ -925,6 +928,8 @@ async def _async_set_up_integrations(
             stage_dep_domains_unfiltered - stage_dep_domains,
         )
 
+        async_set_domains_to_be_loaded(hass, stage_all_domains)
+
         if timeout is None:
             await _async_setup_multi_components(hass, stage_all_domains, config)
             continue

homeassistant/components/accuweather/strings.json

@@ -72,10 +72,10 @@
           "level": {
             "name": "Level",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "High",
+              "low": "Low",
               "moderate": "Moderate",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "Very high"
             }
           }
         }
@@ -89,10 +89,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -123,10 +123,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -167,10 +167,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -181,10 +181,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -195,10 +195,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }

homeassistant/components/airgradient/strings.json

@@ -68,8 +68,8 @@
       "led_bar_mode": {
         "name": "LED bar mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "Off",
+          "co2": "Carbon dioxide",
           "pm": "Particulate matter"
         }
       },
@@ -143,8 +143,8 @@
       "led_bar_mode": {
         "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "[%key:component::airgradient::entity::select::led_bar_mode::state::off%]",
+          "co2": "[%key:component::airgradient::entity::select::led_bar_mode::state::co2%]",
           "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
         }
       },

homeassistant/components/airvisual/strings.json

@@ -16,8 +16,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
-          "state": "State",
-          "country": "[%key:common::config_flow::data::country%]"
+          "country": "Country",
+          "state": "State"
         }
       },
       "reauth_confirm": {
@@ -56,12 +56,12 @@
     "sensor": {
       "pollutant_label": {
         "state": {
-          "co": "[%key:component::sensor::entity_component::carbon_monoxide::name%]",
-          "n2": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]",
-          "o3": "[%key:component::sensor::entity_component::ozone::name%]",
-          "p1": "[%key:component::sensor::entity_component::pm10::name%]",
-          "p2": "[%key:component::sensor::entity_component::pm25::name%]",
-          "s2": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
+          "co": "Carbon monoxide",
+          "n2": "Nitrogen dioxide",
+          "o3": "Ozone",
+          "p1": "PM10",
+          "p2": "PM2.5",
+          "s2": "Sulfur dioxide"
         }
       },
       "pollutant_level": {

homeassistant/components/airzone/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.0"]
+  "requirements": ["aioairzone==0.9.9"]
 }

homeassistant/components/airzone/sensor.py

@@ -9,8 +9,6 @@ from aioairzone.const import (
     AZD_HUMIDITY,
     AZD_TEMP,
     AZD_TEMP_UNIT,
-    AZD_THERMOSTAT_BATTERY,
-    AZD_THERMOSTAT_SIGNAL,
     AZD_WEBSERVER,
     AZD_WIFI_RSSI,
     AZD_ZONES,
@@ -75,20 +73,6 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    SensorEntityDescription(
-        device_class=SensorDeviceClass.BATTERY,
-        key=AZD_THERMOSTAT_BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SensorEntityDescription(
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        key=AZD_THERMOSTAT_SIGNAL,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="thermostat_signal",
-    ),
 )
 
 

homeassistant/components/airzone/strings.json

@@ -76,9 +76,6 @@
     "sensor": {
       "rssi": {
         "name": "RSSI"
-      },
-      "thermostat_signal": {
-        "name": "Signal strength"
       }
     }
   }

homeassistant/components/airzone_cloud/strings.json

@@ -32,9 +32,9 @@
       "air_quality": {
         "name": "Air Quality mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]",
-          "auto": "[%key:common::state::auto%]"
+          "off": "Off",
+          "on": "On",
+          "auto": "Auto"
         }
       },
       "modes": {

homeassistant/components/amazon_polly/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],
   "quality_scale": "legacy",
-  "requirements": ["boto3==1.37.1"]
+  "requirements": ["boto3==1.34.131"]
 }

homeassistant/components/android_ip_webcam/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
   "iot_class": "local_polling",
-  "requirements": ["pydroid-ipcam==3.0.0"]
+  "requirements": ["pydroid-ipcam==2.0.0"]
 }

homeassistant/components/androidtv_remote/entity.py

@@ -73,7 +73,7 @@ class AndroidTVRemoteBaseEntity(Entity):
             self._api.send_key_command(key_code, direction)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc
 
     def _send_launch_app_command(self, app_link: str) -> None:
@@ -85,5 +85,5 @@ class AndroidTVRemoteBaseEntity(Entity):
             self._api.send_launch_app_command(app_link)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc

homeassistant/components/androidtv_remote/media_player.py

@@ -21,7 +21,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AndroidTVRemoteConfigEntry
-from .const import CONF_APP_ICON, CONF_APP_NAME, DOMAIN
+from .const import CONF_APP_ICON, CONF_APP_NAME
 from .entity import AndroidTVRemoteBaseEntity
 
 PARALLEL_UPDATES = 0
@@ -233,5 +233,5 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
                 await asyncio.sleep(delay_secs)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc

homeassistant/components/androidtv_remote/strings.json

@@ -54,10 +54,5 @@
         }
       }
     }
-  },
-  "exceptions": {
-    "connection_closed": {
-      "message": "Connection to the Android TV device is closed"
-    }
   }
 }

homeassistant/components/anthropic/config_flow.py

@@ -52,7 +52,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
 
 RECOMMENDED_OPTIONS = {
     CONF_RECOMMENDED: True,
-    CONF_LLM_HASS_API: [llm.LLM_API_ASSIST],
+    CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
     CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
 }
 
@@ -134,8 +134,9 @@ class AnthropicOptionsFlow(OptionsFlow):
 
         if user_input is not None:
             if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
-                if not user_input.get(CONF_LLM_HASS_API):
-                    user_input.pop(CONF_LLM_HASS_API, None)
+                if user_input[CONF_LLM_HASS_API] == "none":
+                    user_input.pop(CONF_LLM_HASS_API)
+
                 if user_input.get(
                     CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET
                 ) >= user_input.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS):
@@ -150,16 +151,12 @@ class AnthropicOptionsFlow(OptionsFlow):
                 options = {
                     CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
                     CONF_PROMPT: user_input[CONF_PROMPT],
-                    CONF_LLM_HASS_API: user_input.get(CONF_LLM_HASS_API),
+                    CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
                 }
 
         suggested_values = options.copy()
         if not suggested_values.get(CONF_PROMPT):
             suggested_values[CONF_PROMPT] = llm.DEFAULT_INSTRUCTIONS_PROMPT
-        if (
-            suggested_llm_apis := suggested_values.get(CONF_LLM_HASS_API)
-        ) and isinstance(suggested_llm_apis, str):
-            suggested_values[CONF_LLM_HASS_API] = [suggested_llm_apis]
 
         schema = self.add_suggested_values_to_schema(
             vol.Schema(anthropic_config_option_schema(self.hass, options)),
@@ -179,18 +176,24 @@ def anthropic_config_option_schema(
 ) -> dict:
     """Return a schema for Anthropic completion options."""
     hass_apis: list[SelectOptionDict] = [
+        SelectOptionDict(
+            label="No control",
+            value="none",
+        )
+    ]
+    hass_apis.extend(
         SelectOptionDict(
             label=api.name,
             value=api.id,
         )
         for api in llm.async_get_apis(hass)
-    ]
+    )
 
     schema = {
         vol.Optional(CONF_PROMPT): TemplateSelector(),
-        vol.Optional(
-            CONF_LLM_HASS_API,
-        ): SelectSelector(SelectSelectorConfig(options=hass_apis, multiple=True)),
+        vol.Optional(CONF_LLM_HASS_API, default="none"): SelectSelector(
+            SelectSelectorConfig(options=hass_apis)
+        ),
         vol.Required(
             CONF_RECOMMENDED, default=options.get(CONF_RECOMMENDED, False)
         ): bool,

homeassistant/components/anthropic/conversation.py

@@ -266,7 +266,7 @@ async def _transform_stream(
                 raise ValueError("Unexpected stop event without a current block")
             if current_block["type"] == "tool_use":
                 tool_block = cast(ToolUseBlockParam, current_block)
-                tool_args = json.loads(current_tool_args) if current_tool_args else {}
+                tool_args = json.loads(current_tool_args)
                 tool_block["input"] = tool_args
                 yield {
                     "tool_calls": [

homeassistant/components/apcupsd/binary_sensor.py

@@ -53,8 +53,10 @@ class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
         """Initialize the APCUPSd binary device."""
         super().__init__(coordinator, context=description.key.upper())
 
+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
         self._attr_device_info = coordinator.device_info
 
     @property

homeassistant/components/apcupsd/coordinator.py

@@ -85,16 +85,11 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
         self._host = host
         self._port = port
 
-    @property
-    def unique_device_id(self) -> str:
-        """Return a unique ID of the device, which is the serial number (if available) or the config entry ID."""
-        return self.data.serial_no or self.config_entry.entry_id
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return the DeviceInfo of this APC UPS, if serial number is available."""
         return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_device_id)},
+            identifiers={(DOMAIN, self.data.serial_no or self.config_entry.entry_id)},
             model=self.data.model,
             manufacturer="APC",
             name=self.data.name or "APC UPS",

homeassistant/components/apcupsd/sensor.py

@@ -458,8 +458,11 @@ class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
         """Initialize the sensor."""
         super().__init__(coordinator=coordinator, context=description.key.upper())
 
+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
+
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
         self._attr_device_info = coordinator.device_info
 
         # Initial update of attributes.

homeassistant/components/apple_tv/config_flow.py

@@ -20,7 +20,6 @@ import voluptuous as vol
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
     SOURCE_IGNORE,
-    SOURCE_REAUTH,
     SOURCE_ZEROCONF,
     ConfigEntry,
     ConfigFlow,
@@ -382,9 +381,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_IDENTIFIERS: list(combined_identifiers),
                     },
                 )
-                # Don't reload ignored entries or in the middle of reauth,
-                # e.g. if the user is entering a new PIN
-                if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
+                if entry.source != SOURCE_IGNORE:
                     self.hass.config_entries.async_schedule_reload(entry.entry_id)
             if not allow_exist:
                 raise DeviceAlreadyConfigured

homeassistant/components/apple_tv/media_player.py

@@ -120,7 +120,6 @@ class AppleTvMediaPlayer(
         """Initialize the Apple TV media player."""
         super().__init__(name, identifier, manager)
         self._playing: Playing | None = None
-        self._playing_last_updated: datetime | None = None
         self._app_list: dict[str, str] = {}
 
     @callback
@@ -210,7 +209,6 @@ class AppleTvMediaPlayer(
         This is a callback function from pyatv.interface.PushListener.
         """
         self._playing = playstatus
-        self._playing_last_updated = dt_util.utcnow()
         self.async_write_ha_state()
 
     @callback
@@ -318,7 +316,7 @@ class AppleTvMediaPlayer(
     def media_position_updated_at(self) -> datetime | None:
         """Last valid time of media position."""
         if self.state in {MediaPlayerState.PLAYING, MediaPlayerState.PAUSED}:
-            return self._playing_last_updated
+            return dt_util.utcnow()
         return None
 
     async def async_play_media(

homeassistant/components/apsystems/coordinator.py

@@ -43,7 +43,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
 
     config_entry: ApSystemsConfigEntry
     device_version: str
-    battery_system: bool
 
     def __init__(
         self,
@@ -69,7 +68,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
         self.api.max_power = device_info.maxPower
         self.api.min_power = device_info.minPower
         self.device_version = device_info.devVer
-        self.battery_system = device_info.isBatterySystem
 
     async def _async_update_data(self) -> ApSystemsSensorData:
         try:

homeassistant/components/apsystems/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/apsystems",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["apsystems-ez1==2.5.0"]
+  "requirements": ["apsystems-ez1==2.4.0"]
 }

homeassistant/components/apsystems/switch.py

@@ -36,8 +36,6 @@ class ApSystemsInverterSwitch(ApSystemsEntity, SwitchEntity):
         super().__init__(data)
         self._api = data.coordinator.api
         self._attr_unique_id = f"{data.device_id}_inverter_status"
-        if data.coordinator.battery_system:
-            self._attr_available = False
 
     async def async_update(self) -> None:
         """Update switch status and availability."""

homeassistant/components/aquacell/strings.json

@@ -36,9 +36,9 @@
       "wi_fi_strength": {
         "name": "Wi-Fi strength",
         "state": {
-          "low": "[%key:common::state::low%]",
-          "medium": "[%key:common::state::medium%]",
-          "high": "[%key:common::state::high%]"
+          "low": "Low",
+          "medium": "Medium",
+          "high": "High"
         }
       }
     }

homeassistant/components/aranet/strings.json

@@ -26,7 +26,7 @@
     "sensor": {
       "threshold": {
         "state": {
-          "error": "[%key:common::state::error%]",
+          "error": "Error",
           "green": "Green",
           "yellow": "Yellow",
           "red": "Red"

homeassistant/components/aws/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiobotocore", "botocore"],
   "quality_scale": "legacy",
-  "requirements": ["aiobotocore==2.21.1", "botocore==1.37.1"]
+  "requirements": ["aiobotocore==2.13.1", "botocore==1.34.131"]
 }

homeassistant/components/backup/onboarding.py

@@ -1,136 +0,0 @@
-"""Backup onboarding views."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from functools import wraps
-from http import HTTPStatus
-from typing import TYPE_CHECKING, Any, Concatenate
-
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPUnauthorized
-import voluptuous as vol
-
-from homeassistant.components.http import KEY_HASS
-from homeassistant.components.http.data_validator import RequestDataValidator
-from homeassistant.components.onboarding import (
-    BaseOnboardingView,
-    NoAuthBaseOnboardingView,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.backup import async_get_manager as async_get_backup_manager
-
-from . import BackupManager, Folder, IncorrectPasswordError, http as backup_http
-
-if TYPE_CHECKING:
-    from homeassistant.components.onboarding import OnboardingStoreData
-
-
-async def async_setup_views(hass: HomeAssistant, data: OnboardingStoreData) -> None:
-    """Set up the backup views."""
-
-    hass.http.register_view(BackupInfoView(data))
-    hass.http.register_view(RestoreBackupView(data))
-    hass.http.register_view(UploadBackupView(data))
-
-
-def with_backup_manager[_ViewT: BaseOnboardingView, **_P](
-    func: Callable[
-        Concatenate[_ViewT, BackupManager, web.Request, _P],
-        Coroutine[Any, Any, web.Response],
-    ],
-) -> Callable[Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]]:
-    """Home Assistant API decorator to check onboarding and inject manager."""
-
-    @wraps(func)
-    async def with_backup(
-        self: _ViewT,
-        request: web.Request,
-        *args: _P.args,
-        **kwargs: _P.kwargs,
-    ) -> web.Response:
-        """Check admin and call function."""
-        if self._data["done"]:
-            raise HTTPUnauthorized
-
-        manager = await async_get_backup_manager(request.app[KEY_HASS])
-        return await func(self, manager, request, *args, **kwargs)
-
-    return with_backup
-
-
-class BackupInfoView(NoAuthBaseOnboardingView):
-    """Get backup info view."""
-
-    url = "/api/onboarding/backup/info"
-    name = "api:onboarding:backup:info"
-
-    @with_backup_manager
-    async def get(self, manager: BackupManager, request: web.Request) -> web.Response:
-        """Return backup info."""
-        backups, _ = await manager.async_get_backups()
-        return self.json(
-            {
-                "backups": list(backups.values()),
-                "state": manager.state,
-                "last_action_event": manager.last_action_event,
-            }
-        )
-
-
-class RestoreBackupView(NoAuthBaseOnboardingView):
-    """Restore backup view."""
-
-    url = "/api/onboarding/backup/restore"
-    name = "api:onboarding:backup:restore"
-
-    @RequestDataValidator(
-        vol.Schema(
-            {
-                vol.Required("backup_id"): str,
-                vol.Required("agent_id"): str,
-                vol.Optional("password"): str,
-                vol.Optional("restore_addons"): [str],
-                vol.Optional("restore_database", default=True): bool,
-                vol.Optional("restore_folders"): [vol.Coerce(Folder)],
-            }
-        )
-    )
-    @with_backup_manager
-    async def post(
-        self, manager: BackupManager, request: web.Request, data: dict[str, Any]
-    ) -> web.Response:
-        """Restore a backup."""
-        try:
-            await manager.async_restore_backup(
-                data["backup_id"],
-                agent_id=data["agent_id"],
-                password=data.get("password"),
-                restore_addons=data.get("restore_addons"),
-                restore_database=data["restore_database"],
-                restore_folders=data.get("restore_folders"),
-                restore_homeassistant=True,
-            )
-        except IncorrectPasswordError:
-            return self.json(
-                {"code": "incorrect_password"}, status_code=HTTPStatus.BAD_REQUEST
-            )
-        except HomeAssistantError as err:
-            return self.json(
-                {"code": "restore_failed", "message": str(err)},
-                status_code=HTTPStatus.BAD_REQUEST,
-            )
-        return web.Response(status=HTTPStatus.OK)
-
-
-class UploadBackupView(NoAuthBaseOnboardingView, backup_http.UploadBackupView):
-    """Upload backup view."""
-
-    url = "/api/onboarding/backup/upload"
-    name = "api:onboarding:backup:upload"
-
-    @with_backup_manager
-    async def post(self, manager: BackupManager, request: web.Request) -> web.Response:
-        """Upload a backup file."""
-        return await self._post(request)

homeassistant/components/backup/strings.json

@@ -26,9 +26,9 @@
   "entity": {
     "sensor": {
       "backup_manager_state": {
-        "name": "Backup Manager state",
+        "name": "Backup Manager State",
         "state": {
-          "idle": "[%key:common::state::idle%]",
+          "idle": "Idle",
           "create_backup": "Creating a backup",
           "receive_backup": "Receiving a backup",
           "restore_backup": "Restoring a backup"

homeassistant/components/baf/strings.json

@@ -31,7 +31,7 @@
         "state_attributes": {
           "preset_mode": {
             "state": {
-              "auto": "[%key:common::state::auto%]"
+              "auto": "[%key:component::climate::entity_component::_::state_attributes::fan_mode::state::auto%]"
             }
           }
         }

homeassistant/components/balay/__init__.py

@@ -1 +0,0 @@
-"""Balay virtual integration."""

homeassistant/components/balay/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "balay",
-  "name": "Balay",
-  "integration_type": "virtual",
-  "supported_by": "home_connect"
-}

homeassistant/components/balboa/strings.json

@@ -103,8 +103,8 @@
       "temperature_range": {
         "name": "Temperature range",
         "state": {
-          "low": "[%key:common::state::low%]",
-          "high": "[%key:common::state::high%]"
+          "low": "Low",
+          "high": "High"
         }
       }
     },

homeassistant/components/binary_sensor/strings.json

@@ -124,15 +124,15 @@
     "battery": {
       "name": "Battery",
       "state": {
-        "off": "[%key:common::state::normal%]",
-        "on": "[%key:common::state::low%]"
+        "off": "Normal",
+        "on": "Low"
       }
     },
     "battery_charging": {
       "name": "Charging",
       "state": {
         "off": "Not charging",
-        "on": "[%key:common::state::charging%]"
+        "on": "Charging"
       }
     },
     "carbon_monoxide": {
@@ -145,7 +145,7 @@
     "cold": {
       "name": "Cold",
       "state": {
-        "off": "[%key:common::state::normal%]",
+        "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
         "on": "Cold"
       }
     },
@@ -180,7 +180,7 @@
     "heat": {
       "name": "Heat",
       "state": {
-        "off": "[%key:common::state::normal%]",
+        "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
         "on": "Hot"
       }
     },

homeassistant/components/blue_current/strings.json

@@ -30,18 +30,18 @@
           "available": "Available",
           "charging": "[%key:common::state::charging%]",
           "unavailable": "Unavailable",
-          "error": "[%key:common::state::error%]",
+          "error": "Error",
           "offline": "Offline"
         }
       },
       "vehicle_status": {
         "name": "Vehicle status",
         "state": {
-          "standby": "[%key:common::state::standby%]",
+          "standby": "Standby",
           "vehicle_detected": "Detected",
           "ready": "Ready",
           "no_power": "No power",
-          "vehicle_error": "[%key:common::state::error%]"
+          "vehicle_error": "Error"
         }
       },
       "actual_v1": {

homeassistant/components/bluesound/manifest.json

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

homeassistant/components/bluesound/media_player.py

@@ -330,12 +330,7 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
 
         if self._status.input_id is not None:
             for input_ in self._inputs:
-                # the input might not have an id => also try to match on the stream_url/url
-                # we have to use both because neither matches all the time
-                if (
-                    input_.id == self._status.input_id
-                    or input_.url == self._status.stream_url
-                ):
+                if input_.id == self._status.input_id:
                     return input_.text
 
         for preset in self._presets:

homeassistant/components/bluetooth/manifest.json

@@ -19,8 +19,8 @@
     "bleak-retry-connector==3.9.0",
     "bluetooth-adapters==0.21.4",
     "bluetooth-auto-recovery==1.4.5",
-    "bluetooth-data-tools==1.27.0",
+    "bluetooth-data-tools==1.26.5",
     "dbus-fast==2.43.0",
-    "habluetooth==3.39.0"
+    "habluetooth==3.37.0"
   ]
 }

homeassistant/components/bluetooth/passive_update_processor.py

@@ -374,27 +374,6 @@ class PassiveBluetoothProcessorCoordinator[_DataT](BasePassiveBluetoothCoordinat
             self.logger.exception("Unexpected error updating %s data", self.name)
             return
 
-        self._process_update(update, was_available)
-
-    @callback
-    def async_set_updated_data(self, update: _DataT) -> None:
-        """Manually update the processor with new data.
-
-        If the data comes in via a different method, like a
-        notification, this method can be used to update the
-        processor with the new data.
-
-        This is useful for devices that retrieve
-        some of their data via notifications.
-        """
-        was_available = self._available
-        self._available = True
-        self._process_update(update, was_available)
-
-    def _process_update(
-        self, update: _DataT, was_available: bool | None = None
-    ) -> None:
-        """Process the update from the bluetooth device."""
         if not self.last_update_success:
             self.last_update_success = True
             self.logger.info("Coordinator %s recovered", self.name)

homeassistant/components/bmw_connected_drive/strings.json

@@ -6,7 +6,7 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "region": "ConnectedDrive region"
+          "region": "ConnectedDrive Region"
         },
         "data_description": {
           "username": "The email address of your MyBMW/MINI Connected account.",
@@ -113,10 +113,10 @@
     },
     "select": {
       "ac_limit": {
-        "name": "AC charging limit"
+        "name": "AC Charging Limit"
       },
       "charging_mode": {
-        "name": "Charging mode",
+        "name": "Charging Mode",
         "state": {
           "immediate_charging": "Immediate charging",
           "delayed_charging": "Delayed charging",
@@ -139,7 +139,7 @@
         "state": {
           "default": "Default",
           "charging": "[%key:common::state::charging%]",
-          "error": "[%key:common::state::error%]",
+          "error": "Error",
           "complete": "Complete",
           "fully_charged": "Fully charged",
           "finished_fully_charged": "Finished, fully charged",
@@ -181,7 +181,7 @@
           "cooling": "Cooling",
           "heating": "Heating",
           "inactive": "Inactive",
-          "standby": "[%key:common::state::standby%]",
+          "standby": "Standby",
           "ventilation": "Ventilation"
         }
       },

homeassistant/components/bond/config_flow.py

@@ -16,7 +16,6 @@ from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import DOMAIN
@@ -92,22 +91,11 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
 
         self._discovered[CONF_ACCESS_TOKEN] = token
         try:
-            bond_id, hub_name = await _validate_input(self.hass, self._discovered)
+            _, hub_name = await _validate_input(self.hass, self._discovered)
         except InputValidationError:
             return
-        await self.async_set_unique_id(bond_id)
-        self._abort_if_unique_id_configured(updates={CONF_HOST: host})
         self._discovered[CONF_NAME] = hub_name
 
-    async def async_step_dhcp(
-        self, discovery_info: DhcpServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by dhcp discovery."""
-        host = discovery_info.ip
-        bond_id = discovery_info.hostname.partition("-")[2].upper()
-        await self.async_set_unique_id(bond_id)
-        return await self.async_step_any_discovery(bond_id, host)
-
     async def async_step_zeroconf(
         self, discovery_info: ZeroconfServiceInfo
     ) -> ConfigFlowResult:
@@ -116,17 +104,11 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
         host: str = discovery_info.host
         bond_id = name.partition(".")[0]
         await self.async_set_unique_id(bond_id)
-        return await self.async_step_any_discovery(bond_id, host)
-
-    async def async_step_any_discovery(
-        self, bond_id: str, host: str
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by discovery."""
         for entry in self._async_current_entries():
             if entry.unique_id != bond_id:
                 continue
             updates = {CONF_HOST: host}
-            if entry.state is ConfigEntryState.SETUP_ERROR and (
+            if entry.state == ConfigEntryState.SETUP_ERROR and (
                 token := await async_get_token(self.hass, host)
             ):
                 updates[CONF_ACCESS_TOKEN] = token
@@ -171,14 +153,10 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
                 CONF_HOST: self._discovered[CONF_HOST],
             }
             try:
-                bond_id, hub_name = await _validate_input(self.hass, data)
+                _, hub_name = await _validate_input(self.hass, data)
             except InputValidationError as error:
                 errors["base"] = error.base
             else:
-                await self.async_set_unique_id(bond_id)
-                self._abort_if_unique_id_configured(
-                    updates={CONF_HOST: self._discovered[CONF_HOST]}
-                )
                 return self.async_create_entry(
                     title=hub_name,
                     data=data,
@@ -207,10 +185,8 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
             except InputValidationError as error:
                 errors["base"] = error.base
             else:
-                await self.async_set_unique_id(bond_id, raise_on_progress=False)
-                self._abort_if_unique_id_configured(
-                    updates={CONF_HOST: user_input[CONF_HOST]}
-                )
+                await self.async_set_unique_id(bond_id)
+                self._abort_if_unique_id_configured()
                 return self.async_create_entry(title=hub_name, data=user_input)
 
         return self.async_show_form(

homeassistant/components/bond/manifest.json

@@ -3,16 +3,6 @@
   "name": "Bond",
   "codeowners": ["@bdraco", "@prystupa", "@joshs85", "@marciogranzotto"],
   "config_flow": true,
-  "dhcp": [
-    {
-      "hostname": "bond-*",
-      "macaddress": "3C6A2C1*"
-    },
-    {
-      "hostname": "bond-*",
-      "macaddress": "F44E38*"
-    }
-  ],
   "documentation": "https://www.home-assistant.io/integrations/bond",
   "iot_class": "local_push",
   "loggers": ["bond_async"],

homeassistant/components/bosch_alarm/__init__.py

@@ -9,12 +9,12 @@ from bosch_alarm_mode2 import Panel
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
 from .const import CONF_INSTALLER_CODE, CONF_USER_CODE, DOMAIN
 
-PLATFORMS: list[Platform] = [Platform.ALARM_CONTROL_PANEL, Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.ALARM_CONTROL_PANEL]
 
 type BoschAlarmConfigEntry = ConfigEntry[Panel]
 
@@ -34,15 +34,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -
         await panel.connect()
     except (PermissionError, ValueError) as err:
         await panel.disconnect()
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN, translation_key="authentication_failed"
-        ) from err
+        raise ConfigEntryNotReady from err
     except (TimeoutError, OSError, ConnectionRefusedError, SSLError) as err:
         await panel.disconnect()
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="cannot_connect",
-        ) from err
+        raise ConfigEntryNotReady("Connection failed") from err
 
     entry.runtime_data = panel
 

homeassistant/components/bosch_alarm/alarm_control_panel.py

@@ -10,10 +10,11 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelState,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BoschAlarmConfigEntry
-from .entity import BoschAlarmAreaEntity
+from .const import DOMAIN
 
 
 async def async_setup_entry(
@@ -34,7 +35,7 @@ async def async_setup_entry(
     )
 
 
-class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):
+class AreaAlarmControlPanel(AlarmControlPanelEntity):
     """An alarm control panel entity for a bosch alarm panel."""
 
     _attr_has_entity_name = True
@@ -47,8 +48,19 @@ class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):
 
     def __init__(self, panel: Panel, area_id: int, unique_id: str) -> None:
         """Initialise a Bosch Alarm control panel entity."""
-        super().__init__(panel, area_id, unique_id, False, False, True)
-        self._attr_unique_id = self._area_unique_id
+        self.panel = panel
+        self._area = panel.areas[area_id]
+        self._area_id = area_id
+        self._attr_unique_id = f"{unique_id}_area_{area_id}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, self._attr_unique_id)},
+            name=self._area.name,
+            manufacturer="Bosch Security Systems",
+            via_device=(
+                DOMAIN,
+                unique_id,
+            ),
+        )
 
     @property
     def alarm_state(self) -> AlarmControlPanelState | None:
@@ -78,3 +90,20 @@ class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         await self.panel.area_arm_all(self._area_id)
+
+    @property
+    def available(self) -> bool:
+        """Return True if entity is available."""
+        return self.panel.connection_status()
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity attached to hass."""
+        await super().async_added_to_hass()
+        self._area.status_observer.attach(self.schedule_update_ha_state)
+        self.panel.connection_status_observer.attach(self.schedule_update_ha_state)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Run when entity removed from hass."""
+        await super().async_will_remove_from_hass()
+        self._area.status_observer.detach(self.schedule_update_ha_state)
+        self.panel.connection_status_observer.detach(self.schedule_update_ha_state)

homeassistant/components/bosch_alarm/config_flow.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Mapping
 import logging
 import ssl
 from typing import Any
@@ -11,12 +10,7 @@ from typing import Any
 from bosch_alarm_mode2 import Panel
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    SOURCE_RECONFIGURE,
-    SOURCE_USER,
-    ConfigFlow,
-    ConfigFlowResult,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
     CONF_CODE,
     CONF_HOST,
@@ -113,13 +107,6 @@ class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 self._data = user_input
                 self._data[CONF_MODEL] = model
-
-                if self.source == SOURCE_RECONFIGURE:
-                    if (
-                        self._get_reconfigure_entry().data[CONF_MODEL]
-                        != self._data[CONF_MODEL]
-                    ):
-                        return self.async_abort(reason="device_mismatch")
                 return await self.async_step_auth()
         return self.async_show_form(
             step_id="user",
@@ -129,12 +116,6 @@ class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the reconfigure step."""
-        return await self.async_step_user()
-
     async def async_step_auth(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -172,77 +153,13 @@ class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 if serial_number:
                     await self.async_set_unique_id(str(serial_number))
-                if self.source == SOURCE_USER:
-                    if serial_number:
-                        self._abort_if_unique_id_configured()
-                    else:
-                        self._async_abort_entries_match(
-                            {CONF_HOST: self._data[CONF_HOST]}
-                        )
-                    return self.async_create_entry(
-                        title=f"Bosch {model}", data=self._data
-                    )
-                if serial_number:
-                    self._abort_if_unique_id_mismatch(reason="device_mismatch")
-                return self.async_update_reload_and_abort(
-                    self._get_reconfigure_entry(),
-                    data=self._data,
-                )
+                    self._abort_if_unique_id_configured()
+                else:
+                    self._async_abort_entries_match({CONF_HOST: self._data[CONF_HOST]})
+                return self.async_create_entry(title=f"Bosch {model}", data=self._data)
 
         return self.async_show_form(
             step_id="auth",
             data_schema=self.add_suggested_values_to_schema(schema, user_input),
             errors=errors,
         )
-
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon an authentication error."""
-        self._data = dict(entry_data)
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the reauth step."""
-        errors: dict[str, str] = {}
-
-        # Each model variant requires a different authentication flow
-        if "Solution" in self._data[CONF_MODEL]:
-            schema = STEP_AUTH_DATA_SCHEMA_SOLUTION
-        elif "AMAX" in self._data[CONF_MODEL]:
-            schema = STEP_AUTH_DATA_SCHEMA_AMAX
-        else:
-            schema = STEP_AUTH_DATA_SCHEMA_BG
-
-        if user_input is not None:
-            reauth_entry = self._get_reauth_entry()
-            self._data.update(user_input)
-            try:
-                (_, _) = await try_connect(self._data, Panel.LOAD_EXTENDED_INFO)
-            except (PermissionError, ValueError) as e:
-                errors["base"] = "invalid_auth"
-                _LOGGER.error("Authentication Error: %s", e)
-            except (
-                OSError,
-                ConnectionRefusedError,
-                ssl.SSLError,
-                TimeoutError,
-            ) as e:
-                _LOGGER.error("Connection Error: %s", e)
-                errors["base"] = "cannot_connect"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_update_reload_and_abort(
-                    reauth_entry,
-                    data_updates=user_input,
-                )
-
-        return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=self.add_suggested_values_to_schema(schema, user_input),
-            errors=errors,
-        )

homeassistant/components/bosch_alarm/diagnostics.py

@@ -1,73 +0,0 @@
-"""Diagnostics for bosch alarm."""
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_PASSWORD
-from homeassistant.core import HomeAssistant
-
-from . import BoschAlarmConfigEntry
-from .const import CONF_INSTALLER_CODE, CONF_USER_CODE
-
-TO_REDACT = [CONF_INSTALLER_CODE, CONF_USER_CODE, CONF_PASSWORD]
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: BoschAlarmConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-
-    return {
-        "entry_data": async_redact_data(entry.data, TO_REDACT),
-        "data": {
-            "model": entry.runtime_data.model,
-            "serial_number": entry.runtime_data.serial_number,
-            "protocol_version": entry.runtime_data.protocol_version,
-            "firmware_version": entry.runtime_data.firmware_version,
-            "areas": [
-                {
-                    "id": area_id,
-                    "name": area.name,
-                    "all_ready": area.all_ready,
-                    "part_ready": area.part_ready,
-                    "faults": area.faults,
-                    "alarms": area.alarms,
-                    "disarmed": area.is_disarmed(),
-                    "arming": area.is_arming(),
-                    "pending": area.is_pending(),
-                    "part_armed": area.is_part_armed(),
-                    "all_armed": area.is_all_armed(),
-                    "armed": area.is_armed(),
-                    "triggered": area.is_triggered(),
-                }
-                for area_id, area in entry.runtime_data.areas.items()
-            ],
-            "points": [
-                {
-                    "id": point_id,
-                    "name": point.name,
-                    "open": point.is_open(),
-                    "normal": point.is_normal(),
-                }
-                for point_id, point in entry.runtime_data.points.items()
-            ],
-            "doors": [
-                {
-                    "id": door_id,
-                    "name": door.name,
-                    "open": door.is_open(),
-                    "locked": door.is_locked(),
-                }
-                for door_id, door in entry.runtime_data.doors.items()
-            ],
-            "outputs": [
-                {
-                    "id": output_id,
-                    "name": output.name,
-                    "active": output.is_active(),
-                }
-                for output_id, output in entry.runtime_data.outputs.items()
-            ],
-            "history_events": entry.runtime_data.events,
-        },
-    }

homeassistant/components/bosch_alarm/entity.py

@@ -1,88 +0,0 @@
-"""Support for Bosch Alarm Panel History as a sensor."""
-
-from __future__ import annotations
-
-from bosch_alarm_mode2 import Panel
-
-from homeassistant.components.sensor import Entity
-from homeassistant.helpers.device_registry import DeviceInfo
-
-from .const import DOMAIN
-
-PARALLEL_UPDATES = 0
-
-
-class BoschAlarmEntity(Entity):
-    """A base entity for a bosch alarm panel."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, panel: Panel, unique_id: str) -> None:
-        """Set up a entity for a bosch alarm panel."""
-        self.panel = panel
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unique_id)},
-            name=f"Bosch {panel.model}",
-            manufacturer="Bosch Security Systems",
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self.panel.connection_status()
-
-    async def async_added_to_hass(self) -> None:
-        """Observe state changes."""
-        self.panel.connection_status_observer.attach(self.schedule_update_ha_state)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Stop observing state changes."""
-        self.panel.connection_status_observer.detach(self.schedule_update_ha_state)
-
-
-class BoschAlarmAreaEntity(BoschAlarmEntity):
-    """A base entity for area related entities within a bosch alarm panel."""
-
-    def __init__(
-        self,
-        panel: Panel,
-        area_id: int,
-        unique_id: str,
-        observe_alarms: bool,
-        observe_ready: bool,
-        observe_status: bool,
-    ) -> None:
-        """Set up a area related entity for a bosch alarm panel."""
-        super().__init__(panel, unique_id)
-        self._area_id = area_id
-        self._area_unique_id = f"{unique_id}_area_{area_id}"
-        self._observe_alarms = observe_alarms
-        self._observe_ready = observe_ready
-        self._observe_status = observe_status
-        self._area = panel.areas[area_id]
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._area_unique_id)},
-            name=self._area.name,
-            manufacturer="Bosch Security Systems",
-            via_device=(DOMAIN, unique_id),
-        )
-
-    async def async_added_to_hass(self) -> None:
-        """Observe state changes."""
-        await super().async_added_to_hass()
-        if self._observe_alarms:
-            self._area.alarm_observer.attach(self.schedule_update_ha_state)
-        if self._observe_ready:
-            self._area.ready_observer.attach(self.schedule_update_ha_state)
-        if self._observe_status:
-            self._area.status_observer.attach(self.schedule_update_ha_state)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Stop observing state changes."""
-        await super().async_added_to_hass()
-        if self._observe_alarms:
-            self._area.alarm_observer.detach(self.schedule_update_ha_state)
-        if self._observe_ready:
-            self._area.ready_observer.detach(self.schedule_update_ha_state)
-        if self._observe_status:
-            self._area.status_observer.detach(self.schedule_update_ha_state)

homeassistant/components/bosch_alarm/icons.json

@@ -1,9 +0,0 @@
-{
-  "entity": {
-    "sensor": {
-      "faulting_points": {
-        "default": "mdi:alert-circle-outline"
-      }
-    }
-  }
-}

homeassistant/components/bosch_alarm/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "bronze",
-  "requirements": ["bosch-alarm-mode2==0.4.6"]
+  "requirements": ["bosch-alarm-mode2==0.4.3"]
 }

homeassistant/components/bosch_alarm/quality_scale.yaml

@@ -40,7 +40,7 @@ rules:
   integration-owner: done
   log-when-unavailable: todo
   parallel-updates: todo
-  reauthentication-flow: done
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
@@ -62,9 +62,9 @@ rules:
   entity-category: todo
   entity-device-class: todo
   entity-disabled-by-default: todo
-  entity-translations: done
+  entity-translations: todo
   exception-translations: todo
-  icon-translations: done
+  icon-translations: todo
   reconfiguration-flow: todo
   repair-issues:
     status: exempt

homeassistant/components/bosch_alarm/sensor.py

@@ -1,86 +0,0 @@
-"""Support for Bosch Alarm Panel History as a sensor."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from bosch_alarm_mode2 import Panel
-from bosch_alarm_mode2.panel import Area
-
-from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import BoschAlarmConfigEntry
-from .entity import BoschAlarmAreaEntity
-
-
-@dataclass(kw_only=True, frozen=True)
-class BoschAlarmSensorEntityDescription(SensorEntityDescription):
-    """Describes Bosch Alarm sensor entity."""
-
-    value_fn: Callable[[Area], int]
-    observe_alarms: bool = False
-    observe_ready: bool = False
-    observe_status: bool = False
-
-
-SENSOR_TYPES: list[BoschAlarmSensorEntityDescription] = [
-    BoschAlarmSensorEntityDescription(
-        key="faulting_points",
-        translation_key="faulting_points",
-        value_fn=lambda area: area.faults,
-        observe_ready=True,
-    ),
-]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: BoschAlarmConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up bosch alarm sensors."""
-
-    panel = config_entry.runtime_data
-    unique_id = config_entry.unique_id or config_entry.entry_id
-
-    async_add_entities(
-        BoschAreaSensor(panel, area_id, unique_id, template)
-        for area_id in panel.areas
-        for template in SENSOR_TYPES
-    )
-
-
-PARALLEL_UPDATES = 0
-
-
-class BoschAreaSensor(BoschAlarmAreaEntity, SensorEntity):
-    """An area sensor entity for a bosch alarm panel."""
-
-    entity_description: BoschAlarmSensorEntityDescription
-
-    def __init__(
-        self,
-        panel: Panel,
-        area_id: int,
-        unique_id: str,
-        entity_description: BoschAlarmSensorEntityDescription,
-    ) -> None:
-        """Set up an area sensor entity for a bosch alarm panel."""
-        super().__init__(
-            panel,
-            area_id,
-            unique_id,
-            entity_description.observe_alarms,
-            entity_description.observe_ready,
-            entity_description.observe_status,
-        )
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{self._area_unique_id}_{entity_description.key}"
-
-    @property
-    def native_value(self) -> int:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self._area)

homeassistant/components/bosch_alarm/strings.json

@@ -22,18 +22,6 @@
           "installer_code": "The installer code from your panel",
           "user_code": "The user code from your panel"
         }
-      },
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "installer_code": "[%key:component::bosch_alarm::config::step::auth::data::installer_code%]",
-          "user_code": "[%key:component::bosch_alarm::config::step::auth::data::user_code%]"
-        },
-        "data_description": {
-          "password": "[%key:component::bosch_alarm::config::step::auth::data_description::password%]",
-          "installer_code": "[%key:component::bosch_alarm::config::step::auth::data_description::installer_code%]",
-          "user_code": "[%key:component::bosch_alarm::config::step::auth::data_description::user_code%]"
-        }
       }
     },
     "error": {
@@ -42,26 +30,7 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "device_mismatch": "Please ensure you reconfigure against the same device."
-    }
-  },
-  "exceptions": {
-    "cannot_connect": {
-      "message": "Could not connect to panel."
-    },
-    "authentication_failed": {
-      "message": "Incorrect credentials for panel."
-    }
-  },
-  "entity": {
-    "sensor": {
-      "faulting_points": {
-        "name": "Faulting points",
-        "unit_of_measurement": "points"
-      }
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }

homeassistant/components/bring/strings.json

@@ -13,7 +13,7 @@
         },
         "data_description": {
           "email": "The email address associated with your Bring! account.",
-          "password": "The password to log in to your Bring! account."
+          "password": "The password to login to your Bring! account."
         }
       },
       "reauth_confirm": {

homeassistant/components/buienradar/util.py

@@ -12,7 +12,6 @@ from buienradar.constants import (
     CONDITION,
     CONTENT,
     DATA,
-    FEELTEMPERATURE,
     FORECAST,
     HUMIDITY,
     MESSAGE,
@@ -23,7 +22,6 @@ from buienradar.constants import (
     TEMPERATURE,
     VISIBILITY,
     WINDAZIMUTH,
-    WINDGUST,
     WINDSPEED,
 )
 from buienradar.urls import JSON_FEED_URL, json_precipitation_forecast_url
@@ -202,14 +200,6 @@ class BrData:
         except (ValueError, TypeError):
             return None
 
-    @property
-    def feeltemperature(self):
-        """Return the feeltemperature, or None."""
-        try:
-            return float(self.data.get(FEELTEMPERATURE))
-        except (ValueError, TypeError):
-            return None
-
     @property
     def pressure(self):
         """Return the pressure, or None."""
@@ -234,14 +224,6 @@ class BrData:
         except (ValueError, TypeError):
             return None
 
-    @property
-    def wind_gust(self):
-        """Return the windgust, or None."""
-        try:
-            return float(self.data.get(WINDGUST))
-        except (ValueError, TypeError):
-            return None
-
     @property
     def wind_speed(self):
         """Return the windspeed, or None."""

homeassistant/components/buienradar/weather.py

@@ -9,7 +9,6 @@ from buienradar.constants import (
     MAX_TEMP,
     MIN_TEMP,
     RAIN,
-    RAIN_CHANCE,
     WINDAZIMUTH,
     WINDSPEED,
 )
@@ -34,7 +33,6 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_NATIVE_TEMP,
     ATTR_FORECAST_NATIVE_TEMP_LOW,
     ATTR_FORECAST_NATIVE_WIND_SPEED,
-    ATTR_FORECAST_PRECIPITATION_PROBABILITY,
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_WIND_BEARING,
     Forecast,
@@ -155,9 +153,7 @@ class BrWeather(WeatherEntity):
         )
         self._attr_native_pressure = data.pressure
         self._attr_native_temperature = data.temperature
-        self._attr_native_apparent_temperature = data.feeltemperature
         self._attr_native_visibility = data.visibility
-        self._attr_native_wind_gust_speed = data.wind_gust
         self._attr_native_wind_speed = data.wind_speed
         self._attr_wind_bearing = data.wind_bearing
 
@@ -192,7 +188,6 @@ class BrWeather(WeatherEntity):
                 ATTR_FORECAST_NATIVE_TEMP_LOW: data_in.get(MIN_TEMP),
                 ATTR_FORECAST_NATIVE_TEMP: data_in.get(MAX_TEMP),
                 ATTR_FORECAST_NATIVE_PRECIPITATION: data_in.get(RAIN),
-                ATTR_FORECAST_PRECIPITATION_PROBABILITY: data_in.get(RAIN_CHANCE),
                 ATTR_FORECAST_WIND_BEARING: data_in.get(WINDAZIMUTH),
                 ATTR_FORECAST_NATIVE_WIND_SPEED: data_in.get(WINDSPEED),
             }

homeassistant/components/calendar/strings.json

@@ -74,7 +74,7 @@
     },
     "get_events": {
       "name": "Get events",
-      "description": "Retrieves events on a calendar within a time range.",
+      "description": "Get events on a calendar within a time range.",
       "fields": {
         "start_date_time": {
           "name": "Start time",

homeassistant/components/cambridge_audio/media_player.py

@@ -142,12 +142,6 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
     @property
     def media_artist(self) -> str | None:
         """Artist of current playing media, music track only."""
-        if (
-            not self.client.play_state.metadata.artist
-            and self.client.state.source == "IR"
-        ):
-            # Return channel instead of artist when playing internet radio
-            return self.client.play_state.metadata.station
         return self.client.play_state.metadata.artist
 
     @property
@@ -175,11 +169,6 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
         """Last time the media position was updated."""
         return self.client.position_last_updated
 
-    @property
-    def media_channel(self) -> str | None:
-        """Channel currently playing."""
-        return self.client.play_state.metadata.station
-
     @property
     def is_volume_muted(self) -> bool | None:
         """Volume mute status."""

homeassistant/components/camera/img_util.py

@@ -2,10 +2,17 @@
 
 from __future__ import annotations
 
+from contextlib import suppress
 import logging
 from typing import TYPE_CHECKING, Literal, cast
 
-from turbojpeg import TurboJPEG
+with suppress(Exception):
+    # TurboJPEG imports numpy which may or may not work so
+    # we have to guard the import here. We still want
+    # to import it at top level so it gets loaded
+    # in the import executor and not in the event loop.
+    from turbojpeg import TurboJPEG
+
 
 if TYPE_CHECKING:
     from . import Image

homeassistant/components/climate/strings.json

@@ -28,10 +28,10 @@
       "name": "Thermostat",
       "state": {
         "off": "[%key:common::state::off%]",
-        "auto": "[%key:common::state::auto%]",
         "heat": "Heat",
         "cool": "Cool",
         "heat_cool": "Heat/Cool",
+        "auto": "Auto",
         "dry": "Dry",
         "fan_only": "Fan only"
       },
@@ -50,10 +50,10 @@
           "state": {
             "off": "[%key:common::state::off%]",
             "on": "[%key:common::state::on%]",
-            "auto": "[%key:common::state::auto%]",
-            "low": "[%key:common::state::low%]",
-            "medium": "[%key:common::state::medium%]",
-            "high": "[%key:common::state::high%]",
+            "auto": "Auto",
+            "low": "Low",
+            "medium": "Medium",
+            "high": "High",
             "top": "Top",
             "middle": "Middle",
             "focus": "Focus",
@@ -69,13 +69,13 @@
         "hvac_action": {
           "name": "Current action",
           "state": {
-            "off": "[%key:common::state::off%]",
-            "idle": "[%key:common::state::idle%]",
             "cooling": "Cooling",
             "defrosting": "Defrosting",
             "drying": "Drying",
             "fan": "Fan",
             "heating": "Heating",
+            "idle": "[%key:common::state::idle%]",
+            "off": "[%key:common::state::off%]",
             "preheating": "Preheating"
           }
         },
@@ -98,13 +98,13 @@
           "name": "Preset",
           "state": {
             "none": "None",
-            "home": "[%key:common::state::home%]",
-            "away": "[%key:common::state::not_home%]",
-            "activity": "Activity",
+            "eco": "Eco",
+            "away": "Away",
             "boost": "Boost",
             "comfort": "Comfort",
-            "eco": "Eco",
-            "sleep": "Sleep"
+            "home": "[%key:common::state::home%]",
+            "sleep": "Sleep",
+            "activity": "Activity"
           }
         },
         "preset_modes": {
@@ -257,8 +257,8 @@
   "selector": {
     "hvac_mode": {
       "options": {
-        "off": "[%key:common::state::off%]",
-        "auto": "[%key:common::state::auto%]",
+        "off": "Off",
+        "auto": "Auto",
         "cool": "Cool",
         "dry": "Dry",
         "fan_only": "Fan only",

homeassistant/components/cloud/onboarding.py

@@ -1,110 +0,0 @@
-"""Cloud onboarding views."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from functools import wraps
-from typing import TYPE_CHECKING, Any, Concatenate
-
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPUnauthorized
-
-from homeassistant.components.http import KEY_HASS
-from homeassistant.components.onboarding import (
-    BaseOnboardingView,
-    NoAuthBaseOnboardingView,
-)
-from homeassistant.core import HomeAssistant
-
-from . import http_api as cloud_http
-from .const import DATA_CLOUD
-
-if TYPE_CHECKING:
-    from homeassistant.components.onboarding import OnboardingStoreData
-
-
-async def async_setup_views(hass: HomeAssistant, data: OnboardingStoreData) -> None:
-    """Set up the cloud views."""
-
-    hass.http.register_view(CloudForgotPasswordView(data))
-    hass.http.register_view(CloudLoginView(data))
-    hass.http.register_view(CloudLogoutView(data))
-    hass.http.register_view(CloudStatusView(data))
-
-
-def ensure_not_done[_ViewT: BaseOnboardingView, **_P](
-    func: Callable[
-        Concatenate[_ViewT, web.Request, _P],
-        Coroutine[Any, Any, web.Response],
-    ],
-) -> Callable[Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]]:
-    """Home Assistant API decorator to check onboarding and cloud."""
-
-    @wraps(func)
-    async def _ensure_not_done(
-        self: _ViewT,
-        request: web.Request,
-        *args: _P.args,
-        **kwargs: _P.kwargs,
-    ) -> web.Response:
-        """Check onboarding status, cloud and call function."""
-        if self._data["done"]:
-            # If at least one onboarding step is done, we don't allow accessing
-            # the cloud onboarding views.
-            raise HTTPUnauthorized
-
-        return await func(self, request, *args, **kwargs)
-
-    return _ensure_not_done
-
-
-class CloudForgotPasswordView(
-    NoAuthBaseOnboardingView, cloud_http.CloudForgotPasswordView
-):
-    """View to start Forgot Password flow."""
-
-    url = "/api/onboarding/cloud/forgot_password"
-    name = "api:onboarding:cloud:forgot_password"
-
-    @ensure_not_done
-    async def post(self, request: web.Request) -> web.Response:
-        """Handle forgot password request."""
-        return await super()._post(request)
-
-
-class CloudLoginView(NoAuthBaseOnboardingView, cloud_http.CloudLoginView):
-    """Login to Home Assistant Cloud."""
-
-    url = "/api/onboarding/cloud/login"
-    name = "api:onboarding:cloud:login"
-
-    @ensure_not_done
-    async def post(self, request: web.Request) -> web.Response:
-        """Handle login request."""
-        return await super()._post(request)
-
-
-class CloudLogoutView(NoAuthBaseOnboardingView, cloud_http.CloudLogoutView):
-    """Log out of the Home Assistant cloud."""
-
-    url = "/api/onboarding/cloud/logout"
-    name = "api:onboarding:cloud:logout"
-
-    @ensure_not_done
-    async def post(self, request: web.Request) -> web.Response:
-        """Handle logout request."""
-        return await super()._post(request)
-
-
-class CloudStatusView(NoAuthBaseOnboardingView):
-    """Get cloud status view."""
-
-    url = "/api/onboarding/cloud/status"
-    name = "api:onboarding:cloud:status"
-
-    @ensure_not_done
-    async def get(self, request: web.Request) -> web.Response:
-        """Return cloud status."""
-        hass = request.app[KEY_HASS]
-        cloud = hass.data[DATA_CLOUD]
-        return self.json({"logged_in": cloud.is_logged_in})

homeassistant/components/cloudflare/config_flow.py

@@ -9,6 +9,7 @@ from typing import Any
 import pycfdns
 import voluptuous as vol
 
+from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
 from homeassistant.core import HomeAssistant
@@ -117,6 +118,8 @@ class CloudflareConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
+        persistent_notification.async_dismiss(self.hass, "cloudflare_setup")
+
         errors: dict[str, str] = {}
 
         if user_input is not None:

homeassistant/components/comelit/alarm_control_panel.py

@@ -83,6 +83,7 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
         config_entry_entry_id: str,
     ) -> None:
         """Initialize the alarm panel."""
+        self._api = coordinator.api
         self._area_index = area.index
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id
@@ -136,38 +137,30 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
 
     async def async_alarm_disarm(self, code: str | None = None) -> None:
         """Send disarm command."""
-        if code != str(self.coordinator.api.device_pin):
+        if code != str(self._api.device_pin):
             return
-        await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[DISABLE]
-        )
+        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[DISABLE])
         await self._async_update_state(
             AlarmAreaState.DISARMED, ALARM_AREA_ARMED_STATUS[DISABLE]
         )
 
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
-        await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[AWAY]
-        )
+        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[AWAY])
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[AWAY]
         )
 
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
-        await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[HOME]
-        )
+        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[HOME])
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[HOME_P1]
         )
 
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
-        await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[NIGHT]
-        )
+        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[NIGHT])
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[NIGHT]
         )

homeassistant/components/comelit/binary_sensor.py

@@ -50,6 +50,7 @@ class ComelitVedoBinarySensorEntity(
         config_entry_entry_id: str,
     ) -> None:
         """Init sensor entity."""
+        self._api = coordinator.api
         self._zone_index = zone.index
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id

homeassistant/components/comelit/climate.py

@@ -19,10 +19,10 @@ from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -89,7 +89,7 @@ async def async_setup_entry(
     )
 
 
-class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
+class ComelitClimateEntity(CoordinatorEntity[ComelitSerialBridge], ClimateEntity):
     """Climate device."""
 
     _attr_hvac_modes = [HVACMode.AUTO, HVACMode.COOL, HVACMode.HEAT, HVACMode.OFF]
@@ -102,6 +102,7 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     )
     _attr_target_temperature_step = PRECISION_TENTHS
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_has_entity_name = True
     _attr_name = None
 
     def __init__(
@@ -111,7 +112,13 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
         config_entry_entry_id: str,
     ) -> None:
         """Init light entity."""
-        super().__init__(coordinator, device, config_entry_entry_id)
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
+        self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
+        self._attr_device_info = coordinator.platform_device_info(device, device.type)
         self._update_attributes()
 
     def _update_attributes(self) -> None:

homeassistant/components/comelit/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from asyncio.exceptions import TimeoutError
 from collections.abc import Mapping
 from typing import Any
 
@@ -54,18 +53,10 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 
     try:
         await api.login()
-    except (aiocomelit_exceptions.CannotConnect, TimeoutError) as err:
-        raise CannotConnect(
-            translation_domain=DOMAIN,
-            translation_key="cannot_connect",
-            translation_placeholders={"error": repr(err)},
-        ) from err
+    except aiocomelit_exceptions.CannotConnect as err:
+        raise CannotConnect from err
     except aiocomelit_exceptions.CannotAuthenticate as err:
-        raise InvalidAuth(
-            translation_domain=DOMAIN,
-            translation_key="cannot_authenticate",
-            translation_placeholders={"error": repr(err)},
-        ) from err
+        raise InvalidAuth from err
     finally:
         await api.logout()
         await api.close()

homeassistant/components/comelit/cover.py

@@ -11,9 +11,9 @@ from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverS
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -34,10 +34,13 @@ async def async_setup_entry(
     )
 
 
-class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
+class ComelitCoverEntity(
+    CoordinatorEntity[ComelitSerialBridge], RestoreEntity, CoverEntity
+):
     """Cover device."""
 
     _attr_device_class = CoverDeviceClass.SHUTTER
+    _attr_has_entity_name = True
     _attr_name = None
 
     def __init__(
@@ -47,7 +50,13 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
         config_entry_entry_id: str,
     ) -> None:
         """Init cover entity."""
-        super().__init__(coordinator, device, config_entry_entry_id)
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
+        self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
+        self._attr_device_info = coordinator.platform_device_info(device, device.type)
         # Device doesn't provide a status so we assume UNKNOWN at first startup
         self._last_action: int | None = None
         self._last_state: str | None = None
@@ -92,7 +101,7 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
     async def _cover_set_state(self, action: int, state: int) -> None:
         """Set desired cover state."""
         self._last_state = self.state
-        await self.coordinator.api.set_device_status(COVER, self._device.index, action)
+        await self._api.set_device_status(COVER, self._device.index, action)
         self.coordinator.data[COVER][self._device.index].status = state
         self.async_write_ha_state()
 

homeassistant/components/comelit/entity.py

@@ -1,29 +0,0 @@
-"""Base entity for Comelit."""
-
-from __future__ import annotations
-
-from aiocomelit import ComelitSerialBridgeObject
-
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .coordinator import ComelitSerialBridge
-
-
-class ComelitBridgeBaseEntity(CoordinatorEntity[ComelitSerialBridge]):
-    """Comelit Bridge base entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: ComelitSerialBridge,
-        device: ComelitSerialBridgeObject,
-        config_entry_entry_id: str,
-    ) -> None:
-        """Init cover entity."""
-        self._device = device
-        super().__init__(coordinator)
-        # Use config_entry.entry_id as base for unique_id
-        # because no serial number or mac is available
-        self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
-        self._attr_device_info = coordinator.platform_device_info(device, device.type)

homeassistant/components/comelit/humidifier.py

@@ -19,10 +19,10 @@ from homeassistant.components.humidifier import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -92,13 +92,14 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
+class ComelitHumidifierEntity(CoordinatorEntity[ComelitSerialBridge], HumidifierEntity):
     """Humidifier device."""
 
     _attr_supported_features = HumidifierEntityFeature.MODES
     _attr_available_modes = [MODE_NORMAL, MODE_AUTO]
     _attr_min_humidity = 10
     _attr_max_humidity = 90
+    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -111,8 +112,13 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
         device_class: HumidifierDeviceClass,
     ) -> None:
         """Init light entity."""
-        super().__init__(coordinator, device, config_entry_entry_id)
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
         self._attr_unique_id = f"{config_entry_entry_id}-{device.index}-{device_class}"
+        self._attr_device_info = coordinator.platform_device_info(device, device_class)
         self._attr_device_class = device_class
         self._attr_translation_key = device_class.value
         self._active_mode = active_mode
@@ -156,7 +162,7 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
 
     async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
-        if not self._attr_is_on:
+        if self.mode == HumidifierComelitMode.OFF:
             raise ServiceValidationError(
                 translation_domain=DOMAIN,
                 translation_key="humidity_while_off",
@@ -184,13 +190,9 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
         await self.coordinator.api.set_humidity_status(
             self._device.index, self._set_command
         )
-        self._attr_is_on = True
-        self.async_write_ha_state()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off."""
         await self.coordinator.api.set_humidity_status(
             self._device.index, HumidifierComelitCommand.OFF
         )
-        self._attr_is_on = False
-        self.async_write_ha_state()

homeassistant/components/comelit/light.py

@@ -4,14 +4,15 @@ from __future__ import annotations
 
 from typing import Any, cast
 
+from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import LIGHT, STATE_OFF, STATE_ON
 
 from homeassistant.components.light import ColorMode, LightEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -32,13 +33,29 @@ async def async_setup_entry(
     )
 
 
-class ComelitLightEntity(ComelitBridgeBaseEntity, LightEntity):
+class ComelitLightEntity(CoordinatorEntity[ComelitSerialBridge], LightEntity):
     """Light device."""
 
     _attr_color_mode = ColorMode.ONOFF
+    _attr_has_entity_name = True
     _attr_name = None
     _attr_supported_color_modes = {ColorMode.ONOFF}
 
+    def __init__(
+        self,
+        coordinator: ComelitSerialBridge,
+        device: ComelitSerialBridgeObject,
+        config_entry_entry_id: str,
+    ) -> None:
+        """Init light entity."""
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
+        self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
+        self._attr_device_info = coordinator.platform_device_info(device, device.type)
+
     async def _light_set_state(self, state: int) -> None:
         """Set desired light state."""
         await self.coordinator.api.set_device_status(LIGHT, self._device.index, state)

homeassistant/components/comelit/manifest.json

@@ -7,6 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
-  "quality_scale": "bronze",
   "requirements": ["aiocomelit==0.11.3"]
 }

homeassistant/components/comelit/quality_scale.yaml

@@ -1,92 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: no actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: no actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: no events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: todo
-    comment: wrap api calls in try block
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: no configuration parameters
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: done
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: done
-  discovery-update-info:
-    status: exempt
-    comment: device not discoverable
-  discovery:
-    status: exempt
-    comment: device not discoverable
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations:
-    status: exempt
-    comment: no known limitations, yet
-  docs-supported-devices:
-    status: todo
-    comment: review and complete missing ones
-  docs-supported-functions: todo
-  docs-troubleshooting: done
-  docs-use-cases: done
-  dynamic-devices:
-    status: todo
-    comment: missing implementation
-  entity-category:
-    status: todo
-    comment: PR in progress
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations:
-    status: todo
-    comment: PR in progress
-  icon-translations: done
-  reconfiguration-flow:
-    status: todo
-    comment: PR in progress
-  repair-issues:
-    status: exempt
-    comment: no known use cases for repair issues or flows, yet
-  stale-devices:
-    status: todo
-    comment: missing implementation
-
-  # Platinum
-  async-dependency: done
-  inject-websession:
-    status: todo
-    comment: implement aiohttp_client.async_create_clientsession
-  strict-typing: done

homeassistant/components/comelit/sensor.py

@@ -19,7 +19,6 @@ from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge, ComelitVedoSystem
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -96,9 +95,10 @@ async def async_setup_vedo_entry(
     async_add_entities(entities)
 
 
-class ComelitBridgeSensorEntity(ComelitBridgeBaseEntity, SensorEntity):
+class ComelitBridgeSensorEntity(CoordinatorEntity[ComelitSerialBridge], SensorEntity):
     """Sensor device."""
 
+    _attr_has_entity_name = True
     _attr_name = None
 
     def __init__(
@@ -109,7 +109,13 @@ class ComelitBridgeSensorEntity(ComelitBridgeBaseEntity, SensorEntity):
         description: SensorEntityDescription,
     ) -> None:
         """Init sensor entity."""
-        super().__init__(coordinator, device, config_entry_entry_id)
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
+        self._attr_unique_id = f"{config_entry_entry_id}-{device.index}"
+        self._attr_device_info = coordinator.platform_device_info(device, device.type)
 
         self.entity_description = description
 
@@ -138,6 +144,7 @@ class ComelitVedoSensorEntity(CoordinatorEntity[ComelitVedoSystem], SensorEntity
         description: SensorEntityDescription,
     ) -> None:
         """Init sensor entity."""
+        self._api = coordinator.api
         self._zone_index = zone.index
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id

homeassistant/components/comelit/strings.json

@@ -42,9 +42,9 @@
     "sensor": {
       "zone_status": {
         "state": {
-          "open": "[%key:common::state::open%]",
           "alarm": "Alarm",
           "armed": "Armed",
+          "open": "Open",
           "excluded": "Excluded",
           "faulty": "Faulty",
           "inhibited": "Inhibited",
@@ -52,9 +52,7 @@
           "rest": "Rest",
           "sabotated": "Sabotated"
         }
-      }
-    },
-    "humidifier": {
+      },
       "humidifier": {
         "name": "Humidifier"
       },
@@ -69,12 +67,6 @@
     },
     "invalid_clima_data": {
       "message": "Invalid 'clima' data"
-    },
-    "cannot_connect": {
-      "message": "Error connecting: {error}"
-    },
-    "cannot_authenticate": {
-      "message": "Error authenticating: {error}"
     }
   }
 }

homeassistant/components/comelit/switch.py

@@ -10,9 +10,9 @@ from aiocomelit.const import IRRIGATION, OTHER, STATE_OFF, STATE_ON
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import ComelitConfigEntry, ComelitSerialBridge
-from .entity import ComelitBridgeBaseEntity
 
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -39,9 +39,10 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
+class ComelitSwitchEntity(CoordinatorEntity[ComelitSerialBridge], SwitchEntity):
     """Switch device."""
 
+    _attr_has_entity_name = True
     _attr_name = None
 
     def __init__(
@@ -51,8 +52,13 @@ class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
         config_entry_entry_id: str,
     ) -> None:
         """Init switch entity."""
-        super().__init__(coordinator, device, config_entry_entry_id)
+        self._api = coordinator.api
+        self._device = device
+        super().__init__(coordinator)
+        # Use config_entry.entry_id as base for unique_id
+        # because no serial number or mac is available
         self._attr_unique_id = f"{config_entry_entry_id}-{device.type}-{device.index}"
+        self._attr_device_info = coordinator.platform_device_info(device, device.type)
         if device.type == OTHER:
             self._attr_device_class = SwitchDeviceClass.OUTLET
 
@@ -75,7 +81,4 @@ class ComelitSwitchEntity(ComelitBridgeBaseEntity, SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return True if switch is on."""
-        return (
-            self.coordinator.data[self._device.type][self._device.index].status
-            == STATE_ON
-        )
+        return self.coordinator.data[OTHER][self._device.index].status == STATE_ON

homeassistant/components/config/config_entries.py

@@ -58,8 +58,7 @@ def async_setup(hass: HomeAssistant) -> bool:
     websocket_api.async_register_command(hass, config_entry_get_single)
     websocket_api.async_register_command(hass, config_entry_update)
     websocket_api.async_register_command(hass, config_entries_subscribe)
-    websocket_api.async_register_command(hass, config_entries_flow_progress)
-    websocket_api.async_register_command(hass, config_entries_flow_subscribe)
+    websocket_api.async_register_command(hass, config_entries_progress)
     websocket_api.async_register_command(hass, ignore_config_flow)
 
     websocket_api.async_register_command(hass, config_subentry_delete)
@@ -358,7 +357,7 @@ class SubentryManagerFlowResourceView(
 
 @websocket_api.require_admin
 @websocket_api.websocket_command({"type": "config_entries/flow/progress"})
-def config_entries_flow_progress(
+def config_entries_progress(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
     msg: dict[str, Any],
@@ -379,66 +378,6 @@ def config_entries_flow_progress(
     )
 
 
-@websocket_api.require_admin
-@websocket_api.websocket_command({"type": "config_entries/flow/subscribe"})
-def config_entries_flow_subscribe(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Subscribe to non user created flows being initiated or removed.
-
-    When initiating the subscription, the current flows are sent to the client.
-
-    Example of a non-user initiated flow is a discovered Hue hub that
-    requires user interaction to finish setup.
-    """
-
-    @callback
-    def async_on_flow_init_remove(change_type: str, flow_id: str) -> None:
-        """Forward config entry state events to websocket."""
-        if change_type == "removed":
-            connection.send_message(
-                websocket_api.event_message(
-                    msg["id"],
-                    [{"type": change_type, "flow_id": flow_id}],
-                )
-            )
-            return
-        # change_type == "added"
-        connection.send_message(
-            websocket_api.event_message(
-                msg["id"],
-                [
-                    {
-                        "type": change_type,
-                        "flow_id": flow_id,
-                        "flow": hass.config_entries.flow.async_get(flow_id),
-                    }
-                ],
-            )
-        )
-
-    connection.subscriptions[msg["id"]] = hass.config_entries.flow.async_subscribe_flow(
-        async_on_flow_init_remove
-    )
-    connection.send_message(
-        websocket_api.event_message(
-            msg["id"],
-            [
-                {"type": None, "flow_id": flw["flow_id"], "flow": flw}
-                for flw in hass.config_entries.flow.async_progress()
-                if flw["context"]["source"]
-                not in (
-                    config_entries.SOURCE_RECONFIGURE,
-                    config_entries.SOURCE_USER,
-                )
-            ],
-        )
-    )
-    connection.send_result(msg["id"])
-
-
 def send_entry_not_found(
     connection: websocket_api.ActiveConnection, msg_id: int
 ) -> None:

homeassistant/components/constructa/__init__.py

@@ -1 +0,0 @@
-"""Constructa virtual integration."""

homeassistant/components/constructa/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "constructa",
-  "name": "Constructa",
-  "integration_type": "virtual",
-  "supported_by": "home_connect"
-}

homeassistant/components/conversation/chat_log.py

@@ -197,7 +197,6 @@ class ChatLog:
                 (
                     "?",
                     ";",  # Greek question mark
-                    "？",  # Chinese question mark
                 )
             )
         )
@@ -355,40 +354,11 @@ class ChatLog:
                 if self.delta_listener:
                     self.delta_listener(self, asdict(tool_result))
 
-    async def _async_expand_prompt_template(
-        self,
-        llm_context: llm.LLMContext,
-        prompt: str,
-        language: str,
-        user_name: str | None = None,
-    ) -> str:
-        try:
-            return template.Template(prompt, self.hass).async_render(
-                {
-                    "ha_name": self.hass.config.location_name,
-                    "user_name": user_name,
-                    "llm_context": llm_context,
-                },
-                parse_result=False,
-            )
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            intent_response = intent.IntentResponse(language=language)
-            intent_response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                "Sorry, I had a problem with my template",
-            )
-            raise ConverseError(
-                "Error rendering prompt",
-                conversation_id=self.conversation_id,
-                response=intent_response,
-            ) from err
-
     async def async_update_llm_data(
         self,
         conversing_domain: str,
         user_input: ConversationInput,
-        user_llm_hass_api: str | list[str] | None = None,
+        user_llm_hass_api: str | None = None,
         user_llm_prompt: str | None = None,
     ) -> None:
         """Set the LLM system prompt."""
@@ -439,28 +409,38 @@ class ChatLog:
         ):
             user_name = user.name
 
-        prompt_parts = []
-        prompt_parts.append(
-            await self._async_expand_prompt_template(
-                llm_context,
-                (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                user_input.language,
-                user_name,
+        try:
+            prompt_parts = [
+                template.Template(
+                    llm.BASE_PROMPT
+                    + (user_llm_prompt or llm.DEFAULT_INSTRUCTIONS_PROMPT),
+                    self.hass,
+                ).async_render(
+                    {
+                        "ha_name": self.hass.config.location_name,
+                        "user_name": user_name,
+                        "llm_context": llm_context,
+                    },
+                    parse_result=False,
+                )
+            ]
+
+        except TemplateError as err:
+            LOGGER.error("Error rendering prompt: %s", err)
+            intent_response = intent.IntentResponse(language=user_input.language)
+            intent_response.async_set_error(
+                intent.IntentResponseErrorCode.UNKNOWN,
+                "Sorry, I had a problem with my template",
             )
-        )
+            raise ConverseError(
+                "Error rendering prompt",
+                conversation_id=self.conversation_id,
+                response=intent_response,
+            ) from err
 
         if llm_api:
             prompt_parts.append(llm_api.api_prompt)
 
-        prompt_parts.append(
-            await self._async_expand_prompt_template(
-                llm_context,
-                llm.BASE_PROMPT,
-                user_input.language,
-                user_name,
-            )
-        )
-
         if extra_system_prompt := (
             # Take new system prompt if one was given
             user_input.extra_system_prompt or self.extra_system_prompt

homeassistant/components/cookidoo/strings.json

@@ -6,7 +6,7 @@
         "data": {
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "country": "[%key:common::config_flow::data::country%]"
+          "country": "Country"
         },
         "data_description": {
           "email": "Email used to access your {cookidoo} account.",

homeassistant/components/cover/reproduce_state.py

@@ -73,14 +73,14 @@ async def _async_set_position(
     Returns True if the position was set, False if there is no
     supported method for setting the position.
     """
-    if CoverEntityFeature.SET_POSITION in features:
-        await service_call(
-            SERVICE_SET_COVER_POSITION, service_data | {ATTR_POSITION: target_position}
-        )
-    elif target_position == FULL_CLOSE and CoverEntityFeature.CLOSE in features:
+    if target_position == FULL_CLOSE and CoverEntityFeature.CLOSE in features:
         await service_call(SERVICE_CLOSE_COVER, service_data)
     elif target_position == FULL_OPEN and CoverEntityFeature.OPEN in features:
         await service_call(SERVICE_OPEN_COVER, service_data)
+    elif CoverEntityFeature.SET_POSITION in features:
+        await service_call(
+            SERVICE_SET_COVER_POSITION, service_data | {ATTR_POSITION: target_position}
+        )
     else:
         # Requested a position but the cover doesn't support it
         return False
@@ -98,17 +98,15 @@ async def _async_set_tilt_position(
     Returns True if the tilt position was set, False if there is no
     supported method for setting the tilt position.
     """
-    if CoverEntityFeature.SET_TILT_POSITION in features:
+    if target_tilt_position == FULL_CLOSE and CoverEntityFeature.CLOSE_TILT in features:
+        await service_call(SERVICE_CLOSE_COVER_TILT, service_data)
+    elif target_tilt_position == FULL_OPEN and CoverEntityFeature.OPEN_TILT in features:
+        await service_call(SERVICE_OPEN_COVER_TILT, service_data)
+    elif CoverEntityFeature.SET_TILT_POSITION in features:
         await service_call(
             SERVICE_SET_COVER_TILT_POSITION,
             service_data | {ATTR_TILT_POSITION: target_tilt_position},
         )
-    elif (
-        target_tilt_position == FULL_CLOSE and CoverEntityFeature.CLOSE_TILT in features
-    ):
-        await service_call(SERVICE_CLOSE_COVER_TILT, service_data)
-    elif target_tilt_position == FULL_OPEN and CoverEntityFeature.OPEN_TILT in features:
-        await service_call(SERVICE_OPEN_COVER_TILT, service_data)
     else:
         # Requested a tilt position but the cover doesn't support it
         return False
@@ -185,12 +183,12 @@ async def _async_reproduce_state(
     current_attrs = cur_state.attributes
     target_attrs = state.attributes
 
-    current_position: int | None = current_attrs.get(ATTR_CURRENT_POSITION)
-    target_position: int | None = target_attrs.get(ATTR_CURRENT_POSITION)
+    current_position = current_attrs.get(ATTR_CURRENT_POSITION)
+    target_position = target_attrs.get(ATTR_CURRENT_POSITION)
     position_matches = current_position == target_position
 
-    current_tilt_position: int | None = current_attrs.get(ATTR_CURRENT_TILT_POSITION)
-    target_tilt_position: int | None = target_attrs.get(ATTR_CURRENT_TILT_POSITION)
+    current_tilt_position = current_attrs.get(ATTR_CURRENT_TILT_POSITION)
+    target_tilt_position = target_attrs.get(ATTR_CURRENT_TILT_POSITION)
     tilt_position_matches = current_tilt_position == target_tilt_position
 
     state_matches = cur_state.state == target_state
@@ -216,11 +214,19 @@ async def _async_reproduce_state(
     )
     service_data = {ATTR_ENTITY_ID: entity_id}
 
-    set_position = target_position is not None and await _async_set_position(
-        service_call, service_data, features, target_position
+    set_position = (
+        not position_matches
+        and target_position is not None
+        and await _async_set_position(
+            service_call, service_data, features, target_position
+        )
     )
-    set_tilt = target_tilt_position is not None and await _async_set_tilt_position(
-        service_call, service_data, features, target_tilt_position
+    set_tilt = (
+        not tilt_position_matches
+        and target_tilt_position is not None
+        and await _async_set_tilt_position(
+            service_call, service_data, features, target_tilt_position
+        )
     )
 
     if target_state in CLOSING_STATES:

homeassistant/components/cover/strings.json

@@ -38,10 +38,10 @@
       "name": "[%key:component::cover::title%]",
       "state": {
         "open": "[%key:common::state::open%]",
-        "opening": "[%key:common::state::opening%]",
+        "opening": "Opening",
         "closed": "[%key:common::state::closed%]",
-        "closing": "[%key:common::state::closing%]",
-        "stopped": "[%key:common::state::stopped%]"
+        "closing": "Closing",
+        "stopped": "Stopped"
       },
       "state_attributes": {
         "current_position": {

homeassistant/components/daikin/__init__.py

@@ -21,7 +21,6 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
-from homeassistant.util.ssl import client_context_no_verify
 
 from .const import KEY_MAC, TIMEOUT
 from .coordinator import DaikinConfigEntry, DaikinCoordinator
@@ -49,7 +48,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo
                 key=entry.data.get(CONF_API_KEY),
                 uuid=entry.data.get(CONF_UUID),
                 password=entry.data.get(CONF_PASSWORD),
-                ssl_context=client_context_no_verify(),
             )
         _LOGGER.debug("Connection to %s successful", host)
     except TimeoutError as err:

homeassistant/components/daikin/config_flow.py

@@ -18,7 +18,6 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PASSWORD, CONF_UUID
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
-from homeassistant.util.ssl import client_context_no_verify
 
 from .const import DOMAIN, KEY_MAC, TIMEOUT
 
@@ -91,7 +90,6 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
                     key=key,
                     uuid=uuid,
                     password=password,
-                    ssl_context=client_context_no_verify(),
                 )
         except (TimeoutError, ClientError):
             self.host = None

homeassistant/components/daikin/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/daikin",
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
-  "requirements": ["pydaikin==2.15.0"],
+  "requirements": ["pydaikin==2.14.1"],
   "zeroconf": ["_dkapi._tcp.local."]
 }

homeassistant/components/deluge/strings.json

@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "description": "To be able to use this integration, you have to enable the following option in Deluge settings: Daemon > Allow remote controls",
+        "description": "To be able to use this integration, you have to enable the following option in deluge settings: Daemon > Allow remote controls",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",

homeassistant/components/demo/icons.json

@@ -45,17 +45,6 @@
         }
       }
     },
-    "light": {
-      "bed_light": {
-        "state_attributes": {
-          "effect": {
-            "state": {
-              "rainbow": "mdi:looks"
-            }
-          }
-        }
-      }
-    },
     "number": {
       "volume": {
         "default": "mdi:volume-high"

homeassistant/components/demo/light.py

@@ -15,7 +15,6 @@ from homeassistant.components.light import (
     ATTR_WHITE,
     DEFAULT_MAX_KELVIN,
     DEFAULT_MIN_KELVIN,
-    EFFECT_OFF,
     ColorMode,
     LightEntity,
     LightEntityFeature,
@@ -29,7 +28,7 @@ from . import DOMAIN
 
 LIGHT_COLORS = [(56, 86), (345, 75)]
 
-LIGHT_EFFECT_LIST = ["rainbow", EFFECT_OFF]
+LIGHT_EFFECT_LIST = ["rainbow", "none"]
 
 LIGHT_TEMPS = [4166, 2631]
 
@@ -49,7 +48,6 @@ async def async_setup_entry(
                 available=True,
                 effect_list=LIGHT_EFFECT_LIST,
                 effect=LIGHT_EFFECT_LIST[0],
-                translation_key="bed_light",
                 device_name="Bed Light",
                 state=False,
                 unique_id="light_1",
@@ -121,10 +119,8 @@ class DemoLight(LightEntity):
         rgbw_color: tuple[int, int, int, int] | None = None,
         rgbww_color: tuple[int, int, int, int, int] | None = None,
         supported_color_modes: set[ColorMode] | None = None,
-        translation_key: str | None = None,
     ) -> None:
         """Initialize the light."""
-        self._attr_translation_key = translation_key
         self._available = True
         self._brightness = brightness
         self._ct = ct or random.choice(LIGHT_TEMPS)

homeassistant/components/demo/media_player.py

@@ -41,7 +41,6 @@ async def async_setup_entry(
             DemoTVShowPlayer(),
             DemoBrowsePlayer("Browse"),
             DemoGroupPlayer("Group"),
-            DemoSearchPlayer("Search"),
         ]
     )
 
@@ -96,8 +95,6 @@ NETFLIX_PLAYER_SUPPORT = (
 
 BROWSE_PLAYER_SUPPORT = MediaPlayerEntityFeature.BROWSE_MEDIA
 
-SEARCH_PLAYER_SUPPORT = MediaPlayerEntityFeature.SEARCH_MEDIA
-
 
 class AbstractDemoPlayer(MediaPlayerEntity):
     """A demo media players."""
@@ -401,9 +398,3 @@ class DemoGroupPlayer(AbstractDemoPlayer):
         | MediaPlayerEntityFeature.GROUPING
         | MediaPlayerEntityFeature.TURN_OFF
     )
-
-
-class DemoSearchPlayer(AbstractDemoPlayer):
-    """A Demo media player that supports searching."""
-
-    _attr_supported_features = SEARCH_PLAYER_SUPPORT

homeassistant/components/demo/strings.json

@@ -28,10 +28,10 @@
         "state_attributes": {
           "fan_mode": {
             "state": {
-              "auto_high": "Auto high",
-              "auto_low": "Auto low",
-              "on_high": "On high",
-              "on_low": "On low"
+              "auto_high": "Auto High",
+              "auto_low": "Auto Low",
+              "on_high": "On High",
+              "on_low": "On Low"
             }
           },
           "swing_mode": {
@@ -39,14 +39,14 @@
               "1": "1",
               "2": "2",
               "3": "3",
-              "auto": "[%key:common::state::auto%]",
+              "auto": "Auto",
               "off": "[%key:common::state::off%]"
             }
           },
           "swing_horizontal_mode": {
             "state": {
               "rangefull": "Full range",
-              "auto": "[%key:common::state::auto%]",
+              "auto": "Auto",
               "off": "[%key:common::state::off%]"
             }
           }
@@ -58,7 +58,7 @@
         "state_attributes": {
           "preset_mode": {
             "state": {
-              "auto": "[%key:common::state::auto%]",
+              "auto": "[%key:component::climate::entity_component::_::state_attributes::fan_mode::state::auto%]",
               "sleep": "[%key:component::climate::entity_component::_::state_attributes::preset_mode::state::sleep%]",
               "smart": "Smart",
               "on": "[%key:common::state::on%]"
@@ -78,23 +78,12 @@
         }
       }
     },
-    "light": {
-      "bed_light": {
-        "state_attributes": {
-          "effect": {
-            "state": {
-              "rainbow": "Rainbow"
-            }
-          }
-        }
-      }
-    },
     "select": {
       "speed": {
         "state": {
-          "light_speed": "Light speed",
-          "ludicrous_speed": "Ludicrous speed",
-          "ridiculous_speed": "Ridiculous speed"
+          "light_speed": "Light Speed",
+          "ludicrous_speed": "Ludicrous Speed",
+          "ridiculous_speed": "Ridiculous Speed"
         }
       }
     },
@@ -113,7 +102,7 @@
       "model_s": {
         "state_attributes": {
           "cleaned_area": {
-            "name": "Cleaned area"
+            "name": "Cleaned Area"
           }
         }
       }

homeassistant/components/devolo_home_network/device_tracker.py

@@ -88,8 +88,6 @@ class DevoloScannerEntity(  # pylint: disable=hass-enforce-class-module
 ):
     """Representation of a devolo device tracker."""
 
-    _attr_translation_key = "device_tracker"
-
     def __init__(
         self,
         coordinator: DevoloDataUpdateCoordinator[list[ConnectedStationInfo]],
@@ -125,6 +123,13 @@ class DevoloScannerEntity(  # pylint: disable=hass-enforce-class-module
             )
         return attrs
 
+    @property
+    def icon(self) -> str:
+        """Return device icon."""
+        if self.is_connected:
+            return "mdi:lan-connect"
+        return "mdi:lan-disconnect"
+
     @property
     def is_connected(self) -> bool:
         """Return true if the device is connected to the network."""

homeassistant/components/devolo_home_network/icons.json

@@ -13,14 +13,6 @@
         "default": "mdi:wifi-plus"
       }
     },
-    "device_tracker": {
-      "device_tracker": {
-        "default": "mdi:lan-disconnect",
-        "state": {
-          "home": "mdi:lan-connect"
-        }
-      }
-    },
     "sensor": {
       "connected_plc_devices": {
         "default": "mdi:lan"

homeassistant/components/devolo_home_network/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["devolo_plc_api"],
-  "requirements": ["devolo-plc-api==1.5.1"],
+  "requirements": ["devolo-plc-api==1.4.1"],
   "zeroconf": [
     {
       "type": "_dvl-deviceapi._tcp.local.",

homeassistant/components/devolo_home_network/switch.py

@@ -114,14 +114,9 @@ class DevoloSwitchEntity[_DataT: _DataType](
                 translation_key="password_protected",
                 translation_placeholders={"title": self.entry.title},
             ) from ex
-        except DeviceUnavailable as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="no_response",
-                translation_placeholders={"title": self.entry.title},
-            ) from ex
-        finally:
-            await self.coordinator.async_request_refresh()
+        except DeviceUnavailable:
+            pass  # The coordinator will handle this
+        await self.coordinator.async_request_refresh()
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the entity off."""
@@ -134,11 +129,6 @@ class DevoloSwitchEntity[_DataT: _DataType](
                 translation_key="password_protected",
                 translation_placeholders={"title": self.entry.title},
             ) from ex
-        except DeviceUnavailable as ex:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="no_response",
-                translation_placeholders={"title": self.entry.title},
-            ) from ex
-        finally:
-            await self.coordinator.async_request_refresh()
+        except DeviceUnavailable:
+            pass  # The coordinator will handle this
+        await self.coordinator.async_request_refresh()

homeassistant/components/doods/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "local_polling",
   "loggers": ["pydoods"],
   "quality_scale": "legacy",
-  "requirements": ["pydoods==1.0.2", "Pillow==11.2.1"]
+  "requirements": ["pydoods==1.0.2", "Pillow==11.1.0"]
 }

homeassistant/components/drop_connect/strings.json

@@ -38,8 +38,8 @@
       "protect_mode": {
         "name": "Protect mode",
         "state": {
-          "away": "[%key:common::state::not_home%]",
-          "home": "[%key:common::state::home%]",
+          "away": "Away",
+          "home": "Home",
           "schedule": "Schedule"
         }
       }

homeassistant/components/dsmr/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["dsmr_parser"],
-  "requirements": ["dsmr-parser==1.4.3"]
+  "requirements": ["dsmr-parser==1.4.2"]
 }