touch ups

Co-authored-by: J. Nick Koston <nick+github@koston.org>

.gitattributes

@@ -15,6 +15,7 @@ Dockerfile.dev linguist-language=Dockerfile
 # Generated files
 CODEOWNERS linguist-generated=true
 homeassistant/generated/*.py linguist-generated=true
+pylint/plugins/pylint_home_assistant/generated/*.py linguist-generated=true
 machine/* linguist-generated=true
 mypy.ini linguist-generated=true
 requirements.txt linguist-generated=true

.github/workflows/ci.yaml

@@ -281,7 +281,7 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
           echo "::add-matcher::.github/workflows/matchers/codespell.json"
       - name: Run prek
-        uses: j178/prek-action@6ad80277337ad479fe43bd70701c3f7f8aa74db3 # v2.0.3
+        uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
         env:
           PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config,zizmor
           RUFF_OUTPUT_FORMAT: github
@@ -302,7 +302,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Run zizmor
-        uses: j178/prek-action@6ad80277337ad479fe43bd70701c3f7f8aa74db3 # v2.0.3
+        uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
         with:
           extra-args: --all-files zizmor
 
@@ -917,12 +917,38 @@ jobs:
           key: >-
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
+      - name: Restore pytest test counts cache
+        id: cache-pytest-counts
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: pytest_test_counts.json
+          key: >-
+            pytest-counts-${{ runner.os }}-${{ runner.arch }}-${{
+            steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}-${{ github.sha }}
+          restore-keys: |
+            pytest-counts-${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{ needs.info.outputs.python_cache_key }}-
       - name: Run split_tests.py
         env:
           TEST_GROUP_COUNT: ${{ needs.info.outputs.test_group_count }}
         run: |
           . venv/bin/activate
-          python -m script.split_tests ${TEST_GROUP_COUNT} tests
+          python -m script.split_tests \
+            --cache pytest_test_counts.json \
+            ${TEST_GROUP_COUNT} tests
+      - name: Save pytest test counts cache
+        # Only the canonical dev push writes the cache, otherwise every PR
+        # build would create a new entry and the actions/cache quota fills
+        # up with near-duplicate snapshots.  PRs and feature branches still
+        # restore from dev's most recent cache via restore-keys.
+        if: |
+          github.event_name == 'push'
+          && github.ref == 'refs/heads/dev'
+          && steps.cache-pytest-counts.outputs.cache-hit != 'true'
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: pytest_test_counts.json
+          key: ${{ steps.cache-pytest-counts.outputs.cache-primary-key }}
       - name: Upload pytest_buckets
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:

.github/workflows/codeql.yml

@@ -28,11 +28,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
         with:
           category: "/language:python"

homeassistant/components/alarmdecoder/icons.json

@@ -11,7 +11,7 @@
       "service": "mdi:dialpad"
     },
     "alarm_toggle_chime": {
-      "service": "mdi:abc"
+      "service": "mdi:bell-ring"
     }
   }
 }

homeassistant/components/alexa_devices/coordinator.py

@@ -91,7 +91,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
                 translation_placeholders={"error": repr(err)},
             ) from err
         except CannotAuthenticate as err:
-            # pylint: disable-next=home-assistant-exception-translation-key-missing
             raise ConfigEntryAuthFailed(
                 translation_domain=DOMAIN,
                 translation_key="invalid_auth",

homeassistant/components/alexa_devices/strings.json

@@ -102,6 +102,9 @@
     "entry_not_loaded": {
       "message": "Entry not loaded: {entry}"
     },
+    "invalid_auth": {
+      "message": "Invalid authentication credentials: {error}"
+    },
     "invalid_device_id": {
       "message": "Invalid device ID specified: {device_id}"
     },

homeassistant/components/analytics/__init__.py

@@ -5,12 +5,8 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.components import labs, websocket_api
-from homeassistant.components.hassio import HassioNotReadyError
-from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import discovery_flow
-from homeassistant.helpers.start import async_at_started
+from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
+from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
 
@@ -53,7 +49,6 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 DATA_COMPONENT: HassKey[Analytics] = HassKey(DOMAIN)
-_DATA_SNAPSHOTS_URL: HassKey[str | None] = HassKey(f"{DOMAIN}_snapshots_url")
 
 LABS_SNAPSHOT_FEATURE = "snapshots"
 
@@ -62,39 +57,18 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the analytics integration."""
     analytics_config = config.get(DOMAIN, {})
 
-    snapshots_url: str | None = None
     if CONF_SNAPSHOTS_URL in analytics_config:
         await labs.async_update_preview_feature(
             hass, DOMAIN, LABS_SNAPSHOT_FEATURE, enabled=True
         )
         snapshots_url = analytics_config[CONF_SNAPSHOTS_URL]
+    else:
+        snapshots_url = None
 
-    hass.data[_DATA_SNAPSHOTS_URL] = snapshots_url
-
-    discovery_flow.async_create_flow(
-        hass, DOMAIN, context={"source": SOURCE_SYSTEM}, data={}
-    )
-
-    websocket_api.async_register_command(hass, websocket_analytics)
-    websocket_api.async_register_command(hass, websocket_analytics_preferences)
-
-    hass.http.register_view(AnalyticsDevicesView)
-
-    return True
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Analytics from a config entry."""
-    snapshots_url = hass.data.get(_DATA_SNAPSHOTS_URL)
     analytics = Analytics(hass, snapshots_url)
 
-    try:
-        await analytics.load()
-    except HassioNotReadyError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="supervisor_not_ready",
-        ) from err
+    # Load stored data
+    await analytics.load()
 
     started = False
 
@@ -106,30 +80,26 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         if started:
             await analytics.async_schedule()
 
-    async def start_schedule(hass: HomeAssistant) -> None:
-        """Start the send schedule once Home Assistant has started."""
+    async def start_schedule(_event: Event) -> None:
+        """Start the send schedule after the started event."""
         nonlocal started
         started = True
         await analytics.async_schedule()
 
-    entry.async_on_unload(
-        labs.async_subscribe_preview_feature(
-            hass, DOMAIN, LABS_SNAPSHOT_FEATURE, _async_handle_labs_update
-        )
+    labs.async_subscribe_preview_feature(
+        hass, DOMAIN, LABS_SNAPSHOT_FEATURE, _async_handle_labs_update
     )
-    entry.async_on_unload(async_at_started(hass, start_schedule))
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, start_schedule)
+
+    websocket_api.async_register_command(hass, websocket_analytics)
+    websocket_api.async_register_command(hass, websocket_analytics_preferences)
+
+    hass.http.register_view(AnalyticsDevicesView)
 
     hass.data[DATA_COMPONENT] = analytics
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload an Analytics config entry."""
-    analytics = hass.data.pop(DATA_COMPONENT)
-    analytics.cancel_scheduled()
-    return True
-
-
 @callback
 @websocket_api.require_admin
 @websocket_api.websocket_command({vol.Required("type"): "analytics"})
@@ -139,9 +109,7 @@ def websocket_analytics(
     msg: dict[str, Any],
 ) -> None:
     """Return analytics preferences."""
-    if (analytics := hass.data.get(DATA_COMPONENT)) is None:
-        connection.send_error(msg["id"], websocket_api.ERR_NOT_FOUND, "Not loaded")
-        return
+    analytics = hass.data[DATA_COMPONENT]
     connection.send_result(
         msg["id"],
         {ATTR_PREFERENCES: analytics.preferences, ATTR_ONBOARDED: analytics.onboarded},
@@ -162,10 +130,8 @@ async def websocket_analytics_preferences(
     msg: dict[str, Any],
 ) -> None:
     """Update analytics preferences."""
-    if (analytics := hass.data.get(DATA_COMPONENT)) is None:
-        connection.send_error(msg["id"], websocket_api.ERR_NOT_FOUND, "Not loaded")
-        return
     preferences = msg[ATTR_PREFERENCES]
+    analytics = hass.data[DATA_COMPONENT]
 
     await analytics.save_preferences(preferences)
     await analytics.async_schedule()

homeassistant/components/analytics/analytics.py

@@ -299,8 +299,12 @@ class Analytics:
             self._data = AnalyticsData.from_dict(stored)
 
         if self.supervisor and not self.onboarded:
-            # This may raise HassioNotReadyError if Supervisor was unreachable.
-            # The caller is responsible for handling this and triggering a retry.
+            # This may raise HassioNotReadyError if Supervisor was unreachable
+            # during setup of the Supervisor integration. That will fail setup
+            # of this integration. However there is no better option at this time
+            # since we need to get the diagnostic setting from Supervisor to correctly
+            # setup this integration and we can't raise ConfigEntryNotReady to
+            # trigger a retry from async_setup.
             supervisor_info = hassio.get_supervisor_info(self._hass)
 
             # User have not configured analytics, get this setting from the supervisor
@@ -345,7 +349,8 @@ class Analytics:
             await self._save()
 
         if self.supervisor:
-            # The others may raise HassioNotReadyError if only some
+            # get_supervisor_info was called during setup so we can't get here
+            # if it raised. The others may raise HassioNotReadyError if only some
             # data was successfully fetched from Supervisor
             supervisor_info = hassio.get_supervisor_info(hass)
             with contextlib.suppress(hassio.HassioNotReadyError):
@@ -625,16 +630,6 @@ class Analytics:
                 err,
             )
 
-    @callback
-    def cancel_scheduled(self) -> None:
-        """Cancel all scheduled analytics tasks."""
-        if self._basic_scheduled is not None:
-            self._basic_scheduled()
-            self._basic_scheduled = None
-        if self._snapshot_scheduled is not None:
-            self._snapshot_scheduled()
-            self._snapshot_scheduled = None
-
     async def async_schedule(self) -> None:
         """Schedule analytics."""
         if not self.onboarded:

homeassistant/components/analytics/config_flow.py

@@ -1,19 +0,0 @@
-"""Config flow for Analytics integration."""
-
-from typing import Any
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-
-from .const import DOMAIN
-
-
-class AnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Analytics."""
-
-    VERSION = 1
-
-    async def async_step_system(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        return self.async_create_entry(title="Analytics", data={})

homeassistant/components/analytics/manifest.json

@@ -3,8 +3,6 @@
   "name": "Analytics",
   "after_dependencies": ["energy", "hassio", "recorder"],
   "codeowners": ["@home-assistant/core"],
-  "config_flow": true,
-  "single_config_entry": true,
   "dependencies": ["api", "websocket_api", "http"],
   "documentation": "https://www.home-assistant.io/integrations/analytics",
   "integration_type": "system",

homeassistant/components/analytics/strings.json

@@ -1,9 +1,4 @@
 {
-  "exceptions": {
-    "supervisor_not_ready": {
-      "message": "Supervisor was not ready during setup, will retry"
-    }
-  },
   "preview_features": {
     "snapshots": {
       "description": "We're creating the [Open Home Foundation Device Database](https://www.home-assistant.io/blog/2026/02/02/about-device-database/): a free, open source community-powered resource to help users find practical information about how smart home devices perform in real installations.\n\nYou can help us build it by opting in to share anonymized data about your devices. This data will only ever include device-specific details (like model or manufacturer) – never personally identifying information (like the names you assign).\n\nFind out how we process your data (should you choose to contribute) in our [Data Use Statement](https://www.openhomefoundation.org/device-database-data-use-statement).",

homeassistant/components/bluetooth/manifest.json

@@ -20,7 +20,7 @@
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.29.11",
-    "dbus-fast==5.0.0",
-    "habluetooth==6.1.0"
+    "dbus-fast==5.0.3",
+    "habluetooth==6.2.0"
   ]
 }

homeassistant/components/comelit/config_flow.py

@@ -65,11 +65,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
             translation_placeholders={"error": repr(err)},
         ) from err
     except aiocomelit_exceptions.CannotAuthenticate as err:
-        # pylint: disable-next=home-assistant-exception-placeholder-mismatch
         raise InvalidAuth(
             translation_domain=DOMAIN,
             translation_key="cannot_authenticate",
-            translation_placeholders={"error": repr(err)},
         ) from err
     finally:
         await api.logout()

homeassistant/components/currencylayer/sensor.py

@@ -61,7 +61,7 @@ class CurrencylayerSensor(SensorEntity):
     """Implementing the Currencylayer sensor."""
 
     _attr_attribution = "Data provided by currencylayer.com"
-    _attr_icon = "mdi:currency"
+    _attr_icon = "mdi:currency-usd"
 
     def __init__(self, rest: CurrencylayerData, base: str, quote: str) -> None:
         """Initialize the sensor."""

homeassistant/components/deconz/climate.py

@@ -26,12 +26,12 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.const import ATTR_LOCKED, ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import DeconzConfigEntry
-from .const import ATTR_LOCKED, ATTR_OFFSET, ATTR_VALVE
+from .const import ATTR_OFFSET, ATTR_VALVE
 from .entity import DeconzDevice
 from .hub import DeconzHub
 

homeassistant/components/deconz/const.py

@@ -43,8 +43,6 @@ PLATFORMS = [
 ]
 
 ATTR_DARK = "dark"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_LOCKED = "locked"
 ATTR_OFFSET = "offset"
 ATTR_ON = "on"
 ATTR_VALVE = "valve"

homeassistant/components/dhcp/manifest.json

@@ -16,7 +16,7 @@
   "quality_scale": "internal",
   "requirements": [
     "aiodhcpwatcher==1.2.1",
-    "aiodiscover==3.2.0",
+    "aiodiscover==3.2.3",
     "cached-ipaddress==1.0.1"
   ]
 }

homeassistant/components/evohome/icons.json

@@ -23,7 +23,7 @@
       "service": "mdi:refresh"
     },
     "set_dhw_override": {
-      "service": "mdi:water-heater"
+      "service": "mdi:water-boiler"
     },
     "set_system_mode": {
       "service": "mdi:pencil"

homeassistant/components/fing/utils.py

@@ -16,7 +16,7 @@ class DeviceType(Enum):
     GAME_CONSOLE = "mdi:nintendo-game-boy"
     STREAMING_DONGLE = "mdi:cast"
     LOUDSPEAKER = SOUND_SYSTEM = STB = SATELLITE = MUSIC = "mdi:speaker"
-    DISC_PLAYER = "mdi:disk-player"
+    DISC_PLAYER = "mdi:disc-player"
     REMOTE_CONTROL = "mdi:remote-tv"
     RADIO = "mdi:radio"
     PHOTO_CAMERA = PHOTOS = "mdi:camera"

homeassistant/components/fumis/icons.json

@@ -2,7 +2,7 @@
   "entity": {
     "button": {
       "sync_clock": {
-        "default": "mdi:clock-sync"
+        "default": "mdi:clock-check"
       }
     },
     "number": {

homeassistant/components/guntamatic/manifest.json

@@ -14,5 +14,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "silver",
-  "requirements": ["guntamatic==1.8.0"]
+  "requirements": ["guntamatic==1.9.0"]
 }

homeassistant/components/hive/const.py

@@ -2,8 +2,6 @@
 
 from homeassistant.const import Platform
 
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_MODE = "mode"
 ATTR_TIME_PERIOD = "time_period"
 ATTR_ONOFF = "on_off"
 CONF_CODE = "2fa"

homeassistant/components/hive/light.py

@@ -12,12 +12,12 @@ from homeassistant.components.light import (
     ColorMode,
     LightEntity,
 )
+from homeassistant.const import ATTR_MODE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import color as color_util
 
 from . import HiveConfigEntry, refresh_system
-from .const import ATTR_MODE
 from .entity import HiveEntity
 
 PARALLEL_UPDATES = 0

homeassistant/components/hive/switch.py

@@ -6,12 +6,11 @@ from typing import Any
 from apyhiveapi import Hive
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.const import EntityCategory
+from homeassistant.const import ATTR_MODE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import HiveConfigEntry, refresh_system
-from .const import ATTR_MODE
 from .entity import HiveEntity
 
 PARALLEL_UPDATES = 0

homeassistant/components/homewizard/manifest.json

@@ -13,6 +13,6 @@
   "iot_class": "local_polling",
   "loggers": ["homewizard_energy"],
   "quality_scale": "platinum",
-  "requirements": ["python-homewizard-energy==10.0.1"],
+  "requirements": ["python-homewizard-energy==10.1.0"],
   "zeroconf": ["_hwenergy._tcp.local.", "_homewizard._tcp.local."]
 }

homeassistant/components/homewizard/sensor.py

@@ -35,7 +35,6 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
-from homeassistant.util.variance import ignore_variance
 
 from .const import DOMAIN
 from .coordinator import HomeWizardConfigEntry, HWEnergyDeviceUpdateCoordinator
@@ -66,13 +65,6 @@ def to_percentage(value: float | None) -> float | None:
     return value * 100 if value is not None else None
 
 
-def uptime_to_datetime(value: int) -> datetime:
-    """Convert seconds to datetime timestamp."""
-    return utcnow().replace(microsecond=0) - timedelta(seconds=value)
-
-
-uptime_to_stable_datetime = ignore_variance(uptime_to_datetime, timedelta(minutes=5))
-
 SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     HomeWizardSensorEntityDescription(
         key="smr_version",
@@ -643,7 +635,7 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
     HomeWizardSensorEntityDescription(
         key="uptime",
         translation_key="uptime",
-        device_class=SensorDeviceClass.TIMESTAMP,
+        device_class=SensorDeviceClass.UPTIME,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         has_fn=(
@@ -651,7 +643,7 @@ SENSORS: Final[tuple[HomeWizardSensorEntityDescription, ...]] = (
         ),
         value_fn=(
             lambda data: (
-                uptime_to_stable_datetime(data.system.uptime_s)
+                utcnow() - timedelta(seconds=data.system.uptime_s)
                 if data.system is not None and data.system.uptime_s is not None
                 else None
             )

homeassistant/components/homewizard/strings.json

@@ -61,13 +61,14 @@
     },
     "select": {
       "battery_group_mode": {
-        "name": "Battery group mode",
+        "name": "Battery group charging strategy",
         "state": {
+          "predictive": "Smart charging",
           "standby": "Standby",
-          "to_full": "Manual charge mode",
-          "zero": "Zero mode",
-          "zero_charge_only": "Zero mode (charge only)",
-          "zero_discharge_only": "Zero mode (discharge only)"
+          "to_full": "One-time full charge",
+          "zero": "Net zero",
+          "zero_charge_only": "Net zero (charge only)",
+          "zero_discharge_only": "Net zero (discharge only)"
         }
       }
     },

homeassistant/components/hue/services.yaml

@@ -31,15 +31,16 @@ activate_scene:
     dynamic:
       selector:
         boolean:
-    speed:
-      advanced: true
-      selector:
-        number:
-          min: 0
-          max: 100
-    brightness:
-      advanced: true
-      selector:
-        number:
-          min: 1
-          max: 255
+    scene_customization:
+      collapsed: true
+      fields:
+        speed:
+          selector:
+            number:
+              min: 0
+              max: 100
+        brightness:
+          selector:
+            number:
+              min: 1
+              max: 255

homeassistant/components/hue/strings.json

@@ -184,7 +184,12 @@
           "name": "Transition"
         }
       },
-      "name": "Activate Hue scene"
+      "name": "Activate Hue scene",
+      "sections": {
+        "scene_customization": {
+          "name": "Scene customization"
+        }
+      }
     },
     "hue_activate_scene": {
       "description": "Activates a Hue scene stored in the Hue hub.",

homeassistant/components/hue/v2/device_trigger.py

@@ -87,6 +87,8 @@ def async_get_triggers(
 
     # Get Hue device id from device identifier
     hue_dev_id = get_hue_device_id(device_entry)
+    if hue_dev_id is None or hue_dev_id not in api.devices:
+        return []
     # extract triggers from all button resources of this Hue device
     triggers: list[dict[str, Any]] = []
     model_id = api.devices[hue_dev_id].product_data.product_name

homeassistant/components/jewish_calendar/icons.json

@@ -1,7 +1,7 @@
 {
   "entity": {
     "binary_sensor": {
-      "erev_shabbat_hag": { "default": "mdi:candle-light" },
+      "erev_shabbat_hag": { "default": "mdi:candle" },
       "issur_melacha_in_effect": { "default": "mdi:power-plug-off" },
       "motzei_shabbat_hag": { "default": "mdi:fire" }
     },

homeassistant/components/keba/icons.json

@@ -7,7 +7,7 @@
       "service": "mdi:lock-open"
     },
     "disable": {
-      "service": "mdi:fash-off"
+      "service": "mdi:flash-off"
     },
     "enable": {
       "service": "mdi:flash"

homeassistant/components/liebherr/icons.json

@@ -28,25 +28,25 @@
       "ice_maker": {
         "default": "mdi:cube-outline",
         "state": {
-          "off": "mdi:cube-outline-off"
+          "off": "mdi:cube-off-outline"
         }
       },
       "ice_maker_bottom_zone": {
         "default": "mdi:cube-outline",
         "state": {
-          "off": "mdi:cube-outline-off"
+          "off": "mdi:cube-off-outline"
         }
       },
       "ice_maker_middle_zone": {
         "default": "mdi:cube-outline",
         "state": {
-          "off": "mdi:cube-outline-off"
+          "off": "mdi:cube-off-outline"
         }
       },
       "ice_maker_top_zone": {
         "default": "mdi:cube-outline",
         "state": {
-          "off": "mdi:cube-outline-off"
+          "off": "mdi:cube-off-outline"
         }
       }
     },

homeassistant/components/lutron_caseta/binary_sensor.py

@@ -3,7 +3,7 @@
 from datetime import timedelta
 from typing import Any
 
-from pylutron_caseta import OCCUPANCY_GROUP_OCCUPIED
+from pylutron_caseta import OCCUPANCY_GROUP_OCCUPIED, BridgeResponseError
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -131,7 +131,11 @@ class LutronCasetaBatterySensor(LutronCasetaEntity, BinarySensorEntity):
 
     async def async_update(self) -> None:
         """Fetch the latest battery status from the bridge."""
-        status = await self._smartbridge.get_battery_status(self.device_id)
+        try:
+            status = await self._smartbridge.get_battery_status(self.device_id)
+        except BridgeResponseError:
+            self._attr_is_on = None
+            return
         normalized_status = status.strip().casefold() if status else None
         if normalized_status == BATTERY_STATUS_LOW:
             self._attr_is_on = True

homeassistant/components/matter/icons.json

@@ -102,7 +102,7 @@
         "default": "mdi:home-lightning-bolt"
       },
       "eve_weather_trend": {
-        "default": "mdi:weather",
+        "default": "mdi:weather-cloudy",
         "state": {
           "cloudy": "mdi:weather-cloudy",
           "rainy": "mdi:weather-rainy",

homeassistant/components/mcp/__init__.py

@@ -4,12 +4,13 @@ from dataclasses import dataclass
 from typing import cast
 
 from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_entry_oauth2_flow, llm
 
 from .application_credentials import authorization_server_context
-from .const import CONF_ACCESS_TOKEN, CONF_AUTHORIZATION_URL, CONF_TOKEN_URL, DOMAIN
+from .const import CONF_AUTHORIZATION_URL, CONF_TOKEN_URL, DOMAIN
 from .coordinator import ModelContextProtocolCoordinator, TokenManager
 from .types import ModelContextProtocolConfigEntry
 

homeassistant/components/mcp/config_flow.py

@@ -13,7 +13,7 @@ from yarl import URL
 
 from homeassistant.components.application_credentials import AuthorizationServer
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_TOKEN, CONF_URL
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
@@ -24,13 +24,7 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 
 from . import async_get_config_entry_implementation
 from .application_credentials import authorization_server_context
-from .const import (
-    CONF_ACCESS_TOKEN,
-    CONF_AUTHORIZATION_URL,
-    CONF_SCOPE,
-    CONF_TOKEN_URL,
-    DOMAIN,
-)
+from .const import CONF_AUTHORIZATION_URL, CONF_SCOPE, CONF_TOKEN_URL, DOMAIN
 from .coordinator import TokenManager, mcp_client
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/mcp/const.py

@@ -2,8 +2,6 @@
 
 DOMAIN = "mcp"
 
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_ACCESS_TOKEN = "access_token"
 CONF_AUTHORIZATION_URL = "authorization_url"
 CONF_TOKEN_URL = "token_url"
 CONF_SCOPE = "scope"

homeassistant/components/mcp_server/http.py

@@ -41,7 +41,7 @@ from mcp.shared.message import SessionMessage
 
 from homeassistant.components import conversation
 from homeassistant.components.http import KEY_HASS, HomeAssistantView
-from homeassistant.const import CONF_LLM_HASS_API
+from homeassistant.const import CONF_LLM_HASS_API, CONTENT_TYPE_JSON
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.helpers import llm
 
@@ -56,10 +56,6 @@ _LOGGER = logging.getLogger(__name__)
 STREAMABLE_API = "/api/mcp"
 TIMEOUT = 60  # Seconds
 
-# Content types
-# pylint: disable-next=home-assistant-duplicate-const
-CONTENT_TYPE_JSON = "application/json"
-
 # Legacy SSE endpoint
 SSE_API = f"/{DOMAIN}/sse"
 MESSAGES_API = f"/{DOMAIN}/messages/{{session_id}}"

homeassistant/components/nina/binary_sensor.py

@@ -6,6 +6,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
+from homeassistant.const import ATTR_ID
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -14,7 +15,6 @@ from .const import (
     ATTR_DESCRIPTION,
     ATTR_EXPIRES,
     ATTR_HEADLINE,
-    ATTR_ID,
     ATTR_RECOMMENDED_ACTIONS,
     ATTR_SENDER,
     ATTR_SENT,

homeassistant/components/nina/const.py

@@ -29,8 +29,6 @@ ATTR_SEVERITY: str = "severity"
 ATTR_RECOMMENDED_ACTIONS: str = "recommended_actions"
 ATTR_AFFECTED_AREAS: str = "affected_areas"
 ATTR_WEB: str = "web"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_ID: str = "id"
 ATTR_SENT: str = "sent"
 ATTR_START: str = "start"
 ATTR_EXPIRES: str = "expires"

homeassistant/components/openai_conversation/entity.py

@@ -595,8 +595,8 @@ class OpenAIBaseLLMEntity(Entity):
                     )
                 )
 
-                if "reasoning" not in model_args:
-                    # Reasoning models handle this correctly with just a prompt
+                if not model_args["model"].startswith("o"):
+                    # o-series models handle this correctly with just a prompt
                     remove_citations = True
 
             tools.append(web_search)

homeassistant/components/opendisplay/manifest.json

@@ -15,5 +15,5 @@
   "iot_class": "local_push",
   "loggers": ["opendisplay"],
   "quality_scale": "silver",
-  "requirements": ["py-opendisplay==5.9.0"]
+  "requirements": ["py-opendisplay==7.2.3"]
 }

homeassistant/components/opendisplay/services.py

@@ -218,7 +218,7 @@ async def _async_upload_image(call: ServiceCall) -> None:
                 pil_image,
                 refresh_mode=refresh_mode,
                 dither_mode=dither_mode,
-                tone_compression=tone_compression,
+                tone=tone_compression,
                 fit=fit_mode,
                 rotate=rotation,
             )

homeassistant/components/openhome/config_flow.py

@@ -37,11 +37,15 @@ class OpenhomeConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("async_step_ssdp: Incomplete discovery, ignoring")
             return self.async_abort(reason="incomplete_discovery")
 
-        _LOGGER.debug(
-            "async_step_ssdp: setting unique id %s", discovery_info.upnp[ATTR_UPNP_UDN]
-        )
+        udn = discovery_info.upnp[ATTR_UPNP_UDN]
+        if isinstance(udn, list):
+            if not udn:
+                return self.async_abort(reason="incomplete_discovery")
+            udn = udn[0]
 
-        await self.async_set_unique_id(discovery_info.upnp[ATTR_UPNP_UDN])
+        _LOGGER.debug("async_step_ssdp: setting unique id %s", udn)
+
+        await self.async_set_unique_id(udn)
         self._abort_if_unique_id_configured({CONF_HOST: discovery_info.ssdp_location})
 
         _LOGGER.debug(

homeassistant/components/portainer/icons.json

@@ -118,6 +118,9 @@
   "services": {
     "prune_images": {
       "service": "mdi:delete-sweep"
+    },
+    "recreate_container": {
+      "service": "mdi:restart"
     }
   }
 }

homeassistant/components/portainer/services.py

@@ -20,6 +20,9 @@ from .coordinator import PortainerConfigEntry
 
 ATTR_DATE_UNTIL = "until"
 ATTR_DANGLING = "dangling"
+ATTR_TIMEOUT = "timeout"
+ATTR_PULL_IMAGE = "pull_image"
+ATTR_CONTAINER_DEVICE_ID = "container_device_id"
 
 SERVICE_PRUNE_IMAGES = "prune_images"
 SERVICE_PRUNE_IMAGES_SCHEMA = vol.Schema(
@@ -32,6 +35,17 @@ SERVICE_PRUNE_IMAGES_SCHEMA = vol.Schema(
     },
 )
 
+SERVICE_RECREATE_CONTAINER = "recreate_container"
+SERVICE_RECREATE_CONTAINER_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONTAINER_DEVICE_ID): cv.string,
+        vol.Optional(ATTR_TIMEOUT): vol.All(
+            cv.time_period, vol.Range(min=timedelta(minutes=1))
+        ),
+        vol.Optional(ATTR_PULL_IMAGE): cv.boolean,
+    }
+)
+
 
 async def _extract_config_entry(service_call: ServiceCall) -> PortainerConfigEntry:
     """Extract config entry from the service call."""
@@ -75,6 +89,45 @@ async def _get_endpoint_id(
     return endpoint_data.endpoint.id
 
 
+async def _get_container_and_endpoint_ids(
+    call: ServiceCall,
+) -> tuple[PortainerConfigEntry, int, str]:
+    """Get config entry, endpoint ID and container ID from the container device ID."""
+    device_reg = dr.async_get(call.hass)
+    device = device_reg.async_get(call.data[ATTR_CONTAINER_DEVICE_ID])
+    if device is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="invalid_target",
+        )
+
+    config_entry: PortainerConfigEntry | None = None
+    for loaded_entry in call.hass.config_entries.async_loaded_entries(DOMAIN):
+        if loaded_entry.entry_id in device.config_entries:
+            config_entry = loaded_entry
+            break
+
+    if config_entry is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="invalid_target",
+        )
+
+    coordinator = config_entry.runtime_data
+    for data in coordinator.data.values():
+        for container_name, container_data in data.containers.items():
+            if (
+                DOMAIN,
+                f"{config_entry.entry_id}_{data.endpoint.id}_{container_name}",
+            ) in device.identifiers:
+                return config_entry, data.endpoint.id, container_data.container.id
+
+    raise ServiceValidationError(
+        translation_domain=DOMAIN,
+        translation_key="invalid_target",
+    )
+
+
 async def prune_images(call: ServiceCall) -> None:
     """Prune unused images in Portainer, with more controls."""
     config_entry = await _extract_config_entry(call)
@@ -104,6 +157,40 @@ async def prune_images(call: ServiceCall) -> None:
         ) from err
 
 
+async def recreate_container(call: ServiceCall) -> None:
+    """Recreate a container in Portainer, with more controls."""
+    config_entry, endpoint_id, container_id = await _get_container_and_endpoint_ids(
+        call
+    )
+    coordinator = config_entry.runtime_data
+    timeout: timedelta | None = call.data.get(ATTR_TIMEOUT)
+
+    try:
+        await coordinator.portainer.container_recreate(
+            endpoint_id=endpoint_id,
+            container_id=container_id,
+            **({"timeout": timeout} if timeout is not None else {}),
+            pull_image=call.data.get(ATTR_PULL_IMAGE, False),
+        )
+    except PortainerAuthenticationError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="invalid_auth_no_details",
+        ) from err
+    except PortainerConnectionError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="cannot_connect_no_details",
+        ) from err
+    except PortainerTimeoutError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="timeout_connect_no_details",
+        ) from err
+
+    await coordinator.async_request_refresh()
+
+
 async def async_setup_services(hass: HomeAssistant) -> None:
     """Set up services."""
 
@@ -113,3 +200,10 @@ async def async_setup_services(hass: HomeAssistant) -> None:
         prune_images,
         SERVICE_PRUNE_IMAGES_SCHEMA,
     )
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_RECREATE_CONTAINER,
+        recreate_container,
+        SERVICE_RECREATE_CONTAINER_SCHEMA,
+    )

homeassistant/components/portainer/services.yaml

@@ -16,3 +16,20 @@ prune_images:
       required: false
       selector:
         boolean: {}
+
+recreate_container:
+  fields:
+    container_device_id:
+      required: true
+      selector:
+        device:
+          integration: portainer
+          model: Container
+    timeout:
+      required: false
+      selector:
+        duration:
+    pull_image:
+      required: false
+      selector:
+        boolean:

homeassistant/components/portainer/strings.json

@@ -235,6 +235,24 @@
         }
       },
       "name": "Prune unused images"
+    },
+    "recreate_container": {
+      "description": "Recreates a container on a Portainer endpoint. This is more disruptive than a restart as the container will be stopped, removed, and then re-created with the same configuration. Use with caution.",
+      "fields": {
+        "container_device_id": {
+          "description": "The container to recreate.",
+          "name": "Container"
+        },
+        "pull_image": {
+          "description": "Whether to pull the image before recreating the container. This can be used to update the container to the latest version of the image.",
+          "name": "Pull image"
+        },
+        "timeout": {
+          "description": "The time to wait for the container to stop before killing it. If not provided, a default of 5 minutes will be used.",
+          "name": "Timeout"
+        }
+      },
+      "name": "Recreate container"
     }
   },
   "system_health": {

homeassistant/components/rainmachine/icons.json

@@ -29,29 +29,29 @@
       }
     },
     "sensor": {
-      "translation_key_0": {
-        "default": "mdi:abc"
+      "flow_sensor_clicks_cubic_meter": {
+        "default": "mdi:water-pump"
       },
-      "translation_key_1": {
-        "default": "mdi:abc"
+      "flow_sensor_consumed_liters": {
+        "default": "mdi:water-pump"
       },
-      "translation_key_2": {
-        "default": "mdi:abc"
+      "flow_sensor_leak_clicks": {
+        "default": "mdi:pipe-leak"
       },
-      "translation_key_3": {
-        "default": "mdi:abc"
+      "flow_sensor_leak_volume": {
+        "default": "mdi:pipe-leak"
       },
-      "translation_key_4": {
-        "default": "mdi:abc"
+      "flow_sensor_start_index": {
+        "default": "mdi:water-pump"
       },
-      "translation_key_5": {
-        "default": "mdi:abc"
+      "flow_sensor_watering_clicks": {
+        "default": "mdi:water-pump"
       },
-      "translation_key_6": {
-        "default": "mdi:abc"
+      "last_leak_detected": {
+        "default": "mdi:pipe-leak"
       },
-      "translation_key_7": {
-        "default": "mdi:abc"
+      "rain_sensor_rain_start": {
+        "default": "mdi:weather-pouring"
       }
     },
     "switch": {

homeassistant/components/reolink/manifest.json

@@ -20,5 +20,5 @@
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
   "quality_scale": "platinum",
-  "requirements": ["reolink-aio==0.19.1"]
+  "requirements": ["reolink-aio==0.20.0"]
 }

homeassistant/components/roborock/config_flow.py

@@ -23,7 +23,7 @@ from homeassistant.config_entries import (
     ConfigFlowResult,
     OptionsFlowWithReload,
 )
-from homeassistant.const import CONF_USERNAME
+from homeassistant.const import CONF_REGION, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -38,7 +38,6 @@ from . import RoborockConfigEntry
 from .const import (
     CONF_BASE_URL,
     CONF_ENTRY_CODE,
-    CONF_REGION,
     CONF_SHOW_BACKGROUND,
     CONF_SHOW_ROOMS,
     CONF_SHOW_WALLS,

homeassistant/components/roborock/const.py

@@ -13,8 +13,6 @@ CONF_USER_DATA = "user_data"
 CONF_SHOW_BACKGROUND = "show_background"
 CONF_SHOW_WALLS = "show_walls"
 CONF_SHOW_ROOMS = "show_rooms"
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_REGION = "region"
 REGION_OPTIONS = ["auto", "us", "eu", "ru", "cn"]
 
 # Option Flow steps

homeassistant/components/skybeacon/sensor.py

@@ -15,6 +15,7 @@ from homeassistant.components.sensor import (
     SensorEntity,
 )
 from homeassistant.const import (
+    ATTR_MODEL,
     CONF_MAC,
     CONF_NAME,
     EVENT_HOMEASSISTANT_STOP,
@@ -30,8 +31,6 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_DEVICE = "device"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_MODEL = "model"
 
 BLE_TEMP_HANDLE = 0x24
 BLE_TEMP_UUID = "0000ff92-0000-1000-8000-00805f9b34fb"

homeassistant/components/sleepiq/const.py

@@ -1,5 +1,7 @@
 """Define constants for the SleepIQ component."""
 
+from homeassistant.const import PRESSURE
+
 DATA_SLEEPIQ = "data_sleepiq"
 DOMAIN = "sleepiq"
 
@@ -11,8 +13,6 @@ FIRMNESS = "firmness"
 ICON_EMPTY = "mdi:bed-empty"
 ICON_OCCUPIED = "mdi:bed"
 IS_IN_BED = "is_in_bed"
-# pylint: disable-next=home-assistant-duplicate-const
-PRESSURE = "pressure"
 SLEEP_NUMBER = "sleep_number"
 FOOT_WARMING_TIMER = "foot_warming_timer"
 FOOT_WARMER = "foot_warmer"

homeassistant/components/sleepiq/sensor.py

@@ -11,14 +11,13 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import UnitOfTime
+from homeassistant.const import PRESSURE, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
     HEART_RATE,
     HRV,
-    PRESSURE,
     RESPIRATORY_RATE,
     SLEEP_DURATION,
     SLEEP_NUMBER,

homeassistant/components/smarttub/sensor.py

@@ -7,6 +7,7 @@ import smarttub
 import voluptuous as vol
 
 from homeassistant.components.sensor import SensorEntity
+from homeassistant.const import ATTR_MODE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -19,8 +20,6 @@ from .entity import SmartTubOnboardSensorBase
 # the desired duration, in hours, of the cycle
 ATTR_DURATION = "duration"
 ATTR_CYCLE_LAST_UPDATED = "cycle_last_updated"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_MODE = "mode"
 # the hour of the day at which to start the cycle (0-23)
 ATTR_START_HOUR = "start_hour"
 

homeassistant/components/subaru/const.py

@@ -38,12 +38,8 @@ PLATFORMS = [
     Platform.SENSOR,
 ]
 
-# pylint: disable-next=home-assistant-duplicate-const
-SERVICE_LOCK = "lock"
 SERVICE_REMOTE_START = "remote_start"
 SERVICE_REMOTE_STOP = "remote_stop"
-# pylint: disable-next=home-assistant-duplicate-const
-SERVICE_UNLOCK = "unlock"
 SERVICE_UNLOCK_SPECIFIC_DOOR = "unlock_specific_door"
 
 ATTR_DOOR = "door"

homeassistant/components/subaru/remote_service.py

@@ -4,9 +4,10 @@ import logging
 
 from subarulink.exceptions import SubaruException
 
+from homeassistant.const import SERVICE_UNLOCK
 from homeassistant.exceptions import HomeAssistantError
 
-from .const import SERVICE_REMOTE_START, SERVICE_UNLOCK, VEHICLE_NAME, VEHICLE_VIN
+from .const import SERVICE_REMOTE_START, VEHICLE_NAME, VEHICLE_VIN
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/surepetcare/__init__.py

@@ -7,14 +7,13 @@ from surepy.enums import Location
 from surepy.exceptions import SurePetcareAuthenticationError, SurePetcareError
 import voluptuous as vol
 
-from homeassistant.const import Platform
+from homeassistant.const import ATTR_LOCATION, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 
 from .const import (
     ATTR_FLAP_ID,
-    ATTR_LOCATION,
     ATTR_LOCK_STATE,
     ATTR_PET_NAME,
     DOMAIN,

homeassistant/components/surepetcare/const.py

@@ -18,7 +18,5 @@ SURE_BATT_VOLTAGE_DIFF = SURE_BATT_VOLTAGE_FULL - SURE_BATT_VOLTAGE_LOW
 SERVICE_SET_LOCK_STATE = "set_lock_state"
 SERVICE_SET_PET_LOCATION = "set_pet_location"
 ATTR_FLAP_ID = "flap_id"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_LOCATION = "location"
 ATTR_LOCK_STATE = "lock_state"
 ATTR_PET_NAME = "pet_name"

homeassistant/components/surepetcare/coordinator.py

@@ -8,7 +8,7 @@ from surepy.enums import EntityType, Location, LockState
 from surepy.exceptions import SurePetcareAuthenticationError, SurePetcareError
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
+from homeassistant.const import ATTR_LOCATION, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -16,7 +16,6 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import (
     ATTR_FLAP_ID,
-    ATTR_LOCATION,
     ATTR_LOCK_STATE,
     ATTR_PET_NAME,
     DOMAIN,

homeassistant/components/system_bridge/__init__.py

@@ -454,9 +454,7 @@ async def async_unload_entry(
     hass: HomeAssistant, entry: SystemBridgeConfigEntry
 ) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(
-        entry, [platform for platform in PLATFORMS if platform != Platform.NOTIFY]
-    )
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
     if unload_ok:
         coordinator = entry.runtime_data
 

homeassistant/components/system_bridge/icons.json

@@ -17,15 +17,51 @@
       "boot_time": {
         "default": "mdi:av-timer"
       },
+      "cpu_power_core": {
+        "default": "mdi:chip"
+      },
       "cpu_power_package": {
         "default": "mdi:chip"
       },
       "cpu_speed": {
         "default": "mdi:speedometer"
       },
+      "display_refresh_rate": {
+        "default": "mdi:monitor"
+      },
+      "display_resolution_x": {
+        "default": "mdi:monitor"
+      },
+      "display_resolution_y": {
+        "default": "mdi:monitor"
+      },
       "displays_connected": {
         "default": "mdi:monitor"
       },
+      "gpu_core_clock_speed": {
+        "default": "mdi:speedometer"
+      },
+      "gpu_fan_speed": {
+        "default": "mdi:fan"
+      },
+      "gpu_memory_clock_speed": {
+        "default": "mdi:speedometer"
+      },
+      "gpu_memory_free": {
+        "default": "mdi:memory"
+      },
+      "gpu_memory_used": {
+        "default": "mdi:memory"
+      },
+      "gpu_memory_used_percentage": {
+        "default": "mdi:memory"
+      },
+      "gpu_power_usage": {
+        "default": "mdi:lightning-bolt"
+      },
+      "gpu_usage_percentage": {
+        "default": "mdi:percent"
+      },
       "kernel": {
         "default": "mdi:devices"
       },
@@ -38,6 +74,9 @@
       "memory_used": {
         "default": "mdi:memory"
       },
+      "memory_used_percentage": {
+        "default": "mdi:memory"
+      },
       "os": {
         "default": "mdi:devices"
       },
@@ -47,6 +86,12 @@
       "processes": {
         "default": "mdi:counter"
       },
+      "processes_load_cpu": {
+        "default": "mdi:percent"
+      },
+      "space_used": {
+        "default": "mdi:harddisk"
+      },
       "version": {
         "default": "mdi:counter"
       },

homeassistant/components/system_bridge/sensor.py

@@ -27,7 +27,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import UNDEFINED, StateType
+from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
 from .coordinator import SystemBridgeConfigEntry, SystemBridgeDataUpdateCoordinator
@@ -284,10 +284,10 @@ BASE_SENSOR_TYPES: tuple[SystemBridgeSensorEntityDescription, ...] = (
     ),
     SystemBridgeSensorEntityDescription(
         key="memory_used_percentage",
+        translation_key="memory_used_percentage",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
         suggested_display_precision=2,
-        icon="mdi:memory",
         value=lambda data: data.memory.virtual.percent,
     ),
     SystemBridgeSensorEntityDescription(
@@ -380,11 +380,11 @@ async def async_setup_entry(
                 coordinator,
                 SystemBridgeSensorEntityDescription(
                     key=f"filesystem_{partition.mount_point.replace(':', '')}",
-                    name=f"{partition.mount_point} space used",
+                    translation_key="space_used",
+                    translation_placeholders={"partition": partition.mount_point},
                     state_class=SensorStateClass.MEASUREMENT,
                     native_unit_of_measurement=PERCENTAGE,
                     suggested_display_precision=2,
-                    icon="mdi:harddisk",
                     value=(
                         lambda data, dk=index_device, pk=index_partition: (
                             partition_usage(data, dk, pk)
@@ -427,10 +427,10 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"display_{display.id}_resolution_x",
-                        name=f"Display {display.id} resolution x",
+                        translation_key="display_resolution_x",
+                        translation_placeholders={"display_id": display.id},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=PIXELS,
-                        icon="mdi:monitor",
                         value=lambda data, k=index: display_resolution_horizontal(
                             data, k
                         ),
@@ -441,10 +441,10 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"display_{display.id}_resolution_y",
-                        name=f"Display {display.id} resolution y",
+                        translation_key="display_resolution_y",
+                        translation_placeholders={"display_id": display.id},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=PIXELS,
-                        icon="mdi:monitor",
                         value=lambda data, k=index: display_resolution_vertical(
                             data, k
                         ),
@@ -455,12 +455,12 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"display_{display.id}_refresh_rate",
-                        name=f"Display {display.id} refresh rate",
+                        translation_key="display_refresh_rate",
+                        translation_placeholders={"display_id": display.id},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfFrequency.HERTZ,
                         device_class=SensorDeviceClass.FREQUENCY,
                         suggested_display_precision=0,
-                        icon="mdi:monitor",
                         value=lambda data, k=index: display_refresh_rate(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -474,13 +474,13 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_core_clock_speed",
-                        name=f"{gpu.name} clock speed",
+                        translation_key="gpu_core_clock_speed",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfFrequency.MEGAHERTZ,
                         device_class=SensorDeviceClass.FREQUENCY,
                         suggested_display_precision=0,
-                        icon="mdi:speedometer",
                         value=lambda data, k=index: gpu_core_clock_speed(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -489,13 +489,13 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_memory_clock_speed",
-                        name=f"{gpu.name} memory clock speed",
+                        translation_key="gpu_memory_clock_speed",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfFrequency.MEGAHERTZ,
                         device_class=SensorDeviceClass.FREQUENCY,
                         suggested_display_precision=0,
-                        icon="mdi:speedometer",
                         value=lambda data, k=index: gpu_memory_clock_speed(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -504,12 +504,12 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_memory_free",
-                        name=f"{gpu.name} memory free",
+                        translation_key="gpu_memory_free",
+                        translation_placeholders={"gpu_name": gpu.name},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
                         device_class=SensorDeviceClass.DATA_SIZE,
                         suggested_display_precision=0,
-                        icon="mdi:memory",
                         value=lambda data, k=index: gpu_memory_free(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -518,11 +518,11 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_memory_used_percentage",
-                        name=f"{gpu.name} memory used %",
+                        translation_key="gpu_memory_used_percentage",
+                        translation_placeholders={"gpu_name": gpu.name},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=PERCENTAGE,
                         suggested_display_precision=2,
-                        icon="mdi:memory",
                         value=lambda data, k=index: gpu_memory_used_percentage(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -531,13 +531,13 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_memory_used",
-                        name=f"{gpu.name} memory used",
+                        translation_key="gpu_memory_used",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfInformation.MEGABYTES,
                         device_class=SensorDeviceClass.DATA_SIZE,
                         suggested_display_precision=0,
-                        icon="mdi:memory",
                         value=lambda data, k=index: gpu_memory_used(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -546,11 +546,11 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_fan_speed",
-                        name=f"{gpu.name} fan speed",
+                        translation_key="gpu_fan_speed",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=REVOLUTIONS_PER_MINUTE,
-                        icon="mdi:fan",
                         value=lambda data, k=index: gpu_fan_speed(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -559,7 +559,8 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_power_usage",
-                        name=f"{gpu.name} power usage",
+                        translation_key="gpu_power_usage",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=UnitOfPower.WATT,
@@ -571,7 +572,8 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_temperature",
-                        name=f"{gpu.name} temperature",
+                        translation_key="gpu_temperature",
+                        translation_placeholders={"gpu_name": gpu.name},
                         entity_registry_enabled_default=False,
                         device_class=SensorDeviceClass.TEMPERATURE,
                         state_class=SensorStateClass.MEASUREMENT,
@@ -585,11 +587,11 @@ async def async_setup_entry(
                     coordinator,
                     SystemBridgeSensorEntityDescription(
                         key=f"gpu_{gpu.id}_usage_percentage",
-                        name=f"{gpu.name} usage %",
+                        translation_key="gpu_usage_percentage",
+                        translation_placeholders={"gpu_name": gpu.name},
                         state_class=SensorStateClass.MEASUREMENT,
                         native_unit_of_measurement=PERCENTAGE,
                         suggested_display_precision=2,
-                        icon="mdi:percent",
                         value=lambda data, k=index: gpu_usage_percentage(data, k),
                     ),
                     entry.data[CONF_PORT],
@@ -605,11 +607,11 @@ async def async_setup_entry(
                         coordinator,
                         SystemBridgeSensorEntityDescription(
                             key=f"processes_load_cpu_{cpu.id}",
-                            name=f"Load CPU {cpu.id}",
+                            translation_key="processes_load_cpu",
+                            translation_placeholders={"cpu_id": str(cpu.id)},
                             entity_registry_enabled_default=False,
                             state_class=SensorStateClass.MEASUREMENT,
                             native_unit_of_measurement=PERCENTAGE,
-                            icon="mdi:percent",
                             suggested_display_precision=2,
                             value=lambda data, k=cpu.id: cpu_usage_per_cpu(data, k),
                         ),
@@ -619,11 +621,11 @@ async def async_setup_entry(
                         coordinator,
                         SystemBridgeSensorEntityDescription(
                             key=f"cpu_power_core_{cpu.id}",
-                            name=f"CPU Core {cpu.id} Power",
+                            translation_key="cpu_power_core",
+                            translation_placeholders={"cpu_id": str(cpu.id)},
                             entity_registry_enabled_default=False,
                             native_unit_of_measurement=UnitOfPower.WATT,
                             state_class=SensorStateClass.MEASUREMENT,
-                            icon="mdi:chip",
                             suggested_display_precision=2,
                             value=lambda data, k=cpu.id: cpu_power_per_cpu(data, k),
                         ),
@@ -653,8 +655,6 @@ class SystemBridgeSensor(SystemBridgeEntity, SensorEntity):
             description.key,
         )
         self.entity_description = description
-        if description.name is not UNDEFINED:
-            self._attr_has_entity_name = False
 
     @property
     def native_value(self) -> StateType:

homeassistant/components/system_bridge/services.yaml

@@ -89,3 +89,4 @@ power_command:
             - "restart"
             - "shutdown"
             - "sleep"
+          translation_key: "power_command"

homeassistant/components/system_bridge/strings.json

@@ -54,6 +54,9 @@
       "boot_time": {
         "name": "Boot time"
       },
+      "cpu_power_core": {
+        "name": "CPU core {cpu_id} power"
+      },
       "cpu_power_package": {
         "name": "CPU package power"
       },
@@ -66,9 +69,45 @@
       "cpu_voltage": {
         "name": "CPU voltage"
       },
+      "display_refresh_rate": {
+        "name": "Display {display_id} refresh rate"
+      },
+      "display_resolution_x": {
+        "name": "Display {display_id} resolution x"
+      },
+      "display_resolution_y": {
+        "name": "Display {display_id} resolution y"
+      },
       "displays_connected": {
         "name": "Displays connected"
       },
+      "gpu_core_clock_speed": {
+        "name": "{gpu_name} clock speed"
+      },
+      "gpu_fan_speed": {
+        "name": "{gpu_name} fan speed"
+      },
+      "gpu_memory_clock_speed": {
+        "name": "{gpu_name} memory clock speed"
+      },
+      "gpu_memory_free": {
+        "name": "{gpu_name} memory free"
+      },
+      "gpu_memory_used": {
+        "name": "{gpu_name} memory used"
+      },
+      "gpu_memory_used_percentage": {
+        "name": "{gpu_name} memory used %"
+      },
+      "gpu_power_usage": {
+        "name": "{gpu_name} power usage"
+      },
+      "gpu_temperature": {
+        "name": "{gpu_name} temperature"
+      },
+      "gpu_usage_percentage": {
+        "name": "{gpu_name} usage %"
+      },
       "kernel": {
         "name": "Kernel"
       },
@@ -81,6 +120,9 @@
       "memory_used": {
         "name": "Memory used"
       },
+      "memory_used_percentage": {
+        "name": "Memory used %"
+      },
       "os": {
         "name": "Operating system"
       },
@@ -90,6 +132,12 @@
       "processes": {
         "name": "Processes"
       },
+      "processes_load_cpu": {
+        "name": "Load CPU {cpu_id}"
+      },
+      "space_used": {
+        "name": "{partition} space used"
+      },
       "version": {
         "name": "Version"
       },
@@ -130,6 +178,18 @@
       "title": "System Bridge upgrade required"
     }
   },
+  "selector": {
+    "power_command": {
+      "options": {
+        "hibernate": "Hibernate",
+        "lock": "Lock",
+        "logout": "Logout",
+        "restart": "[%key:common::action::restart%]",
+        "shutdown": "Shutdown",
+        "sleep": "Sleep"
+      }
+    }
+  },
   "services": {
     "get_process_by_id": {
       "description": "Gets a process by the ID.",

homeassistant/components/system_bridge/update.py

@@ -32,6 +32,7 @@ class SystemBridgeUpdateEntity(SystemBridgeEntity, UpdateEntity):
 
     _attr_has_entity_name = True
     _attr_title = "System Bridge"
+    _attr_name = None
 
     def __init__(
         self,
@@ -44,7 +45,6 @@ class SystemBridgeUpdateEntity(SystemBridgeEntity, UpdateEntity):
             api_port,
             "update",
         )
-        self._attr_name = coordinator.data.system.hostname
 
     @property
     def installed_version(self) -> str | None:

homeassistant/components/telegram_bot/services.yaml

@@ -58,7 +58,7 @@ send_message:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -101,7 +101,7 @@ send_chat_action:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -195,7 +195,7 @@ send_photo:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -287,7 +287,7 @@ send_media_group:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -372,7 +372,7 @@ send_sticker:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -466,7 +466,7 @@ send_animation:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -560,7 +560,7 @@ send_video:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -645,7 +645,7 @@ send_voice:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -739,7 +739,7 @@ send_document:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -804,7 +804,7 @@ send_location:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -861,7 +861,7 @@ send_poll:
       selector:
         number:
           mode: box
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -913,7 +913,7 @@ edit_message:
         ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
       selector:
         object:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -991,7 +991,7 @@ edit_message_media:
         ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
       selector:
         object:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1028,7 +1028,7 @@ edit_caption:
         ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
       selector:
         object:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1061,7 +1061,7 @@ edit_replymarkup:
         ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
       selector:
         object:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1108,7 +1108,7 @@ delete_message:
       example: "{{ trigger.event.data.message.message_id }}"
       selector:
         text:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1129,7 +1129,7 @@ leave_chat:
           filter:
             domain: notify
             integration: telegram_bot
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1164,7 +1164,7 @@ set_message_reaction:
       required: false
       selector:
         boolean:
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:
@@ -1233,7 +1233,7 @@ send_message_draft:
             - "markdownv2"
             - "plain_text"
           translation_key: "parse_mode"
-    advanced:
+    additional_fields:
       collapsed: true
       fields:
         config_entry_id:

homeassistant/components/telegram_bot/strings.json

@@ -367,8 +367,8 @@
       },
       "name": "Delete message",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -425,8 +425,8 @@
       },
       "name": "Edit caption",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -472,8 +472,8 @@
       },
       "name": "Edit message",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -535,8 +535,8 @@
       },
       "name": "Edit message media",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -569,8 +569,8 @@
       },
       "name": "Edit reply markup",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -592,8 +592,8 @@
       },
       "name": "Leave chat",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -671,8 +671,8 @@
       },
       "name": "Send animation",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -705,8 +705,8 @@
       },
       "name": "Send chat action",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -784,8 +784,8 @@
       },
       "name": "Send document",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -842,8 +842,8 @@
       },
       "name": "Send location",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -889,8 +889,8 @@
       },
       "name": "Send media group",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -952,8 +952,8 @@
       },
       "name": "Send message",
       "sections": {
-        "advanced": {
-          "name": "Advanced"
+        "additional_fields": {
+          "name": "Additional options"
         }
       }
     },
@@ -991,8 +991,8 @@
       },
       "name": "Send message draft",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -1070,8 +1070,8 @@
       },
       "name": "Send photo",
       "sections": {
-        "advanced": {
-          "name": "Advanced"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "URL options"
@@ -1128,8 +1128,8 @@
       },
       "name": "Send poll",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     },
@@ -1203,8 +1203,8 @@
       },
       "name": "Send sticker",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -1285,8 +1285,8 @@
       },
       "name": "Send video",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -1363,8 +1363,8 @@
       },
       "name": "Send voice",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         },
         "url_options": {
           "name": "[%key:component::telegram_bot::services::send_photo::sections::url_options::name%]"
@@ -1401,8 +1401,8 @@
       },
       "name": "Set message reaction",
       "sections": {
-        "advanced": {
-          "name": "[%key:component::telegram_bot::services::send_message::sections::advanced::name%]"
+        "additional_fields": {
+          "name": "[%key:component::telegram_bot::services::send_message::sections::additional_fields::name%]"
         }
       }
     }

homeassistant/components/teslemetry/icons.json

@@ -497,7 +497,7 @@
         "default": "mdi:battery-clock"
       },
       "forward_collision_warning": {
-        "default": "mdi:car-crash",
+        "default": "mdi:car-emergency",
         "state": {
           "average": "mdi:alert-circle",
           "early": "mdi:alert-octagon",
@@ -634,7 +634,7 @@
         "default": "mdi:key"
       },
       "pedal_position": {
-        "default": "mdi:pedestal"
+        "default": "mdi:gauge"
       },
       "powershare_hours_left": {
         "default": "mdi:clock-time-eight-outline"
@@ -794,7 +794,7 @@
       "service": "mdi:calendar-plus"
     },
     "add_precondition_schedule": {
-      "service": "mdi:hvac-outline"
+      "service": "mdi:hvac"
     },
     "navigation_gps_request": {
       "service": "mdi:crosshairs-gps"
@@ -803,7 +803,7 @@
       "service": "mdi:calendar-minus"
     },
     "remove_precondition_schedule": {
-      "service": "mdi:hvac-off-outline"
+      "service": "mdi:hvac-off"
     },
     "set_scheduled_charging": {
       "service": "mdi:timeline-clock-outline"

homeassistant/components/unifiprotect/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_push",
   "loggers": ["uiprotect"],
   "quality_scale": "platinum",
-  "requirements": ["uiprotect==10.4.1"]
+  "requirements": ["uiprotect==10.5.0"]
 }

homeassistant/components/uptimerobot/__init__.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import PLATFORMS
+from .const import DOMAIN, PLATFORMS
 from .coordinator import UptimeRobotConfigEntry, UptimeRobotDataUpdateCoordinator
 
 
@@ -15,9 +15,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: UptimeRobotConfigEntry)
     """Set up UptimeRobot from a config entry."""
     key: str = entry.data[CONF_API_KEY]
     if key.startswith(("ur", "m")):
-        # pylint: disable-next=home-assistant-exception-not-translated
         raise ConfigEntryAuthFailed(
-            "Wrong API key type detected, use the 'main' API key"
+            translation_domain=DOMAIN,
+            translation_key="api_key_wrong_type",
         )
     uptime_robot_api = UptimeRobot(key, async_get_clientsession(hass))
 

homeassistant/components/uptimerobot/coordinator.py

@@ -48,11 +48,16 @@ class UptimeRobotDataUpdateCoordinator(
         try:
             response = await self.api.async_get_monitors()
         except UptimeRobotAuthenticationException as exception:
-            # pylint: disable-next=home-assistant-exception-not-translated
-            raise ConfigEntryAuthFailed(exception) from exception
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_authentication_exception",
+            ) from exception
         except UptimeRobotException as exception:
-            # pylint: disable-next=home-assistant-exception-not-translated
-            raise UpdateFailed(exception) from exception
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_generic_exception",
+                translation_placeholders={"error": "Generic UptimeRobot exception"},
+            ) from exception
 
         if TYPE_CHECKING:
             assert isinstance(response.data, list)

homeassistant/components/uptimerobot/strings.json

@@ -57,7 +57,16 @@
     }
   },
   "exceptions": {
-    "api_exception": {
+    "api_authentication_exception": {
+      "message": "API authentication failed, please check your API key"
+    },
+    "api_generic_exception": {
+      "message": "API error: {error}"
+    },
+    "api_key_wrong_type": {
+      "message": "Wrong API key type detected, use the 'main' API key"
+    },
+    "api_switch_exception": {
       "message": "Could not turn on/off monitoring: {error}"
     }
   }

homeassistant/components/uptimerobot/utils.py

@@ -33,7 +33,7 @@ def uptimerobot_api_call[_T: UptimeRobotEntity, **_P](
         except UptimeRobotException as exception:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
-                translation_key="api_exception",
+                translation_key="api_switch_exception",
                 translation_placeholders={"error": "Generic UptimeRobot exception"},
             ) from exception
 

homeassistant/components/weatherflow_cloud/icons.json

@@ -68,7 +68,7 @@
         "state": {
           "lightning": "mdi:weather-lightning-rainy",
           "rain": "mdi:weather-rainy",
-          "rain_snow": "mdi:weather-snoy-rainy",
+          "rain_snow": "mdi:weather-snowy-rainy",
           "snow": "mdi:weather-snowy"
         }
       },

homeassistant/components/webostv/__init__.py

@@ -46,8 +46,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: WebOsTvConfigEntry) -> b
         try:
             await client.connect()
         except WebOsTvPairError as err:
-            # pylint: disable-next=home-assistant-exception-not-translated
-            raise ConfigEntryAuthFailed(err) from err
+            raise ConfigEntryAuthFailed(
+                translation_domain=DOMAIN,
+                translation_key="auth_failed",
+            ) from err
 
     # If pairing request accepted there will be no error
     # Update the stored key without triggering reauth

homeassistant/components/webostv/device_trigger.py

@@ -6,6 +6,7 @@ from homeassistant.components.device_automation import (
     DEVICE_TRIGGER_BASE_SCHEMA,
     InvalidDeviceAutomationConfig,
 )
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import CONF_DEVICE_ID, CONF_PLATFORM, CONF_TYPE
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -13,10 +14,7 @@ from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 
 from . import DOMAIN, trigger
-from .helpers import (
-    async_get_client_by_device_entry,
-    async_get_device_entry_by_device_id,
-)
+from .helpers import async_get_device_entry_by_device_id
 from .triggers.turn_on import (
     PLATFORM_TYPE as TURN_ON_PLATFORM_TYPE,
     async_get_turn_on_trigger,
@@ -40,10 +38,31 @@ async def async_validate_trigger_config(
         device_id = config[CONF_DEVICE_ID]
         try:
             device = async_get_device_entry_by_device_id(hass, device_id)
-            async_get_client_by_device_entry(hass, device)
         except ValueError as err:
-            # pylint: disable-next=home-assistant-exception-not-translated
-            raise InvalidDeviceAutomationConfig(err) from err
+            raise InvalidDeviceAutomationConfig(
+                translation_domain=DOMAIN,
+                translation_key="device_not_valid",
+                translation_placeholders={"device_id": device_id},
+            ) from err
+
+        for config_entry_id in device.config_entries:
+            if (
+                entry := hass.config_entries.async_get_entry(config_entry_id)
+            ) and entry.domain == DOMAIN:
+                if entry.state is ConfigEntryState.LOADED:
+                    break
+
+                raise InvalidDeviceAutomationConfig(
+                    translation_domain=DOMAIN,
+                    translation_key="device_config_entry_not_loaded",
+                    translation_placeholders={"device_id": device.id},
+                )
+        else:
+            raise InvalidDeviceAutomationConfig(
+                translation_domain=DOMAIN,
+                translation_key="device_not_valid",
+                translation_placeholders={"device_id": device.id},
+            )
 
     return config
 

homeassistant/components/webostv/helpers.py

@@ -4,7 +4,7 @@ import logging
 
 from aiowebostv import WebOsClient, WebOsTvState
 
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_CLIENT_SECRET, CONF_HOST
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -56,31 +56,6 @@ def async_get_device_id_from_entity_id(hass: HomeAssistant, entity_id: str) -> s
     return entity_entry.device_id
 
 
-@callback
-def async_get_client_by_device_entry(
-    hass: HomeAssistant, device: DeviceEntry
-) -> WebOsClient:
-    """Get WebOsClient from Device Registry by device entry.
-
-    Raises ValueError if client is not found.
-    """
-    for config_entry_id in device.config_entries:
-        entry: WebOsTvConfigEntry | None = hass.config_entries.async_get_entry(
-            config_entry_id
-        )
-        if entry and entry.domain == DOMAIN:
-            if entry.state is ConfigEntryState.LOADED:
-                return entry.runtime_data
-
-            raise ValueError(
-                f"Device {device.id} is not from a loaded {DOMAIN} config entry"
-            )
-
-    raise ValueError(
-        f"Device {device.id} is not from an existing {DOMAIN} config entry"
-    )
-
-
 def get_sources(tv_state: WebOsTvState) -> list[str]:
     """Construct sources list."""
     sources = []

homeassistant/components/webostv/strings.json

@@ -46,9 +46,18 @@
     }
   },
   "exceptions": {
+    "auth_failed": {
+      "message": "Pairing failed, make sure to accept the pairing request on your TV."
+    },
     "communication_error": {
       "message": "Communication error while calling {func} for device {name}: {error}"
     },
+    "device_config_entry_not_loaded": {
+      "message": "The LG webOS TV integration for device {device_id} is not loaded."
+    },
+    "device_not_valid": {
+      "message": "Device {device_id} is not a valid LG webOS TV device."
+    },
     "device_off": {
       "message": "Error calling {func} for device {name}: Device is off and cannot be controlled."
     },

homeassistant/components/xiaomi_miio/select.py

@@ -28,7 +28,7 @@ from miio.integrations.humidifier.zhimi.airhumidifier_miot import (
 )
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.const import CONF_DEVICE, CONF_MODEL, EntityCategory
+from homeassistant.const import ATTR_MODE, CONF_DEVICE, CONF_MODEL, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -65,8 +65,6 @@ from .typing import XiaomiMiioConfigEntry
 ATTR_DISPLAY_ORIENTATION = "display_orientation"
 ATTR_LED_BRIGHTNESS = "led_brightness"
 ATTR_PTC_LEVEL = "ptc_level"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_MODE = "mode"
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/xiaomi_miio/switch.py

@@ -25,6 +25,7 @@ from homeassistant.components.switch import (
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
+    ATTR_MODEL,
     ATTR_TEMPERATURE,
     CONF_DEVICE,
     CONF_HOST,
@@ -149,8 +150,6 @@ ATTR_LED = "led"
 ATTR_IONIZER = "ionizer"
 ATTR_ANION = "anion"
 ATTR_LOAD_POWER = "load_power"
-# pylint: disable-next=home-assistant-duplicate-const
-ATTR_MODEL = "model"
 ATTR_POWER = "power"
 ATTR_POWER_MODE = "power_mode"
 ATTR_POWER_PRICE = "power_price"

homeassistant/generated/config_flows.py

@@ -59,7 +59,6 @@ FLOWS = {
         "amberelectric",
         "ambient_network",
         "ambient_station",
-        "analytics",
         "analytics_insights",
         "android_ip_webcam",
         "androidtv",

homeassistant/package_constraints.txt

@@ -1,7 +1,7 @@
 # Automatically generated by gen_requirements_all.py, do not edit
 
 aiodhcpwatcher==1.2.1
-aiodiscover==3.2.0
+aiodiscover==3.2.3
 aiodns==4.0.4
 aiogithubapi==26.0.0
 aiohttp-asyncmdnsresolver==0.1.1
@@ -30,12 +30,12 @@ certifi>=2021.5.30
 ciso8601==2.3.3
 cronsim==2.7
 cryptography==48.0.0
-dbus-fast==5.0.0
+dbus-fast==5.0.3
 file-read-backwards==2.0.0
 fnv-hash-fast==2.0.2
 go2rtc-client==0.4.0
 ha-ffmpeg==3.2.2
-habluetooth==6.1.0
+habluetooth==6.2.0
 hass-nabucasa==2.2.0
 hassil==3.5.0
 home-assistant-bluetooth==2.0.0

pylint/plugins/pylint_home_assistant/checkers/mdi_icons.py

@@ -0,0 +1,113 @@
+"""Checker for invalid MDI icon references.
+
+Validates that ``mdi:`` icon references in integration code and
+``icons.json`` files refer to icons that actually exist in the
+Material Design Icons set.
+
+- ``E7409``: MDI icon reference not found in Python code
+- ``E7410``: MDI icon reference not found in icons.json
+"""
+
+import re
+
+from astroid import nodes
+from pylint.checkers import BaseChecker
+from pylint.lint import PyLinter
+
+from pylint_home_assistant.generated.mdi_icons import MDI_ICONS
+from pylint_home_assistant.helpers.icons import collect_mdi_icons, load_icons
+from pylint_home_assistant.helpers.module_info import parse_module
+
+# Matches strings that look like intentional icon name attempts
+# (letters, digits, hyphens, underscores). Rejects format templates
+# (%s, {}, {name}), empty names, and other dynamic patterns.
+_LOOKS_LIKE_ICON_NAME = re.compile(r"^[a-zA-Z][a-zA-Z0-9_-]*[a-zA-Z0-9]$")
+
+
+class MdiIconsChecker(BaseChecker):
+    """Checker for invalid MDI icon references."""
+
+    name = "home_assistant_mdi_icons"
+    priority = -1
+    msgs = {
+        "E7409": (
+            "MDI icon '%s' does not exist in the Material Design Icons set",
+            "home-assistant-mdi-icon-not-found",
+            "Used when an integration references an MDI icon in Python "
+            "code that does not exist. Check the icon name at "
+            "https://pictogrammers.com/library/mdi/",
+        ),
+        "E7410": (
+            "MDI icon '%s' in icons.json does not exist in the "
+            "Material Design Icons set",
+            "home-assistant-mdi-icon-json-not-found",
+            "Used when an integration's icons.json references an MDI "
+            "icon that does not exist. Check the icon name at "
+            "https://pictogrammers.com/library/mdi/",
+        ),
+    }
+    options = ()
+
+    _in_integration: bool
+    _checked_icons_json: set[str]
+
+    def open(self) -> None:
+        """Initialize per-run state."""
+        self._checked_icons_json = set()
+
+    def visit_module(self, node: nodes.Module) -> None:
+        """Check icons.json and track integration context."""
+        parsed = parse_module(node.name)
+        self._in_integration = parsed is not None
+        if parsed is None:
+            return
+
+        # Only check icons.json once per integration
+        if parsed.domain in self._checked_icons_json:
+            return
+        self._checked_icons_json.add(parsed.domain)
+
+        icons_data = load_icons(node)
+        if icons_data is None:
+            return
+
+        mdi_refs = collect_mdi_icons(icons_data)
+        for icon_ref in sorted(mdi_refs):
+            icon_name = icon_ref[4:]  # Strip "mdi:" prefix
+            if icon_name not in MDI_ICONS:
+                self.add_message(
+                    "home-assistant-mdi-icon-json-not-found",
+                    node=node,
+                    args=(icon_ref,),
+                )
+
+    def visit_const(self, node: nodes.Const) -> None:
+        """Check string constants for invalid MDI icon references."""
+        if not self._in_integration:
+            return
+
+        if not isinstance(node.value, str):
+            return
+
+        if not node.value.startswith("mdi:"):
+            return
+
+        icon_name = node.value[4:]  # Strip "mdi:" prefix
+
+        # Only check names that look like intentional icon name attempts.
+        # This skips f-string fragments, format templates (%s, {}),
+        # partial names, and other dynamic patterns.
+        if not _LOOKS_LIKE_ICON_NAME.match(icon_name):
+            return
+
+        if icon_name not in MDI_ICONS:
+            self.add_message(
+                "home-assistant-mdi-icon-not-found",
+                node=node,
+                args=(node.value,),
+            )
+
+
+def register(linter: PyLinter) -> None:
+    """Register the checker."""
+    linter.register_checker(MdiIconsChecker(linter))

pylint/plugins/pylint_home_assistant/generated/__init__.py

@@ -0,0 +1 @@
+"""Generated files for the pylint Home Assistant plugin."""

pylint/plugins/pylint_home_assistant/helpers/icons.py

@@ -0,0 +1,60 @@
+"""Helpers for reading integration icon files."""
+
+import contextlib
+
+from astroid import nodes
+import orjson
+
+from .integration import get_integration_dir
+
+_icons_cache: dict[str, dict | None] = {}
+
+
+def clear_icons_cache() -> None:
+    """Clear the icons cache (used by tests)."""
+    _icons_cache.clear()
+
+
+def load_icons(module: nodes.Module) -> dict | None:
+    """Load and cache the icons.json for the current integration.
+
+    Returns the parsed JSON as a dict, or ``None`` if not found.
+    """
+    integration_dir = get_integration_dir(module)
+    if integration_dir is None:
+        return None
+
+    cache_key = str(integration_dir)
+    if cache_key in _icons_cache:
+        return _icons_cache[cache_key]
+
+    icons_path = integration_dir / "icons.json"
+    result: dict | None = None
+    if icons_path.exists():
+        with contextlib.suppress(orjson.JSONDecodeError, OSError):
+            parsed = orjson.loads(icons_path.read_bytes())
+            if isinstance(parsed, dict):
+                result = parsed
+
+    _icons_cache[cache_key] = result
+    return result
+
+
+def collect_mdi_icons(
+    data: dict | list | str, icons: set[str] | None = None
+) -> set[str]:
+    """Recursively collect all mdi: icon references from a data structure."""
+    if icons is None:
+        icons = set()
+
+    if isinstance(data, str):
+        if data.startswith("mdi:"):
+            icons.add(data)
+    elif isinstance(data, dict):
+        for value in data.values():
+            collect_mdi_icons(value, icons)
+    elif isinstance(data, list):
+        for item in data:
+            collect_mdi_icons(item, icons)
+
+    return icons

requirements_all.txt

@@ -233,7 +233,7 @@ aiocomelit==2.0.3
 aiodhcpwatcher==1.2.1
 
 # homeassistant.components.dhcp
-aiodiscover==3.2.0
+aiodiscover==3.2.3
 
 # homeassistant.components.dnsip
 aiodns==4.0.4
@@ -794,7 +794,7 @@ datadog==0.52.0
 datapoint==0.12.1
 
 # homeassistant.components.bluetooth
-dbus-fast==5.0.0
+dbus-fast==5.0.3
 
 # homeassistant.components.debugpy
 debugpy==1.8.17
@@ -1183,7 +1183,7 @@ growattServer==2.1.0
 gspread==5.5.0
 
 # homeassistant.components.guntamatic
-guntamatic==1.8.0
+guntamatic==1.9.0
 
 # homeassistant.components.profiler
 guppy3==3.1.6
@@ -1210,7 +1210,7 @@ ha-xthings-cloud==1.0.5
 habiticalib==0.4.7
 
 # homeassistant.components.bluetooth
-habluetooth==6.1.0
+habluetooth==6.2.0
 
 # homeassistant.components.hanna
 hanna-cloud==0.0.7
@@ -1923,7 +1923,7 @@ py-nightscout==1.2.2
 py-nymta==0.4.0
 
 # homeassistant.components.opendisplay
-py-opendisplay==5.9.0
+py-opendisplay==7.2.3
 
 # homeassistant.components.schluter
 py-schluter==0.1.7
@@ -2641,7 +2641,7 @@ python-google-weather-api==0.0.6
 python-homeassistant-analytics==0.9.0
 
 # homeassistant.components.homewizard
-python-homewizard-energy==10.0.1
+python-homewizard-energy==10.1.0
 
 # homeassistant.components.hp_ilo
 python-hpilo==4.4.3
@@ -2871,7 +2871,7 @@ renault-api==0.5.10
 renson-endura-delta==1.7.2
 
 # homeassistant.components.reolink
-reolink-aio==0.19.1
+reolink-aio==0.20.0
 
 # homeassistant.components.radio_frequency
 rf-protocols==3.2.0
@@ -3224,7 +3224,7 @@ uasiren==0.0.1
 uhooapi==1.2.8
 
 # homeassistant.components.unifiprotect
-uiprotect==10.4.1
+uiprotect==10.5.0
 
 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.5.7

script/hassfest/__main__.py

@@ -23,6 +23,7 @@ from . import (
     json,
     labs,
     manifest,
+    mdi_icons,
     metadata,
     mqtt,
     mypy_config,
@@ -65,6 +66,7 @@ INTEGRATION_PLUGINS = [
 HASS_PLUGINS = [
     core_files,
     docker,
+    mdi_icons,
     mypy_config,
     metadata,
 ]

script/hassfest/mdi_icons.py

@@ -0,0 +1,76 @@
+"""Generate MDI icons file for the pylint plugin."""
+
+from importlib.metadata import PackageNotFoundError, version
+from importlib.resources import files
+import json
+
+from .model import Config, Integration
+from .serializer import format_python_namespace
+
+_TARGET = "pylint/plugins/pylint_home_assistant/generated/mdi_icons.py"
+
+
+def _get_frontend_version() -> str | None:
+    """Get the installed home-assistant-frontend version."""
+    try:
+        return version("home-assistant-frontend")
+    except PackageNotFoundError:
+        return None
+
+
+def _load_mdi_icons() -> set[str]:
+    """Load the MDI icon names from the frontend package."""
+    try:
+        mdi_dir = files("hass_frontend") / "static" / "mdi"
+        icon_list_path = mdi_dir / "iconList.json"
+        data = json.loads(icon_list_path.read_text(encoding="utf-8"))
+        return {icon["name"] for icon in data}
+    except ImportError, FileNotFoundError, json.JSONDecodeError, KeyError:
+        return set()
+
+
+def validate(integrations: dict[str, Integration], config: Config) -> None:
+    """Validate the generated MDI icons file is up to date."""
+    frontend_version = _get_frontend_version()
+    if frontend_version is None:
+        return
+
+    icons = _load_mdi_icons()
+    if not icons:
+        config.add_error(
+            "mdi_icons",
+            "Could not load MDI icons from home-assistant-frontend",
+        )
+        return
+
+    content = format_python_namespace(
+        {
+            "FRONTEND_VERSION": frontend_version,
+            "MDI_ICONS": icons,
+        },
+        annotations={
+            "FRONTEND_VERSION": "Final[str]",
+            "MDI_ICONS": "Final[set[str]]",
+        },
+    )
+
+    config.cache["mdi_icons_content"] = content
+
+    if config.specific_integrations:
+        return
+
+    target_path = config.root / _TARGET
+    if not target_path.exists() or target_path.read_text() != content:
+        config.add_error(
+            "mdi_icons",
+            f"File {_TARGET} is not up to date. Run python3 -m script.hassfest",
+            fixable=True,
+        )
+
+
+def generate(integrations: dict[str, Integration], config: Config) -> None:
+    """Generate MDI icons file."""
+    if "mdi_icons_content" not in config.cache:
+        return
+    target_path = config.root / _TARGET
+    target_path.write_text(config.cache["mdi_icons_content"])

script/split_tests.py

@@ -2,20 +2,30 @@
 """Helper script to split test into n buckets."""
 
 import argparse
+from concurrent.futures import ProcessPoolExecutor
 from dataclasses import dataclass, field
+import hashlib
+import json
 from math import ceil
+import os
 from pathlib import Path
 import subprocess
 import sys
 from typing import Final
 
+# tests/components has ~1000 sub-directories, which makes it the natural
+# place to subdivide to keep each pytest invocation roughly equal in size.
+_FAN_OUT_DIRS: Final = frozenset({"components"})
+
+# Cache file format version; bump on any incompatible schema change so old
+# caches are ignored rather than misread.
+_CACHE_VERSION: Final = 2
+
 
 class Bucket:
     """Class to hold bucket."""
 
-    def __init__(
-        self,
-    ):
+    def __init__(self) -> None:
         """Initialize bucket."""
         self.total_tests = 0
         self._paths: list[str] = []
@@ -75,9 +85,9 @@ class BucketHolder:
         if not test_folder.added_to_bucket:
             raise ValueError("Not all tests are added to a bucket")
 
-    def create_ouput_file(self) -> None:
+    def create_output_file(self) -> None:
         """Create output file."""
-        with Path("pytest_buckets.txt").open("w") as file:
+        with Path("pytest_buckets.txt").open("w", encoding="utf-8") as file:
             for idx, bucket in enumerate(self._buckets):
                 print(f"Bucket {idx + 1} has {bucket.total_tests} tests")
                 file.write(bucket.get_paths_line())
@@ -164,37 +174,361 @@ class TestFolder:
         return result
 
 
-def collect_tests(path: Path) -> TestFolder:
-    """Collect all tests."""
+def _collect_batch(paths: list[Path]) -> tuple[str, str, int]:
+    """Run pytest --collect-only on a batch of paths."""
     result = subprocess.run(
-        ["pytest", "--collect-only", "-qq", "-p", "no:warnings", path],
+        ["pytest", "--collect-only", "-qq", "-p", "no:warnings", *map(str, paths)],
         check=False,
         capture_output=True,
         text=True,
     )
+    return result.stdout, result.stderr, result.returncode
 
-    if result.returncode != 0:
-        print("Failed to collect tests:")
-        print(result.stderr)
-        print(result.stdout)
-        sys.exit(1)
 
-    folder = TestFolder(path)
+def _iter_eligible_children(path: Path) -> list[Path]:
+    """Return immediate children of ``path`` that pytest should collect.
 
-    for line in result.stdout.splitlines():
+    Skips entries whose name starts with ``.`` or ``_`` (hidden dirs,
+    ``__pycache__``, private helpers), and non-``test_*.py`` files (so
+    helper modules like ``conftest.py`` and ``common.py`` are not passed
+    as explicit collection targets).
+    """
+    children: list[Path] = []
+    for entry in sorted(path.iterdir()):
+        if entry.name.startswith((".", "_")):
+            continue
+        if entry.is_dir() or (entry.suffix == ".py" and entry.name.startswith("test_")):
+            children.append(entry)
+    return children
+
+
+def _enumerate_batch_paths(path: Path) -> list[Path]:
+    """Return the child paths to run pytest --collect-only over.
+
+    Files are returned as-is.  Directories are expanded one level deep, with
+    a second level of expansion for entries named in ``_FAN_OUT_DIRS`` so the
+    enormous ``tests/components`` tree fans out into per-integration paths.
+    """
+    if path.is_file():
+        return [path]
+
+    paths: list[Path] = []
+    for entry in _iter_eligible_children(path):
+        if entry.is_dir() and entry.name in _FAN_OUT_DIRS:
+            paths.extend(_iter_eligible_children(entry))
+        else:
+            paths.append(entry)
+    return paths
+
+
+def _hash_file(path: Path) -> str:
+    """Return a short content hash for ``path``."""
+    return hashlib.sha256(path.read_bytes()).hexdigest()[:16]
+
+
+def _walk_test_tree(root: Path) -> tuple[list[Path], list[Path]]:
+    """Walk ``root`` once and return (test files, fixture files).
+
+    Test files are the ``test_*.py`` modules that pytest will collect.
+    Fixture files are every other ``.py`` under ``root`` — ``conftest.py``
+    plus helper modules like ``common.py``.  Helpers go into the
+    invalidation hash because they often hold the ``VALUES`` lists that
+    test files import for ``@pytest.mark.parametrize``: editing one
+    changes a test's collected count even though the test file itself is
+    untouched.
+
+    Uses ``os.walk`` rather than ``Path.rglob`` because it's ~2x faster on
+    a 5000-file tree, and subdirectories whose names start with ``.`` or
+    ``_`` are pruned instead of visited (hidden dirs, ``__pycache__``,
+    private helpers).  Doing both walks in one pass keeps total tree I/O
+    down.
+    """
+    test_files: list[Path] = []
+    fixtures: list[Path] = []
+    for dirpath, dirnames, filenames in os.walk(root):
+        dirnames[:] = [d for d in dirnames if not d.startswith((".", "_"))]
+        base = Path(dirpath)
+        for name in filenames:
+            if not name.endswith(".py"):
+                continue
+            if name.startswith("test_"):
+                test_files.append(base / name)
+            else:
+                fixtures.append(base / name)
+    test_files.sort()
+    fixtures.sort()
+    return test_files, fixtures
+
+
+def _find_ancestor_conftests(root: Path) -> list[Path]:
+    """Return ancestor ``conftest.py`` files that pytest would still apply.
+
+    Pytest walks up from each test file looking for conftests; when
+    ``root`` is a subtree (eg ``tests/components``) the conftests above
+    it (eg ``tests/conftest.py``) still affect parametrization, so they
+    must contribute to the invalidation hash too.  Stops at the first
+    ancestor without a ``conftest.py``.
+    """
+    ancestors: list[Path] = []
+    current = root.resolve().parent
+    while True:
+        conftest = current / "conftest.py"
+        if not conftest.is_file():
+            break
+        ancestors.append(conftest)
+        if current == current.parent:
+            break
+        current = current.parent
+    return ancestors
+
+
+def _compute_invalidation_hash(root: Path, fixtures: list[Path]) -> str:
+    """Return a hash that changes whenever any file in ``fixtures`` changes.
+
+    Any change to a fixture file (conftests, helper modules like
+    ``common.py``, ancestor conftests) invalidates the entire test-count
+    cache.  This is coarse but safe: any of these can shift fixture
+    parametrization in ways the cache cannot otherwise detect, so we
+    just re-collect everything.
+
+    Paths are encoded with ``os.path.relpath`` so the hash stays stable
+    across machines and also covers ancestor conftests above ``root``
+    (whose ``relative_to(root)`` would fail).
+    """
+    digest = hashlib.sha256()
+    for fixture in fixtures:
+        digest.update(os.path.relpath(fixture, root).encode())
+        digest.update(b"\0")
+        digest.update(fixture.read_bytes())
+        digest.update(b"\0")
+    return digest.hexdigest()
+
+
+@dataclass
+class _CacheEntry:
+    """Cached test count for a single file."""
+
+    hash: str
+    count: int
+
+
+@dataclass
+class _Cache:
+    """Mapping of test file path → cached entry, plus invalidation key."""
+
+    invalidation_hash: str
+    entries: dict[str, _CacheEntry]
+
+    @classmethod
+    def empty(cls, invalidation_hash: str = "") -> _Cache:
+        """Return a new empty cache."""
+        return cls(invalidation_hash=invalidation_hash, entries={})
+
+    @classmethod
+    def load(cls, path: Path, current_invalidation_hash: str) -> _Cache:
+        """Load cache from ``path`` and invalidate it on schema/fixture drift.
+
+        Any failure (missing file, bad JSON, version drift, fixture drift)
+        returns an empty cache so the script just falls back to a full
+        collection.  This is the self-healing path.
+        """
+        try:
+            raw = json.loads(path.read_bytes())
+        except OSError, ValueError:
+            return cls.empty(current_invalidation_hash)
+        if not isinstance(raw, dict) or raw.get("version") != _CACHE_VERSION:
+            return cls.empty(current_invalidation_hash)
+        if raw.get("invalidation_hash") != current_invalidation_hash:
+            return cls.empty(current_invalidation_hash)
+        files = raw.get("files")
+        if not isinstance(files, dict):
+            return cls.empty(current_invalidation_hash)
+        entries: dict[str, _CacheEntry] = {}
+        for key, value in files.items():
+            if (
+                not isinstance(value, dict)
+                or not isinstance(value.get("hash"), str)
+                or not isinstance(value.get("count"), int)
+            ):
+                # Skip malformed entries instead of discarding the whole cache.
+                continue
+            entries[key] = _CacheEntry(hash=value["hash"], count=value["count"])
+        return cls(invalidation_hash=current_invalidation_hash, entries=entries)
+
+    def save(self, path: Path) -> None:
+        """Write the cache to ``path``."""
+        path.write_text(
+            json.dumps(
+                {
+                    "version": _CACHE_VERSION,
+                    "invalidation_hash": self.invalidation_hash,
+                    "files": {
+                        key: {"hash": entry.hash, "count": entry.count}
+                        for key, entry in sorted(self.entries.items())
+                    },
+                },
+                indent=2,
+                ensure_ascii=False,
+            )
+            + "\n",
+            encoding="utf-8",
+        )
+
+
+def _resolve_from_cache(
+    test_files: list[Path],
+    cache: _Cache,
+    root: Path,
+) -> tuple[dict[Path, _CacheEntry], dict[Path, str]]:
+    """Split ``test_files`` into ``(cached_entries, miss_hashes)``.
+
+    A file is served from cache when its content hash matches what we
+    previously stored; otherwise it is queued for re-collection.  Each
+    file is hashed exactly once: hits carry the stored hash forward,
+    misses carry the just-computed hash so the rebuild step doesn't
+    re-read the same bytes a second time.
+    """
+    hits: dict[Path, _CacheEntry] = {}
+    miss_hashes: dict[Path, str] = {}
+    for file in test_files:
+        file_hash = _hash_file(file)
+        entry = cache.entries.get(str(file.relative_to(root)))
+        if entry is not None and entry.hash == file_hash:
+            hits[file] = entry
+        else:
+            miss_hashes[file] = file_hash
+    return hits, miss_hashes
+
+
+def _run_collect_batches(paths: list[Path]) -> list[tuple[str, str, int]]:
+    """Run pytest --collect-only across ``paths`` using a process pool."""
+    workers = min(len(paths), os.cpu_count() or 1) or 1
+    batches = [paths[i::workers] for i in range(workers)]
+    if workers == 1:
+        return [_collect_batch(batches[0])]
+    with ProcessPoolExecutor(max_workers=workers) as executor:
+        return list(executor.map(_collect_batch, batches))
+
+
+def _parse_collect_output(stdout: str) -> dict[Path, int]:
+    """Parse ``pytest --collect-only -qq`` output into ``{path: count}``."""
+    counts: dict[Path, int] = {}
+    for line in stdout.splitlines():
         if not line.strip():
             continue
         file_path, _, total_tests = line.partition(": ")
-        if not path or not total_tests:
-            print(f"Unexpected line: {line}")
+        if not file_path or not total_tests:
+            raise ValueError(f"Unexpected line: {line}")
+        counts[Path(file_path)] = int(total_tests)
+    return counts
+
+
+def _run_pytest_collect(paths: list[Path]) -> dict[Path, int]:
+    """Run pytest --collect-only across ``paths`` and parse the output."""
+    counts: dict[Path, int] = {}
+    for stdout, stderr, returncode in _run_collect_batches(paths):
+        if returncode != 0:
+            print("Failed to collect tests:")
+            print(stderr)
+            print(stdout)
             sys.exit(1)
+        try:
+            counts.update(_parse_collect_output(stdout))
+        except ValueError as err:
+            print(err)
+            sys.exit(1)
+    return counts
 
-        file = TestFile(int(total_tests), Path(file_path))
-        folder.add_test_file(file)
 
+def _build_folder(root: Path, counts: dict[Path, int]) -> TestFolder:
+    """Build a ``TestFolder`` from a flat ``{path: count}`` mapping.
+
+    Files reported with zero tests are skipped so they don't enter
+    bucketing (helper modules named ``test_*.py`` with no test functions
+    look like test files to the walker but pytest returns nothing for
+    them).
+    """
+    folder = TestFolder(root)
+    for file_path, count in counts.items():
+        if count:
+            folder.add_test_file(TestFile(count, file_path))
     return folder
 
 
+def _exit_if_empty(paths: list[Path], root: Path) -> None:
+    """Exit with a clear message when no eligible test paths were found."""
+    if not paths:
+        print(f"No eligible test paths found under {root}")
+        sys.exit(1)
+
+
+def _collect_tests_uncached(path: Path) -> TestFolder:
+    """Collect tests by handing pytest the top-level directories.
+
+    Skips the tree walk and per-file hashing; used when no cache file is
+    requested so the script behaves like the pre-cache implementation.
+    """
+    batch_paths = _enumerate_batch_paths(path)
+    _exit_if_empty(batch_paths, path)
+    return _build_folder(path, _run_pytest_collect(batch_paths))
+
+
+def _collect_tests_cached(path: Path, cache_path: Path) -> TestFolder:
+    """Collect tests using an on-disk cache for incremental updates."""
+    all_test_files, fixtures = _walk_test_tree(path)
+    _exit_if_empty(all_test_files, path)
+
+    # Include ancestor conftests so a subtree run (eg tests/components)
+    # still invalidates when tests/conftest.py changes.
+    all_fixtures = _find_ancestor_conftests(path) + fixtures
+    invalidation_hash = _compute_invalidation_hash(path, all_fixtures)
+    cache = _Cache.load(cache_path, invalidation_hash)
+
+    hits, miss_hashes = _resolve_from_cache(all_test_files, cache, path)
+    print(
+        f"Cache: {len(hits)} hits / {len(miss_hashes)} misses"
+        f" / {len(all_test_files)} total"
+    )
+
+    new_counts: dict[Path, int] = {}
+    if miss_hashes:
+        # On a full cold-cache run, hand pytest the top-level directories
+        # instead of 5000+ individual file paths: pytest walks dirs much
+        # faster than it resolves each file argument.  Once any cache hits
+        # exist, use file-level collection so we only re-collect the diff.
+        collect_paths = _enumerate_batch_paths(path) if not hits else list(miss_hashes)
+        new_counts = _run_pytest_collect(collect_paths)
+
+    # Walk the full set of test files once and decide each file's entry:
+    # hits keep their stored entry (and verified hash), misses build a
+    # fresh entry from the resolve-time hash plus the freshly collected
+    # count.  Files in misses that pytest returned no count for are
+    # stored as 0 so they stop re-collecting on the next run.
+    entries: dict[str, _CacheEntry] = {}
+    counts: dict[Path, int] = {}
+    for file in all_test_files:
+        if (entry := hits.get(file)) is None:
+            entry = _CacheEntry(hash=miss_hashes[file], count=new_counts.get(file, 0))
+        entries[str(file.relative_to(path))] = entry
+        counts[file] = entry.count
+    _Cache(invalidation_hash=invalidation_hash, entries=entries).save(cache_path)
+    return _build_folder(path, counts)
+
+
+def collect_tests(path: Path, cache_path: Path | None = None) -> TestFolder:
+    """Collect all tests, using an on-disk cache when ``cache_path`` is set."""
+    if cache_path is None:
+        return _collect_tests_uncached(path)
+    if path.is_file():
+        # The cache keys on conftest_hash, but a single file root has no
+        # ancestor conftests to walk and the hash would always be empty,
+        # which would let stale counts survive conftest edits.  Skip the
+        # cache for the file-root case rather than silently mis-caching.
+        print(f"--cache ignored: {path} is a single file")
+        return _collect_tests_uncached(path)
+    return _collect_tests_cached(path, cache_path)
+
+
 def main() -> None:
     """Execute script."""
     parser = argparse.ArgumentParser(description="Split tests into n buckets.")
@@ -217,11 +551,17 @@ def main() -> None:
         help="Path to the test files to split into buckets",
         type=Path,
     )
+    parser.add_argument(
+        "--cache",
+        help="Path to a JSON file used to cache per-file test counts",
+        type=Path,
+        default=None,
+    )
 
     arguments = parser.parse_args()
 
     print("Collecting tests...")
-    tests = collect_tests(arguments.path)
+    tests = collect_tests(arguments.path, arguments.cache)
     tests_per_bucket = ceil(tests.total_tests / arguments.bucket_count)
 
     bucket_holder = BucketHolder(tests_per_bucket, arguments.bucket_count)
@@ -231,7 +571,7 @@ def main() -> None:
     print(f"Total tests: {tests.total_tests}")
     print(f"Estimated tests per bucket: {tests_per_bucket}")
 
-    bucket_holder.create_ouput_file()
+    bucket_holder.create_output_file()
 
 
 if __name__ == "__main__":

tests/auth/mfa_modules/test_insecure_example.py

@@ -102,37 +102,37 @@ async def test_login(hass: HomeAssistant) -> None:
 
     provider = hass.auth.auth_providers[0]
     result = await hass.auth.login_flow.async_init((provider.type, provider.id))
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "incorrect-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "test-user", "password": "incorrect-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["step_id"] == "mfa"
     assert result["data_schema"].schema.get("pin") is str
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"pin": "invalid-code"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_code"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"pin": "123456"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert result["data"].id == "mock-id"
 
 
@@ -149,9 +149,9 @@ async def test_setup_flow(hass: HomeAssistant) -> None:
     flow = await auth_module.async_setup_flow("new-user")
 
     result = await flow.async_step_init()
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await flow.async_step_init({"pin": "abcdefg"})
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert auth_module._data[1]["user_id"] == "new-user"
     assert auth_module._data[1]["pin"] == "abcdefg"

tests/auth/mfa_modules/test_notify.py

@@ -137,25 +137,25 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
     provider = hass.auth.auth_providers[0]
 
     result = await hass.auth.login_flow.async_init((provider.type, provider.id))
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "incorrect-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "test-user", "password": "incorrect-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     with patch("pyotp.HOTP.at", return_value=MOCK_CODE):
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"username": "test-user", "password": "test-pass"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["type"] is data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "mfa"
         assert result["data_schema"].schema.get("code") is str
 
@@ -173,7 +173,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": "invalid-code"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["type"] is data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "mfa"
         assert result["errors"]["base"] == "invalid_code"
 
@@ -191,7 +191,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": "invalid-code"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["type"] is data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "mfa"
         assert result["errors"]["base"] == "invalid_code"
 
@@ -199,7 +199,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": "invalid-code"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.ABORT
+        assert result["type"] is data_entry_flow.FlowResultType.ABORT
         assert result["reason"] == "too_many_retry"
 
     # wait service call finished
@@ -207,13 +207,13 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
 
     # restart login
     result = await hass.auth.login_flow.async_init((provider.type, provider.id))
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     with patch("pyotp.HOTP.at", return_value=MOCK_CODE):
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"username": "test-user", "password": "test-pass"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["type"] is data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "mfa"
         assert result["data_schema"].schema.get("code") is str
 
@@ -231,7 +231,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": MOCK_CODE}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
         assert result["data"].id == "mock-id"
 
 
@@ -246,7 +246,7 @@ async def test_setup_user_notify_service(hass: HomeAssistant) -> None:
 
     flow = await notify_auth_module.async_setup_flow("test-user")
     step = await flow.async_step_init()
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "init"
     schema = step["data_schema"]
     schema({"notify_service": "test2"})
@@ -277,7 +277,7 @@ async def test_setup_user_notify_service(hass: HomeAssistant) -> None:
 
     with patch("pyotp.HOTP.at", return_value=MOCK_CODE):
         step = await flow.async_step_init({"notify_service": "test1"})
-        assert step["type"] == data_entry_flow.FlowResultType.FORM
+        assert step["type"] is data_entry_flow.FlowResultType.FORM
         assert step["step_id"] == "setup"
 
     # wait service call finished
@@ -357,7 +357,7 @@ async def test_setup_user_no_notify_service(hass: HomeAssistant) -> None:
 
     flow = await notify_auth_module.async_setup_flow("test-user")
     step = await flow.async_step_init()
-    assert step["type"] == data_entry_flow.FlowResultType.ABORT
+    assert step["type"] is data_entry_flow.FlowResultType.ABORT
     assert step["reason"] == "no_available_service"
 
 
@@ -394,13 +394,13 @@ async def test_not_raise_exception_when_service_not_exist(hass: HomeAssistant) -
     provider = hass.auth.auth_providers[0]
 
     result = await hass.auth.login_flow.async_init((provider.type, provider.id))
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     with patch("pyotp.HOTP.at", return_value=MOCK_CODE):
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"username": "test-user", "password": "test-pass"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.ABORT
+        assert result["type"] is data_entry_flow.FlowResultType.ABORT
         assert result["reason"] == "unknown_error"
 
     # wait service call finished

tests/auth/mfa_modules/test_totp.py

@@ -95,24 +95,24 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
     provider = hass.auth.auth_providers[0]
 
     result = await hass.auth.login_flow.async_init((provider.type, provider.id))
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "incorrect-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "test-user", "password": "incorrect-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await hass.auth.login_flow.async_configure(
         result["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["step_id"] == "mfa"
     assert result["data_schema"].schema.get("code") is str
 
@@ -120,7 +120,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": "invalid-code"}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.FORM
+        assert result["type"] is data_entry_flow.FlowResultType.FORM
         assert result["step_id"] == "mfa"
         assert result["errors"]["base"] == "invalid_code"
 
@@ -128,7 +128,7 @@ async def test_login_flow_validates_mfa(hass: HomeAssistant) -> None:
         result = await hass.auth.login_flow.async_configure(
             result["flow_id"], {"code": MOCK_CODE}
         )
-        assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+        assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
         assert result["data"].id == "mock-id"
 
 

tests/auth/providers/test_command_line.py

@@ -139,18 +139,18 @@ async def test_login_flow_validates(
     """Test login flow."""
     flow = await provider.async_login_flow({})
     result = await flow.async_step_init()
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await flow.async_step_init(
         {"username": "bad-user", "password": "bad-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await flow.async_step_init(
         {"username": "good-user", "password": "good-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert result["data"]["username"] == "good-user"
 
 
@@ -160,5 +160,5 @@ async def test_strip_username(provider: command_line.CommandLineAuthProvider) ->
     result = await flow.async_step_init(
         {"username": "\t\ngood-user ", "password": "good-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert result["data"]["username"] == "good-user"

tests/auth/providers/test_homeassistant.py

@@ -161,24 +161,24 @@ async def test_login_flow_validates(data: hass_auth.Data, hass: HomeAssistant) -
     )
     flow = await provider.async_login_flow({})
     result = await flow.async_step_init()
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await flow.async_step_init(
         {"username": "incorrect-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await flow.async_step_init(
         {"username": "TEST-user ", "password": "incorrect-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await flow.async_step_init(
         {"username": "test-USER", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert result["data"]["username"] == "test-USER"
 
 
@@ -260,24 +260,24 @@ async def test_legacy_login_flow_validates(
     )
     flow = await provider.async_login_flow({})
     result = await flow.async_step_init()
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
 
     result = await flow.async_step_init(
         {"username": "incorrect-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await flow.async_step_init(
         {"username": "test-user", "password": "incorrect-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.FORM
+    assert result["type"] is data_entry_flow.FlowResultType.FORM
     assert result["errors"]["base"] == "invalid_auth"
 
     result = await flow.async_step_init(
         {"username": "test-user", "password": "test-pass"}
     )
-    assert result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert result["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert result["data"]["username"] == "test-user"
 
 

tests/auth/test_init.py

@@ -172,12 +172,12 @@ async def test_create_new_user(hass: HomeAssistant) -> None:
     )
 
     step = await manager.login_flow.async_init(("insecure_example", None))
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
-    assert step["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert step["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     credential = step["result"]
     assert credential is not None
 
@@ -241,12 +241,12 @@ async def test_login_as_existing_user(mock_hass) -> None:
     )
 
     step = await manager.login_flow.async_init(("insecure_example", None))
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
-    assert step["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert step["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
 
     credential = step["result"]
     user = await manager.async_get_user_by_credentials(credential)
@@ -840,14 +840,14 @@ async def test_login_with_auth_module(mock_hass) -> None:
     )
 
     step = await manager.login_flow.async_init(("insecure_example", None))
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
 
     # After auth_provider validated, request auth module input form
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "mfa"
 
     step = await manager.login_flow.async_configure(
@@ -855,7 +855,7 @@ async def test_login_with_auth_module(mock_hass) -> None:
     )
 
     # Invalid code error
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "mfa"
     assert step["errors"] == {"base": "invalid_code"}
 
@@ -864,7 +864,7 @@ async def test_login_with_auth_module(mock_hass) -> None:
     )
 
     # Finally passed, get credential
-    assert step["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert step["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert step["result"]
     assert step["result"].id == "mock-id"
 
@@ -915,21 +915,21 @@ async def test_login_with_multi_auth_module(mock_hass) -> None:
     )
 
     step = await manager.login_flow.async_init(("insecure_example", None))
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
 
     # After auth_provider validated, request select auth module
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "select_mfa_module"
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"multi_factor_auth_module": "module2"}
     )
 
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "mfa"
 
     step = await manager.login_flow.async_configure(
@@ -937,7 +937,7 @@ async def test_login_with_multi_auth_module(mock_hass) -> None:
     )
 
     # Finally passed, get credential
-    assert step["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY
+    assert step["type"] is data_entry_flow.FlowResultType.CREATE_ENTRY
     assert step["result"]
     assert step["result"].id == "mock-id"
 
@@ -983,13 +983,13 @@ async def test_auth_module_expired_session(mock_hass) -> None:
     )
 
     step = await manager.login_flow.async_init(("insecure_example", None))
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
 
     step = await manager.login_flow.async_configure(
         step["flow_id"], {"username": "test-user", "password": "test-pass"}
     )
 
-    assert step["type"] == data_entry_flow.FlowResultType.FORM
+    assert step["type"] is data_entry_flow.FlowResultType.FORM
     assert step["step_id"] == "mfa"
 
     with freeze_time(dt_util.utcnow() + MFA_SESSION_EXPIRATION):
@@ -997,7 +997,7 @@ async def test_auth_module_expired_session(mock_hass) -> None:
             step["flow_id"], {"pin": "test-pin"}
         )
         # login flow abort due session timeout
-        assert step["type"] == data_entry_flow.FlowResultType.ABORT
+        assert step["type"] is data_entry_flow.FlowResultType.ABORT
         assert step["reason"] == "login_expired"