Allow negative minimum and maximum for random sensor

.github/workflows/builder.yml

@@ -30,7 +30,7 @@ jobs:
       architectures: ${{ env.ARCHITECTURES }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -96,7 +96,7 @@ jobs:
             os: ubuntu-24.04-arm
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -273,7 +273,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set build additional args
         run: |
@@ -311,7 +311,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -416,19 +416,9 @@ jobs:
           ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
           for arch in $ARCHS; do
             echo "Copying ${arch} image to DockerHub..."
-            for attempt in 1 2 3; do
-              if docker buildx imagetools create \
-                --tag "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}" \
-                "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"; then
-                break
-              fi
-              echo "Attempt ${attempt} failed, retrying in 10 seconds..."
-              sleep 10
-              if [ "${attempt}" -eq 3 ]; then
-                echo "Failed after 3 attempts"
-                exit 1
-              fi
-            done
+            docker buildx imagetools create \
+              --tag "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}" \
+              "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
             cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
           done
 
@@ -474,7 +464,7 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -519,7 +509,7 @@ jobs:
       HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/ci.yaml

@@ -41,8 +41,8 @@ env:
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
   HA_SHORT_VERSION: "2026.1"
-  DEFAULT_PYTHON: "3.13.9"
-  ALL_PYTHON_VERSIONS: "['3.13.9', '3.14.0']"
+  DEFAULT_PYTHON: "3.13"
+  ALL_PYTHON_VERSIONS: "['3.13', '3.14']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -99,7 +99,7 @@ jobs:
     steps:
       - &checkout
         name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: |

.github/workflows/codeql.yml

@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           category: "/language:python"

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       # - No PRs marked as no-stale
       # - No issues (-1)
       - name: 60 days stale PRs policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 60
@@ -57,7 +57,7 @@ jobs:
       # - No issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: 90 days stale issues
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           days-before-stale: 90
@@ -87,7 +87,7 @@ jobs:
       # - No Issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: Needs more information stale issues policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           only-labels: "needs-more-information"

.github/workflows/translations.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0

.github/workflows/wheels.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
       - &checkout
         name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
@@ -136,7 +136,7 @@ jobs:
           sed -i "/uv/d" requirements_diff.txt
 
       - name: Build wheels
-        uses: &home-assistant-wheels home-assistant/wheels@e5742a69d69f0e274e2689c998900c7d19652c21 # 2025.12.0
+        uses: &home-assistant-wheels home-assistant/wheels@6066c17a2a4aafcf7bdfeae01717f63adfcdba98 # 2025.11.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2

CODEOWNERS

@@ -1763,7 +1763,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
-/tests/components/vivotek/ @HarlemSquirrel
 /homeassistant/components/vizio/ @raman325
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare

homeassistant/auth/permissions/events.py

@@ -7,7 +7,6 @@ from typing import Any, Final
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
     EVENT_CORE_CONFIG_UPDATE,
-    EVENT_LABS_UPDATED,
     EVENT_LOVELACE_UPDATED,
     EVENT_PANELS_UPDATED,
     EVENT_RECORDER_5MIN_STATISTICS_GENERATED,
@@ -46,7 +45,6 @@ SUBSCRIBE_ALLOWLIST: Final[set[EventType[Any] | str]] = {
     EVENT_STATE_CHANGED,
     EVENT_THEMES_UPDATED,
     EVENT_LABEL_REGISTRY_UPDATED,
-    EVENT_LABS_UPDATED,
     EVENT_CATEGORY_REGISTRY_UPDATED,
     EVENT_FLOOR_REGISTRY_UPDATED,
 }

homeassistant/components/alarm_control_panel/strings.json

@@ -159,74 +159,74 @@
   "title": "Alarm control panel",
   "triggers": {
     "armed": {
-      "description": "Triggers after one or more alarms become armed, regardless of the mode.",
+      "description": "Triggers when an alarm is armed.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm armed"
+      "name": "When an alarm is armed"
     },
     "armed_away": {
-      "description": "Triggers after one or more alarms become armed in away mode.",
+      "description": "Triggers when an alarm is armed away.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm armed away"
+      "name": "When an alarm is armed away"
     },
     "armed_home": {
-      "description": "Triggers after one or more alarms become armed in home mode.",
+      "description": "Triggers when an alarm is armed home.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm armed home"
+      "name": "When an alarm is armed home"
     },
     "armed_night": {
-      "description": "Triggers after one or more alarms become armed in night mode.",
+      "description": "Triggers when an alarm is armed night.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm armed night"
+      "name": "When an alarm is armed night"
     },
     "armed_vacation": {
-      "description": "Triggers after one or more alarms become armed in vacation mode.",
+      "description": "Triggers when an alarm is armed vacation.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm armed vacation"
+      "name": "When an alarm is armed vacation"
     },
     "disarmed": {
-      "description": "Triggers after one or more alarms become disarmed.",
+      "description": "Triggers when an alarm is disarmed.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm disarmed"
+      "name": "When an alarm is disarmed"
     },
     "triggered": {
-      "description": "Triggers after one or more alarms become triggered.",
+      "description": "Triggers when an alarm is triggered.",
       "fields": {
         "behavior": {
           "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
-      "name": "Alarm triggered"
+      "name": "When an alarm is triggered"
     }
   }
 }

homeassistant/components/assist_satellite/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.5.0"]
+  "requirements": ["hassil==3.4.0"]
 }

homeassistant/components/assist_satellite/strings.json

@@ -112,44 +112,44 @@
   "title": "Assist satellite",
   "triggers": {
     "idle": {
-      "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
+      "description": "Triggers when an Assist satellite becomes idle.",
       "fields": {
         "behavior": {
           "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
-      "name": "Satellite became idle"
+      "name": "When an Assist satellite becomes idle"
     },
     "listening": {
-      "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
+      "description": "Triggers when an Assist satellite starts listening.",
       "fields": {
         "behavior": {
           "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
-      "name": "Satellite started listening"
+      "name": "When an Assist satellite starts listening"
     },
     "processing": {
-      "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
+      "description": "Triggers when an Assist satellite is processing.",
       "fields": {
         "behavior": {
           "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
-      "name": "Satellite started processing"
+      "name": "When an Assist satellite is processing"
     },
     "responding": {
-      "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
+      "description": "Triggers when an Assist satellite is responding.",
       "fields": {
         "behavior": {
           "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
-      "name": "Satellite started responding"
+      "name": "When an Assist satellite is responding"
     }
   }
 }

homeassistant/components/automation/__init__.py

@@ -124,7 +124,6 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
 _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
-    "binary_sensor",
     "climate",
     "cover",
     "fan",

homeassistant/components/automation/manifest.json

@@ -8,8 +8,6 @@
   "integration_type": "system",
   "preview_features": {
     "new_triggers_conditions": {
-      "feedback_url": "https://forms.gle/fWFZqf5MzuwWTsCH8",
-      "learn_more_url": "https://www.home-assistant.io/blog/2025/12/03/release-202512/#purpose-specific-triggers-and-conditions",
       "report_issue_url": "https://github.com/home-assistant/core/issues/new?template=bug_report.yml&integration_link=https://www.home-assistant.io/integrations/automation&integration_name=Automation"
     }
   },

homeassistant/components/automation/strings.json

@@ -69,10 +69,10 @@
   },
   "preview_features": {
     "new_triggers_conditions": {
-      "description": "Enables new purpose-specific triggers and conditions that are more user-friendly than technical state-based options.\n\nThese new automation features support targets across your entire home, letting you trigger automations for any entity, device, area, floor, or label (for example, when any light in your living room turned on). Integrations can now also provide their own purpose-specific triggers and conditions, just like actions.\n\nThis preview also includes a new tree view to help you navigate your home when adding triggers, conditions, and actions.",
-      "disable_confirmation": "Disabling this preview will cause automations and scripts that use the new purpose-specific triggers and conditions to fail.\n\nBefore disabling, ensure that your automations or scripts do not rely on this feature.",
-      "enable_confirmation": "This feature is still in development and may change. These new purpose-specific triggers and conditions are being refined based on user feedback and are not yet complete.\n\nBy enabling this preview, you'll have early access to these new capabilities, but be aware that they may be modified or updated in future releases.",
-      "name": "Purpose-specific triggers and conditions"
+      "description": "Enables new intuitive triggers and conditions that are more user-friendly than technical state-based options.\n\nThese new automation features support targets across your entire home, letting you trigger automations for any entity, device, area, floor, or label (for example, when any light in your living room turned on). Integrations can now also provide their own intuitive triggers and conditions, just like actions.\n\nThis preview also includes a new tree view to help you navigate your home when adding triggers, conditions, and actions.",
+      "disable_confirmation": "Disabling this preview will cause automations and scripts that use the new intuitive triggers and conditions to fail.\n\nBefore disabling, ensure that your automations or scripts do not rely on this feature.",
+      "enable_confirmation": "This feature is still in development and may change. These new intuitive triggers and conditions are being refined based on user feedback and are not yet complete.\n\nBy enabling this preview, you'll have early access to these new capabilities, but be aware that they may be modified or updated in future releases.",
+      "name": "Intuitive triggers and conditions"
     }
   },
   "services": {

homeassistant/components/bang_olufsen/__init__.py

@@ -21,29 +21,29 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.util.ssl import get_default_context
 
 from .const import DOMAIN
-from .websocket import BeoWebsocket
+from .websocket import BangOlufsenWebsocket
 
 
 @dataclass
-class BeoData:
+class BangOlufsenData:
     """Dataclass for API client and WebSocket client."""
 
-    websocket: BeoWebsocket
+    websocket: BangOlufsenWebsocket
     client: MozartClient
 
 
-type BeoConfigEntry = ConfigEntry[BeoData]
+type BangOlufsenConfigEntry = ConfigEntry[BangOlufsenData]
 
 PLATFORMS = [Platform.EVENT, Platform.MEDIA_PLAYER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry) -> bool:
     """Set up from a config entry."""
 
     # Remove casts to str
     assert entry.unique_id
 
-    # Create device now as BeoWebsocket needs a device for debug logging, firing events etc.
+    # Create device now as BangOlufsenWebsocket needs a device for debug logging, firing events etc.
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
@@ -68,10 +68,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
         await client.close_api_client()
         raise ConfigEntryNotReady(f"Unable to connect to {entry.title}") from error
 
-    websocket = BeoWebsocket(hass, entry, client)
+    websocket = BangOlufsenWebsocket(hass, entry, client)
 
     # Add the websocket and API client
-    entry.runtime_data = BeoData(websocket, client)
+    entry.runtime_data = BangOlufsenData(websocket, client)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -82,7 +82,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: BangOlufsenConfigEntry
+) -> bool:
     """Unload a config entry."""
     # Close the API client and WebSocket notification listener
     entry.runtime_data.client.disconnect_notifications()

homeassistant/components/bang_olufsen/config_flow.py

@@ -47,7 +47,7 @@ _exception_map = {
 }
 
 
-class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
+class BangOlufsenConfigFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     _beolink_jid = ""

homeassistant/components/bang_olufsen/const.py

@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
 )
 
 
-class BeoSource:
+class BangOlufsenSource:
     """Class used for associating device source ids with friendly names. May not include all sources."""
 
     DEEZER: Final[Source] = Source(name="Deezer", id="deezer")
@@ -26,7 +26,7 @@ class BeoSource:
     URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
 
 
-BEO_STATES: dict[str, MediaPlayerState] = {
+BANG_OLUFSEN_STATES: dict[str, MediaPlayerState] = {
     # Dict used for translating device states to Home Assistant states.
     "started": MediaPlayerState.PLAYING,
     "buffering": MediaPlayerState.PLAYING,
@@ -40,19 +40,19 @@ BEO_STATES: dict[str, MediaPlayerState] = {
 }
 
 # Dict used for translating Home Assistant settings to device repeat settings.
-BEO_REPEAT_FROM_HA: dict[RepeatMode, str] = {
+BANG_OLUFSEN_REPEAT_FROM_HA: dict[RepeatMode, str] = {
     RepeatMode.ALL: "all",
     RepeatMode.ONE: "track",
     RepeatMode.OFF: "none",
 }
 # Dict used for translating device repeat settings to Home Assistant settings.
-BEO_REPEAT_TO_HA: dict[str, RepeatMode] = {
-    value: key for key, value in BEO_REPEAT_FROM_HA.items()
+BANG_OLUFSEN_REPEAT_TO_HA: dict[str, RepeatMode] = {
+    value: key for key, value in BANG_OLUFSEN_REPEAT_FROM_HA.items()
 }
 
 
 # Media types for play_media
-class BeoMediaType(StrEnum):
+class BangOlufsenMediaType(StrEnum):
     """Bang & Olufsen specific media types."""
 
     FAVOURITE = "favourite"
@@ -63,7 +63,7 @@ class BeoMediaType(StrEnum):
     OVERLAY_TTS = "overlay_tts"
 
 
-class BeoModel(StrEnum):
+class BangOlufsenModel(StrEnum):
     """Enum for compatible model names."""
 
     # Mozart devices
@@ -82,7 +82,7 @@ class BeoModel(StrEnum):
     BEOREMOTE_ONE = "Beoremote One"
 
 
-class BeoAttribute(StrEnum):
+class BangOlufsenAttribute(StrEnum):
     """Enum for extra_state_attribute keys."""
 
     BEOLINK = "beolink"
@@ -93,7 +93,7 @@ class BeoAttribute(StrEnum):
 
 
 # Physical "buttons" on devices
-class BeoButtons(StrEnum):
+class BangOlufsenButtons(StrEnum):
     """Enum for device buttons."""
 
     BLUETOOTH = "Bluetooth"
@@ -140,7 +140,7 @@ class WebsocketNotification(StrEnum):
 DOMAIN: Final[str] = "bang_olufsen"
 
 # Default values for configuration.
-DEFAULT_MODEL: Final[str] = BeoModel.BEOSOUND_BALANCE
+DEFAULT_MODEL: Final[str] = BangOlufsenModel.BEOSOUND_BALANCE
 
 # Configuration.
 CONF_SERIAL_NUMBER: Final = "serial_number"
@@ -148,7 +148,7 @@ CONF_BEOLINK_JID: Final = "jid"
 
 # Models to choose from in manual configuration.
 SELECTABLE_MODELS: list[str] = [
-    model.value for model in BeoModel if model != BeoModel.BEOREMOTE_ONE
+    model.value for model in BangOlufsenModel if model != BangOlufsenModel.BEOREMOTE_ONE
 ]
 
 MANUFACTURER: Final[str] = "Bang & Olufsen"
@@ -160,15 +160,15 @@ ATTR_ITEM_NUMBER: Final[str] = "in"
 ATTR_FRIENDLY_NAME: Final[str] = "fn"
 
 # Power states.
-BEO_ON: Final[str] = "on"
+BANG_OLUFSEN_ON: Final[str] = "on"
 
 VALID_MEDIA_TYPES: Final[tuple] = (
-    BeoMediaType.FAVOURITE,
-    BeoMediaType.DEEZER,
-    BeoMediaType.RADIO,
-    BeoMediaType.TTS,
-    BeoMediaType.TIDAL,
-    BeoMediaType.OVERLAY_TTS,
+    BangOlufsenMediaType.FAVOURITE,
+    BangOlufsenMediaType.DEEZER,
+    BangOlufsenMediaType.RADIO,
+    BangOlufsenMediaType.TTS,
+    BangOlufsenMediaType.TIDAL,
+    BangOlufsenMediaType.OVERLAY_TTS,
     MediaType.MUSIC,
     MediaType.URL,
     MediaType.CHANNEL,
@@ -246,7 +246,7 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
 )
 
 # Device events
-BEO_WEBSOCKET_EVENT: Final[str] = f"{DOMAIN}_websocket_event"
+BANG_OLUFSEN_WEBSOCKET_EVENT: Final[str] = f"{DOMAIN}_websocket_event"
 
 # Dict used to translate native Bang & Olufsen event names to string.json compatible ones
 EVENT_TRANSLATION_MAP: dict[str, str] = {
@@ -263,7 +263,7 @@ EVENT_TRANSLATION_MAP: dict[str, str] = {
 
 CONNECTION_STATUS: Final[str] = "CONNECTION_STATUS"
 
-DEVICE_BUTTONS: Final[list[str]] = [x.value for x in BeoButtons]
+DEVICE_BUTTONS: Final[list[str]] = [x.value for x in BangOlufsenButtons]
 
 
 DEVICE_BUTTON_EVENTS: Final[list[str]] = [

homeassistant/components/bang_olufsen/diagnostics.py

@@ -10,13 +10,13 @@ from homeassistant.const import CONF_MODEL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import DOMAIN
 from .util import get_device_buttons
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: BeoConfigEntry
+    hass: HomeAssistant, config_entry: BangOlufsenConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 

homeassistant/components/bang_olufsen/entity.py

@@ -24,8 +24,8 @@ from homeassistant.helpers.entity import Entity
 from .const import DOMAIN
 
 
-class BeoBase:
-    """Base class for Bang & Olufsen Home Assistant objects."""
+class BangOlufsenBase:
+    """Base class for BangOlufsen Home Assistant objects."""
 
     def __init__(self, entry: ConfigEntry, client: MozartClient) -> None:
         """Initialize the object."""
@@ -51,8 +51,8 @@ class BeoBase:
         )
 
 
-class BeoEntity(Entity, BeoBase):
-    """Base Entity for Bang & Olufsen entities."""
+class BangOlufsenEntity(Entity, BangOlufsenBase):
+    """Base Entity for BangOlufsen entities."""
 
     _attr_has_entity_name = True
     _attr_should_poll = False

homeassistant/components/bang_olufsen/event.py

@@ -14,7 +14,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import (
     BEO_REMOTE_CONTROL_KEYS,
     BEO_REMOTE_KEY_EVENTS,
@@ -25,10 +25,10 @@ from .const import (
     DEVICE_BUTTON_EVENTS,
     DOMAIN,
     MANUFACTURER,
-    BeoModel,
+    BangOlufsenModel,
     WebsocketNotification,
 )
-from .entity import BeoEntity
+from .entity import BangOlufsenEntity
 from .util import get_device_buttons, get_remotes
 
 PARALLEL_UPDATES = 0
@@ -36,14 +36,14 @@ PARALLEL_UPDATES = 0
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BeoConfigEntry,
+    config_entry: BangOlufsenConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Event entities from config entry."""
-    entities: list[BeoEvent] = []
+    entities: list[BangOlufsenEvent] = []
 
     async_add_entities(
-        BeoButtonEvent(config_entry, button_type)
+        BangOlufsenButtonEvent(config_entry, button_type)
         for button_type in get_device_buttons(config_entry.data[CONF_MODEL])
     )
 
@@ -54,7 +54,7 @@ async def async_setup_entry(
         # Add Light keys
         entities.extend(
             [
-                BeoRemoteKeyEvent(
+                BangOlufsenRemoteKeyEvent(
                     config_entry,
                     remote,
                     f"{BEO_REMOTE_SUBMENU_LIGHT}/{key_type}",
@@ -66,7 +66,7 @@ async def async_setup_entry(
         # Add Control keys
         entities.extend(
             [
-                BeoRemoteKeyEvent(
+                BangOlufsenRemoteKeyEvent(
                     config_entry,
                     remote,
                     f"{BEO_REMOTE_SUBMENU_CONTROL}/{key_type}",
@@ -84,9 +84,10 @@ async def async_setup_entry(
         config_entry.entry_id
     )
     for device in devices:
-        if device.model == BeoModel.BEOREMOTE_ONE and device.serial_number not in {
-            remote.serial_number for remote in remotes
-        }:
+        if (
+            device.model == BangOlufsenModel.BEOREMOTE_ONE
+            and device.serial_number not in {remote.serial_number for remote in remotes}
+        ):
             device_registry.async_update_device(
                 device.id, remove_config_entry_id=config_entry.entry_id
             )
@@ -94,13 +95,13 @@ async def async_setup_entry(
     async_add_entities(new_entities=entities)
 
 
-class BeoEvent(BeoEntity, EventEntity):
+class BangOlufsenEvent(BangOlufsenEntity, EventEntity):
     """Base Event class."""
 
     _attr_device_class = EventDeviceClass.BUTTON
     _attr_entity_registry_enabled_default = False
 
-    def __init__(self, config_entry: BeoConfigEntry) -> None:
+    def __init__(self, config_entry: BangOlufsenConfigEntry) -> None:
         """Initialize Event."""
         super().__init__(config_entry, config_entry.runtime_data.client)
 
@@ -111,12 +112,12 @@ class BeoEvent(BeoEntity, EventEntity):
         self.async_write_ha_state()
 
 
-class BeoButtonEvent(BeoEvent):
+class BangOlufsenButtonEvent(BangOlufsenEvent):
     """Event class for Button events."""
 
     _attr_event_types = DEVICE_BUTTON_EVENTS
 
-    def __init__(self, config_entry: BeoConfigEntry, button_type: str) -> None:
+    def __init__(self, config_entry: BangOlufsenConfigEntry, button_type: str) -> None:
         """Initialize Button."""
         super().__init__(config_entry)
 
@@ -145,14 +146,14 @@ class BeoButtonEvent(BeoEvent):
         )
 
 
-class BeoRemoteKeyEvent(BeoEvent):
+class BangOlufsenRemoteKeyEvent(BangOlufsenEvent):
     """Event class for Beoremote One key events."""
 
     _attr_event_types = BEO_REMOTE_KEY_EVENTS
 
     def __init__(
         self,
-        config_entry: BeoConfigEntry,
+        config_entry: BangOlufsenConfigEntry,
         remote: PairedRemote,
         key_type: str,
     ) -> None:
@@ -165,8 +166,8 @@ class BeoRemoteKeyEvent(BeoEvent):
         self._attr_unique_id = f"{remote.serial_number}_{self._unique_id}_{key_type}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")},
-            name=f"{BeoModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
-            model=BeoModel.BEOREMOTE_ONE,
+            name=f"{BangOlufsenModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
+            model=BangOlufsenModel.BEOREMOTE_ONE,
             serial_number=remote.serial_number,
             sw_version=remote.app_version,
             manufacturer=MANUFACTURER,

homeassistant/components/bang_olufsen/media_player.py

@@ -69,11 +69,11 @@ from homeassistant.helpers.entity_platform import (
 )
 from homeassistant.util.dt import utcnow
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import (
-    BEO_REPEAT_FROM_HA,
-    BEO_REPEAT_TO_HA,
-    BEO_STATES,
+    BANG_OLUFSEN_REPEAT_FROM_HA,
+    BANG_OLUFSEN_REPEAT_TO_HA,
+    BANG_OLUFSEN_STATES,
     BEOLINK_JOIN_SOURCES,
     BEOLINK_JOIN_SOURCES_TO_UPPER,
     CONF_BEOLINK_JID,
@@ -82,12 +82,12 @@ from .const import (
     FALLBACK_SOURCES,
     MANUFACTURER,
     VALID_MEDIA_TYPES,
-    BeoAttribute,
-    BeoMediaType,
-    BeoSource,
+    BangOlufsenAttribute,
+    BangOlufsenMediaType,
+    BangOlufsenSource,
     WebsocketNotification,
 )
-from .entity import BeoEntity
+from .entity import BangOlufsenEntity
 from .util import get_serial_number_from_jid
 
 PARALLEL_UPDATES = 0
@@ -96,7 +96,7 @@ SCAN_INTERVAL = timedelta(seconds=30)
 
 _LOGGER = logging.getLogger(__name__)
 
-BEO_FEATURES = (
+BANG_OLUFSEN_FEATURES = (
     MediaPlayerEntityFeature.BROWSE_MEDIA
     | MediaPlayerEntityFeature.CLEAR_PLAYLIST
     | MediaPlayerEntityFeature.GROUPING
@@ -119,13 +119,15 @@ BEO_FEATURES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BeoConfigEntry,
+    config_entry: BangOlufsenConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Media Player entity from config entry."""
     # Add MediaPlayer entity
     async_add_entities(
-        new_entities=[BeoMediaPlayer(config_entry, config_entry.runtime_data.client)],
+        new_entities=[
+            BangOlufsenMediaPlayer(config_entry, config_entry.runtime_data.client)
+        ],
         update_before_add=True,
     )
 
@@ -185,7 +187,7 @@ async def async_setup_entry(
     )
 
 
-class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
+class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
     """Representation of a media player."""
 
     _attr_name = None
@@ -286,7 +288,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
             queue_settings = await self._client.get_settings_queue(_request_timeout=5)
 
             if queue_settings.repeat is not None:
-                self._attr_repeat = BEO_REPEAT_TO_HA[queue_settings.repeat]
+                self._attr_repeat = BANG_OLUFSEN_REPEAT_TO_HA[queue_settings.repeat]
 
             if queue_settings.shuffle is not None:
                 self._attr_shuffle = queue_settings.shuffle
@@ -406,8 +408,8 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # Check if source is line-in or optical and progress should be updated
         if self._source_change.id in (
-            BeoSource.LINE_IN.id,
-            BeoSource.SPDIF.id,
+            BangOlufsenSource.LINE_IN.id,
+            BangOlufsenSource.SPDIF.id,
         ):
             self._playback_progress = PlaybackProgress(progress=0)
 
@@ -448,8 +450,10 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # Add Beolink self
         self._beolink_attributes = {
-            BeoAttribute.BEOLINK: {
-                BeoAttribute.BEOLINK_SELF: {self.device_entry.name: self._beolink_jid}
+            BangOlufsenAttribute.BEOLINK: {
+                BangOlufsenAttribute.BEOLINK_SELF: {
+                    self.device_entry.name: self._beolink_jid
+                }
             }
         }
 
@@ -457,12 +461,12 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         peers = await self._client.get_beolink_peers()
 
         if len(peers) > 0:
-            self._beolink_attributes[BeoAttribute.BEOLINK][
-                BeoAttribute.BEOLINK_PEERS
+            self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
+                BangOlufsenAttribute.BEOLINK_PEERS
             ] = {}
             for peer in peers:
-                self._beolink_attributes[BeoAttribute.BEOLINK][
-                    BeoAttribute.BEOLINK_PEERS
+                self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
+                    BangOlufsenAttribute.BEOLINK_PEERS
                 ][peer.friendly_name] = peer.jid
 
         # Add Beolink listeners / leader
@@ -484,8 +488,8 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
             # Add self
             group_members.append(self.entity_id)
 
-            self._beolink_attributes[BeoAttribute.BEOLINK][
-                BeoAttribute.BEOLINK_LEADER
+            self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
+                BangOlufsenAttribute.BEOLINK_LEADER
             ] = {
                 self._remote_leader.friendly_name: self._remote_leader.jid,
             }
@@ -523,8 +527,8 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                                 beolink_listener.jid
                             )
                             break
-                self._beolink_attributes[BeoAttribute.BEOLINK][
-                    BeoAttribute.BEOLINK_LISTENERS
+                self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
+                    BangOlufsenAttribute.BEOLINK_LISTENERS
                 ] = beolink_listeners_attribute
 
         self._attr_group_members = group_members
@@ -596,7 +600,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     @property
     def supported_features(self) -> MediaPlayerEntityFeature:
         """Flag media player features that are supported."""
-        features = BEO_FEATURES
+        features = BANG_OLUFSEN_FEATURES
 
         # Add seeking if supported by the current source
         if self._source_change.is_seekable is True:
@@ -607,7 +611,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     @property
     def state(self) -> MediaPlayerState:
         """Return the current state of the media player."""
-        return BEO_STATES[self._state]
+        return BANG_OLUFSEN_STATES[self._state]
 
     @property
     def volume_level(self) -> float | None:
@@ -627,10 +631,10 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     def media_content_type(self) -> MediaType | str | None:
         """Return the current media type."""
         content_type = {
-            BeoSource.URI_STREAMER.id: MediaType.URL,
-            BeoSource.DEEZER.id: BeoMediaType.DEEZER,
-            BeoSource.TIDAL.id: BeoMediaType.TIDAL,
-            BeoSource.NET_RADIO.id: BeoMediaType.RADIO,
+            BangOlufsenSource.URI_STREAMER.id: MediaType.URL,
+            BangOlufsenSource.DEEZER.id: BangOlufsenMediaType.DEEZER,
+            BangOlufsenSource.TIDAL.id: BangOlufsenMediaType.TIDAL,
+            BangOlufsenSource.NET_RADIO.id: BangOlufsenMediaType.RADIO,
         }
         # Hard to determine content type.
         if self._source_change.id in content_type:
@@ -761,7 +765,9 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     async def async_set_repeat(self, repeat: RepeatMode) -> None:
         """Set playback queues to repeat."""
         await self._client.set_settings_queue(
-            play_queue_settings=PlayQueueSettings(repeat=BEO_REPEAT_FROM_HA[repeat])
+            play_queue_settings=PlayQueueSettings(
+                repeat=BANG_OLUFSEN_REPEAT_FROM_HA[repeat]
+            )
         )
 
     async def async_set_shuffle(self, shuffle: bool) -> None:
@@ -865,7 +871,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                         self._volume.level.level + offset_volume, 100
                     )
 
-            if media_type == BeoMediaType.OVERLAY_TTS:
+            if media_type == BangOlufsenMediaType.OVERLAY_TTS:
                 # Bang & Olufsen cloud TTS
                 overlay_play_request.text_to_speech = (
                     OverlayPlayRequestTextToSpeechTextToSpeech(
@@ -882,14 +888,14 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # The "provider" media_type may not be suitable for overlay all the time.
         # Use it for now.
-        elif media_type == BeoMediaType.TTS:
+        elif media_type == BangOlufsenMediaType.TTS:
             await self._client.post_overlay_play(
                 overlay_play_request=OverlayPlayRequest(
                     uri=Uri(location=media_id),
                 )
             )
 
-        elif media_type == BeoMediaType.RADIO:
+        elif media_type == BangOlufsenMediaType.RADIO:
             await self._client.run_provided_scene(
                 scene_properties=SceneProperties(
                     action_list=[
@@ -901,13 +907,13 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                 )
             )
 
-        elif media_type == BeoMediaType.FAVOURITE:
+        elif media_type == BangOlufsenMediaType.FAVOURITE:
             await self._client.activate_preset(id=int(media_id))
 
-        elif media_type in (BeoMediaType.DEEZER, BeoMediaType.TIDAL):
+        elif media_type in (BangOlufsenMediaType.DEEZER, BangOlufsenMediaType.TIDAL):
             try:
                 # Play Deezer flow.
-                if media_id == "flow" and media_type == BeoMediaType.DEEZER:
+                if media_id == "flow" and media_type == BangOlufsenMediaType.DEEZER:
                     deezer_id = None
 
                     if "id" in kwargs[ATTR_MEDIA_EXTRA]:

homeassistant/components/bang_olufsen/util.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceEntry
 
-from .const import DEVICE_BUTTONS, DOMAIN, BeoButtons, BeoModel
+from .const import DEVICE_BUTTONS, DOMAIN, BangOlufsenButtons, BangOlufsenModel
 
 
 def get_device(hass: HomeAssistant, unique_id: str) -> DeviceEntry:
@@ -40,16 +40,16 @@ async def get_remotes(client: MozartClient) -> list[PairedRemote]:
     ]
 
 
-def get_device_buttons(model: BeoModel) -> list[str]:
+def get_device_buttons(model: BangOlufsenModel) -> list[str]:
     """Get supported buttons for a given model."""
     buttons = DEVICE_BUTTONS.copy()
 
     # Beosound Premiere does not have a bluetooth button
-    if model == BeoModel.BEOSOUND_PREMIERE:
-        buttons.remove(BeoButtons.BLUETOOTH)
+    if model == BangOlufsenModel.BEOSOUND_PREMIERE:
+        buttons.remove(BangOlufsenButtons.BLUETOOTH)
 
     # Beoconnect Core does not have any buttons
-    elif model == BeoModel.BEOCONNECT_CORE:
+    elif model == BangOlufsenModel.BEOCONNECT_CORE:
         buttons = []
 
     return buttons

homeassistant/components/bang_olufsen/websocket.py

@@ -27,20 +27,20 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.util.enum import try_parse_enum
 
 from .const import (
-    BEO_WEBSOCKET_EVENT,
+    BANG_OLUFSEN_WEBSOCKET_EVENT,
     CONNECTION_STATUS,
     DOMAIN,
     EVENT_TRANSLATION_MAP,
-    BeoModel,
+    BangOlufsenModel,
     WebsocketNotification,
 )
-from .entity import BeoBase
+from .entity import BangOlufsenBase
 from .util import get_device, get_remotes
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class BeoWebsocket(BeoBase):
+class BangOlufsenWebsocket(BangOlufsenBase):
     """The WebSocket listeners."""
 
     def __init__(
@@ -48,7 +48,7 @@ class BeoWebsocket(BeoBase):
     ) -> None:
         """Initialize the WebSocket listeners."""
 
-        BeoBase.__init__(self, entry, client)
+        BangOlufsenBase.__init__(self, entry, client)
 
         self.hass = hass
         self._device = get_device(hass, self._unique_id)
@@ -178,7 +178,7 @@ class BeoWebsocket(BeoBase):
                     self.entry.entry_id
                 )
                 if device.serial_number is not None
-                and device.model == BeoModel.BEOREMOTE_ONE
+                and device.model == BangOlufsenModel.BEOREMOTE_ONE
             ]
             # Get paired remotes from device
             remote_serial_numbers = [
@@ -274,4 +274,4 @@ class BeoWebsocket(BeoBase):
         }
 
         _LOGGER.debug("%s", debug_notification)
-        self.hass.bus.async_fire(BEO_WEBSOCKET_EVENT, debug_notification)
+        self.hass.bus.async_fire(BANG_OLUFSEN_WEBSOCKET_EVENT, debug_notification)

homeassistant/components/binary_sensor/icons.json

@@ -174,13 +174,5 @@
         "on": "mdi:window-open"
       }
     }
-  },
-  "triggers": {
-    "occupancy_cleared": {
-      "trigger": "mdi:home-outline"
-    },
-    "occupancy_detected": {
-      "trigger": "mdi:home"
-    }
   }
 }

homeassistant/components/binary_sensor/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description_occupancy": "The behavior of the targeted occupancy sensors to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "device_automation": {
     "condition_type": {
       "is_bat_low": "{entity_name} battery is low",
@@ -321,36 +317,5 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Binary sensor",
-  "triggers": {
-    "occupancy_cleared": {
-      "description": "Triggers after one or more occupancy sensors stop detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::binary_sensor::common::trigger_behavior_description_occupancy%]",
-          "name": "[%key:component::binary_sensor::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Occupancy cleared"
-    },
-    "occupancy_detected": {
-      "description": "Triggers after one or more occupancy sensors start detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::binary_sensor::common::trigger_behavior_description_occupancy%]",
-          "name": "[%key:component::binary_sensor::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Occupancy detected"
-    }
-  }
+  "title": "Binary sensor"
 }

homeassistant/components/binary_sensor/trigger.py

@@ -1,67 +0,0 @@
-"""Provides triggers for binary sensors."""
-
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import get_device_class
-from homeassistant.helpers.trigger import EntityStateTriggerBase, Trigger
-from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-
-from . import DOMAIN, BinarySensorDeviceClass
-
-
-def get_device_class_or_undefined(
-    hass: HomeAssistant, entity_id: str
-) -> str | None | UndefinedType:
-    """Get the device class of an entity or UNDEFINED if not found."""
-    try:
-        return get_device_class(hass, entity_id)
-    except HomeAssistantError:
-        return UNDEFINED
-
-
-class BinarySensorOnOffTrigger(EntityStateTriggerBase):
-    """Class for binary sensor on/off triggers."""
-
-    _device_class: BinarySensorDeviceClass | None
-    _domain: str = DOMAIN
-
-    def entity_filter(self, entities: set[str]) -> set[str]:
-        """Filter entities of this domain."""
-        entities = super().entity_filter(entities)
-        return {
-            entity_id
-            for entity_id in entities
-            if get_device_class_or_undefined(self._hass, entity_id)
-            == self._device_class
-        }
-
-
-def make_binary_sensor_trigger(
-    device_class: BinarySensorDeviceClass | None,
-    to_state: str,
-) -> type[BinarySensorOnOffTrigger]:
-    """Create an entity state trigger class."""
-
-    class CustomTrigger(BinarySensorOnOffTrigger):
-        """Trigger for entity state changes."""
-
-        _device_class = device_class
-        _to_state = to_state
-
-    return CustomTrigger
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "occupancy_detected": make_binary_sensor_trigger(
-        BinarySensorDeviceClass.OCCUPANCY, STATE_ON
-    ),
-    "occupancy_cleared": make_binary_sensor_trigger(
-        BinarySensorDeviceClass.OCCUPANCY, STATE_OFF
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for binary sensors."""
-    return TRIGGERS

homeassistant/components/binary_sensor/triggers.yaml

@@ -1,25 +0,0 @@
-.trigger_common_fields: &trigger_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
-
-occupancy_cleared:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: binary_sensor
-      device_class: occupancy
-
-occupancy_detected:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: binary_sensor
-      device_class: occupancy

homeassistant/components/bluetooth/manifest.json

@@ -15,12 +15,12 @@
   ],
   "quality_scale": "internal",
   "requirements": [
-    "bleak==2.0.0",
+    "bleak==1.0.1",
     "bleak-retry-connector==4.4.3",
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
     "dbus-fast==3.1.2",
-    "habluetooth==5.8.0"
+    "habluetooth==5.7.0"
   ]
 }

homeassistant/components/broadlink/manifest.json

@@ -36,7 +36,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/broadlink",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["broadlink"],
   "requirements": ["broadlink==0.19.0"]

homeassistant/components/camera/__init__.py

@@ -407,8 +407,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         return [
             RTCIceServer(
                 urls=[
-                    "stun:stun.home-assistant.io:3478",
                     "stun:stun.home-assistant.io:80",
+                    "stun:stun.home-assistant.io:3478",
                 ]
             ),
         ]

homeassistant/components/climate/strings.json

@@ -299,54 +299,54 @@
   "title": "Climate",
   "triggers": {
     "started_cooling": {
-      "description": "Triggers after one or more climate-control devices start cooling.",
+      "description": "Triggers when a climate started cooling.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started cooling"
+      "name": "When a climate started cooling"
     },
     "started_drying": {
-      "description": "Triggers after one or more climate-control devices start drying.",
+      "description": "Triggers when a climate started drying.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started drying"
+      "name": "When a climate started drying"
     },
     "started_heating": {
-      "description": "Triggers after one or more climate-control devices start heating.",
+      "description": "Triggers when a climate starts to heat.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device started heating"
+      "name": "When a climate starts to heat"
     },
     "turned_off": {
-      "description": "Triggers after one or more climate-control devices turn off.",
+      "description": "Triggers when a climate is turned off.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device turned off"
+      "name": "When a climate is turned off"
     },
     "turned_on": {
-      "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
+      "description": "Triggers when a climate is turned on.",
       "fields": {
         "behavior": {
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
-      "name": "Climate-control device turned on"
+      "name": "When a climate is turned on"
     }
   }
 }

homeassistant/components/cloud/__init__.py

@@ -4,13 +4,12 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from contextlib import suppress
 from datetime import datetime, timedelta
 from enum import Enum
 import logging
 from typing import Any, cast
 
-from hass_nabucasa import Cloud, NabuCasaBaseError
+from hass_nabucasa import Cloud
 import voluptuous as vol
 
 from homeassistant.components import alexa, google_assistant
@@ -79,16 +78,13 @@ from .subscription import async_subscription_info
 DEFAULT_MODE = MODE_PROD
 
 PLATFORMS = [
+    Platform.AI_TASK,
     Platform.BINARY_SENSOR,
+    Platform.CONVERSATION,
     Platform.STT,
     Platform.TTS,
 ]
 
-LLM_PLATFORMS = [
-    Platform.AI_TASK,
-    Platform.CONVERSATION,
-]
-
 SERVICE_REMOTE_CONNECT = "remote_connect"
 SERVICE_REMOTE_DISCONNECT = "remote_disconnect"
 
@@ -435,14 +431,7 @@ def _handle_prefs_updated(hass: HomeAssistant, cloud: Cloud[CloudClient]) -> Non
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
-    platforms = PLATFORMS.copy()
-    if (cloud := hass.data[DATA_CLOUD]).is_logged_in:
-        with suppress(NabuCasaBaseError):
-            await cloud.llm.async_ensure_token()
-            platforms += LLM_PLATFORMS
-
-    await hass.config_entries.async_forward_entry_setups(entry, platforms)
-    entry.runtime_data = {"platforms": platforms}
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     stt_tts_entities_added = hass.data[DATA_PLATFORMS_SETUP]["stt_tts_entities_added"]
     stt_tts_entities_added.set()
 
@@ -451,9 +440,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(
-        entry, entry.runtime_data["platforms"]
-    )
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
 @callback

homeassistant/components/cloud/ai_task.py

@@ -6,6 +6,7 @@ import io
 from json import JSONDecodeError
 import logging
 
+from hass_nabucasa import NabuCasaBaseError
 from hass_nabucasa.llm import (
     LLMAuthenticationError,
     LLMError,
@@ -19,7 +20,7 @@ from PIL import Image
 from homeassistant.components import ai_task, conversation
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.json import json_loads
 
@@ -93,11 +94,17 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Home Assistant Cloud AI Task entity."""
-    cloud = hass.data[DATA_CLOUD]
-    async_add_entities([CloudAITaskEntity(cloud, config_entry)])
+    if not (cloud := hass.data[DATA_CLOUD]).is_logged_in:
+        return
+    try:
+        await cloud.llm.async_ensure_token()
+    except (LLMError, NabuCasaBaseError):
+        return
+
+    async_add_entities([CloudLLMTaskEntity(cloud, config_entry)])
 
 
-class CloudAITaskEntity(BaseCloudLLMEntity, ai_task.AITaskEntity):
+class CloudLLMTaskEntity(ai_task.AITaskEntity, BaseCloudLLMEntity):
     """Home Assistant Cloud AI Task entity."""
 
     _attr_has_entity_name = True
@@ -174,7 +181,7 @@ class CloudAITaskEntity(BaseCloudLLMEntity, ai_task.AITaskEntity):
                     attachments=attachments,
                 )
         except LLMAuthenticationError as err:
-            raise HomeAssistantError("Cloud LLM authentication failed") from err
+            raise ConfigEntryAuthFailed("Cloud LLM authentication failed") from err
         except LLMRateLimitError as err:
             raise HomeAssistantError("Cloud LLM is rate limited") from err
         except LLMResponseError as err:

homeassistant/components/cloud/client.py

@@ -71,7 +71,6 @@ class CloudClient(Interface):
         self._google_config_init_lock = asyncio.Lock()
         self._relayer_region: str | None = None
         self._cloud_ice_servers_listener: Callable[[], None] | None = None
-        self._ice_servers: list[RTCIceServer] = []
 
     @property
     def base_path(self) -> Path:
@@ -118,11 +117,6 @@ class CloudClient(Interface):
         """Return the connected relayer region."""
         return self._relayer_region
 
-    @property
-    def ice_servers(self) -> list[RTCIceServer]:
-        """Return the current ICE servers."""
-        return self._ice_servers
-
     async def get_alexa_config(self) -> alexa_config.CloudAlexaConfig:
         """Return Alexa config."""
         if self._alexa_config is None:
@@ -209,8 +203,11 @@ class CloudClient(Interface):
                 ice_servers: list[RTCIceServer],
             ) -> Callable[[], None]:
                 """Register cloud ice server."""
-                self._ice_servers = ice_servers
-                return async_register_ice_servers(self._hass, lambda: self._ice_servers)
+
+                def get_ice_servers() -> list[RTCIceServer]:
+                    return ice_servers
+
+                return async_register_ice_servers(self._hass, get_ice_servers)
 
             async def async_register_cloud_ice_servers_listener(
                 prefs: CloudPreferences,
@@ -271,7 +268,6 @@ class CloudClient(Interface):
 
     async def logout_cleanups(self) -> None:
         """Cleanup some stuff after logout."""
-        self._ice_servers = []
         await self.prefs.async_set_username(None)
 
         if self._alexa_config:

homeassistant/components/cloud/conversation.py

@@ -4,6 +4,9 @@ from __future__ import annotations
 
 from typing import Literal
 
+from hass_nabucasa import NabuCasaBaseError
+from hass_nabucasa.llm import LLMError
+
 from homeassistant.components import conversation
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import MATCH_ALL
@@ -21,13 +24,19 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Home Assistant Cloud conversation entity."""
-    cloud = hass.data[DATA_CLOUD]
+    if not (cloud := hass.data[DATA_CLOUD]).is_logged_in:
+        return
+    try:
+        await cloud.llm.async_ensure_token()
+    except (LLMError, NabuCasaBaseError):
+        return
+
     async_add_entities([CloudConversationEntity(cloud, config_entry)])
 
 
 class CloudConversationEntity(
-    BaseCloudLLMEntity,
     conversation.ConversationEntity,
+    BaseCloudLLMEntity,
 ):
     """Home Assistant Cloud conversation agent."""
 

homeassistant/components/cloud/entity.py

@@ -8,9 +8,10 @@ import logging
 import re
 from typing import Any, Literal, cast
 
-from hass_nabucasa import Cloud, NabuCasaBaseError
+from hass_nabucasa import Cloud
 from hass_nabucasa.llm import (
     LLMAuthenticationError,
+    LLMError,
     LLMRateLimitError,
     LLMResponseError,
     LLMServiceError,
@@ -36,7 +37,7 @@ from voluptuous_openapi import convert
 
 from homeassistant.components import conversation
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers import llm
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import slugify
@@ -561,7 +562,7 @@ class BaseCloudLLMEntity(Entity):
                         "schema": _format_structured_output(
                             structure, chat_log.llm_api
                         ),
-                        "strict": False,
+                        "strict": True,
                     },
                 }
 
@@ -600,14 +601,14 @@ class BaseCloudLLMEntity(Entity):
                 )
 
             except LLMAuthenticationError as err:
-                raise HomeAssistantError("Cloud LLM authentication failed") from err
+                raise ConfigEntryAuthFailed("Cloud LLM authentication failed") from err
             except LLMRateLimitError as err:
                 raise HomeAssistantError("Cloud LLM is rate limited") from err
             except LLMResponseError as err:
                 raise HomeAssistantError(str(err)) from err
             except LLMServiceError as err:
                 raise HomeAssistantError("Error talking to Cloud LLM") from err
-            except NabuCasaBaseError as err:
+            except LLMError as err:
                 raise HomeAssistantError(str(err)) from err
 
             if not chat_log.unresponded_tool_results:

homeassistant/components/cloud/http_api.py

@@ -99,7 +99,6 @@ def async_setup(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_hook_delete)
     websocket_api.async_register_command(hass, websocket_remote_connect)
     websocket_api.async_register_command(hass, websocket_remote_disconnect)
-    websocket_api.async_register_command(hass, websocket_webrtc_ice_servers)
 
     websocket_api.async_register_command(hass, google_assistant_get)
     websocket_api.async_register_command(hass, google_assistant_list)
@@ -1108,7 +1107,6 @@ async def alexa_sync(
 
 
 @websocket_api.websocket_command({"type": "cloud/tts/info"})
-@callback
 def tts_info(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
@@ -1136,22 +1134,3 @@ def tts_info(
             )
 
     connection.send_result(msg["id"], {"languages": result})
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "cloud/webrtc/ice_servers",
-    }
-)
-@_require_cloud_login
-@callback
-def websocket_webrtc_ice_servers(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Handle get WebRTC ICE servers websocket command."""
-    connection.send_result(
-        msg["id"],
-        [server.to_dict() for server in hass.data[DATA_CLOUD].client.ice_servers],
-    )

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.7.0"],
+  "requirements": ["hass-nabucasa==1.6.2"],
   "single_config_entry": true
 }

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.5.0", "home-assistant-intents==2025.12.2"]
+  "requirements": ["hassil==3.4.0", "home-assistant-intents==2025.11.24"]
 }

homeassistant/components/dlna_dmr/manifest.json

@@ -6,7 +6,6 @@
   "config_flow": true,
   "dependencies": ["ssdp"],
   "documentation": "https://www.home-assistant.io/integrations/dlna_dmr",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["async_upnp_client"],
   "requirements": ["async-upnp-client==0.46.0", "getmac==0.9.5"],

homeassistant/components/dlna_dms/manifest.json

@@ -6,7 +6,6 @@
   "config_flow": true,
   "dependencies": ["ssdp"],
   "documentation": "https://www.home-assistant.io/integrations/dlna_dms",
-  "integration_type": "service",
   "iot_class": "local_polling",
   "requirements": ["async-upnp-client==0.46.0"],
   "ssdp": [

homeassistant/components/ecovacs/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.11", "deebot-client==17.0.0"]
+  "requirements": ["py-sucks==0.9.11", "deebot-client==16.4.0"]
 }

homeassistant/components/ecowitt/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["webhook"],
   "documentation": "https://www.home-assistant.io/integrations/ecowitt",
-  "integration_type": "device",
   "iot_class": "local_push",
   "requirements": ["aioecowitt==2025.9.2"]
 }

homeassistant/components/elevenlabs/const.py

@@ -17,7 +17,7 @@ DEFAULT_TTS_MODEL = "eleven_multilingual_v2"
 DEFAULT_STABILITY = 0.5
 DEFAULT_SIMILARITY = 0.75
 DEFAULT_STT_AUTO_LANGUAGE = False
-DEFAULT_STT_MODEL = "scribe_v2"
+DEFAULT_STT_MODEL = "scribe_v1"
 DEFAULT_STYLE = 0
 DEFAULT_USE_SPEAKER_BOOST = True
 
@@ -129,5 +129,4 @@ STT_LANGUAGES = [
 STT_MODELS = {
     "scribe_v1": "Scribe v1",
     "scribe_v1_experimental": "Scribe v1 Experimental",
-    "scribe_v2": "Scribe v2 Realtime",
 }

homeassistant/components/fan/strings.json

@@ -166,24 +166,24 @@
   "title": "Fan",
   "triggers": {
     "turned_off": {
-      "description": "Triggers after one or more fans turn off.",
+      "description": "Triggers when a fan is turned off.",
       "fields": {
         "behavior": {
           "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },
-      "name": "Fan turned off"
+      "name": "When a fan is turned off"
     },
     "turned_on": {
-      "description": "Triggers after one or more fans turn on.",
+      "description": "Triggers when a fan is turned on.",
       "fields": {
         "behavior": {
           "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },
-      "name": "Fan turned on"
+      "name": "When a fan is turned on"
     }
   }
 }

homeassistant/components/fressnapf_tracker/__init__.py

@@ -12,11 +12,7 @@ from .coordinator import (
     FressnapfTrackerDataUpdateCoordinator,
 )
 
-PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
-    Platform.DEVICE_TRACKER,
-    Platform.SENSOR,
-]
+PLATFORMS: list[Platform] = [Platform.DEVICE_TRACKER]
 
 
 async def async_setup_entry(

homeassistant/components/fressnapf_tracker/binary_sensor.py

@@ -1,62 +0,0 @@
-"""Binary Sensor platform for fressnapf_tracker."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from fressnapftracker import Tracker
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import FressnapfTrackerConfigEntry
-from .entity import FressnapfTrackerEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class FressnapfTrackerBinarySensorDescription(BinarySensorEntityDescription):
-    """Class describing Fressnapf Tracker binary_sensor entities."""
-
-    value_fn: Callable[[Tracker], bool]
-
-
-BINARY_SENSOR_ENTITY_DESCRIPTIONS: tuple[
-    FressnapfTrackerBinarySensorDescription, ...
-] = (
-    FressnapfTrackerBinarySensorDescription(
-        key="charging",
-        device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.charging,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: FressnapfTrackerConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the Fressnapf Tracker binary_sensors."""
-
-    async_add_entities(
-        FressnapfTrackerBinarySensor(coordinator, sensor_description)
-        for sensor_description in BINARY_SENSOR_ENTITY_DESCRIPTIONS
-        for coordinator in entry.runtime_data
-    )
-
-
-class FressnapfTrackerBinarySensor(FressnapfTrackerEntity, BinarySensorEntity):
-    """Fressnapf Tracker binary_sensor for general information."""
-
-    entity_description: FressnapfTrackerBinarySensorDescription
-
-    @property
-    def is_on(self) -> bool:
-        """Return True if the binary sensor is on."""
-        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/fressnapf_tracker/entity.py

@@ -1,7 +1,6 @@
 """fressnapf_tracker class."""
 
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import FressnapfTrackerDataUpdateCoordinator
@@ -26,17 +25,3 @@ class FressnapfTrackerBaseEntity(
             manufacturer="Fressnapf",
             serial_number=str(self.id),
         )
-
-
-class FressnapfTrackerEntity(FressnapfTrackerBaseEntity):
-    """Entity for fressnapf_tracker."""
-
-    def __init__(
-        self,
-        coordinator: FressnapfTrackerDataUpdateCoordinator,
-        entity_description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{self.id}_{entity_description.key}"

homeassistant/components/fressnapf_tracker/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "quality_scale": "bronze",
-  "requirements": ["fressnapftracker==0.2.0"]
+  "requirements": ["fressnapftracker==0.1.2"]
 }

homeassistant/components/fressnapf_tracker/quality_scale.yaml

@@ -53,7 +53,9 @@ rules:
   entity-category: todo
   entity-device-class: todo
   entity-disabled-by-default: todo
-  entity-translations: done
+  entity-translations:
+    status: exempt
+    comment: No entities to translate
   exception-translations: todo
   icon-translations: todo
   reconfiguration-flow: done

homeassistant/components/fressnapf_tracker/sensor.py

@@ -1,63 +0,0 @@
-"""Sensor platform for fressnapf_tracker."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from fressnapftracker import Tracker
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import PERCENTAGE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import FressnapfTrackerConfigEntry
-from .entity import FressnapfTrackerEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class FressnapfTrackerSensorDescription(SensorEntityDescription):
-    """Class describing Fressnapf Tracker sensor entities."""
-
-    value_fn: Callable[[Tracker], int]
-
-
-SENSOR_ENTITY_DESCRIPTIONS: tuple[FressnapfTrackerSensorDescription, ...] = (
-    FressnapfTrackerSensorDescription(
-        key="battery",
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.battery,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: FressnapfTrackerConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the Fressnapf Tracker sensors."""
-
-    async_add_entities(
-        FressnapfTrackerSensor(coordinator, sensor_description)
-        for sensor_description in SENSOR_ENTITY_DESCRIPTIONS
-        for coordinator in entry.runtime_data
-    )
-
-
-class FressnapfTrackerSensor(FressnapfTrackerEntity, SensorEntity):
-    """fressnapf_tracker sensor for general information."""
-
-    entity_description: FressnapfTrackerSensorDescription
-
-    @property
-    def native_value(self) -> int:
-        """Return the state of the resources if it has been received yet."""
-        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/fronius/manifest.json

@@ -9,7 +9,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/fronius",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pyfronius"],
   "quality_scale": "platinum",

homeassistant/components/frontend/manifest.json

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

homeassistant/components/go2rtc/__init__.py

@@ -6,7 +6,6 @@ from dataclasses import dataclass
 import logging
 from secrets import token_hex
 import shutil
-from tempfile import mkdtemp
 
 from aiohttp import BasicAuth, ClientSession, UnixConnector
 from aiohttp.client_exceptions import ClientConnectionError, ServerConnectionError
@@ -63,11 +62,11 @@ from .const import (
     CONF_DEBUG_UI,
     DEBUG_UI_URL_MESSAGE,
     DOMAIN,
+    HA_MANAGED_UNIX_SOCKET,
     HA_MANAGED_URL,
     RECOMMENDED_VERSION,
 )
 from .server import Server
-from .util import get_go2rtc_unix_socket_path
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -155,12 +154,10 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
         auth = BasicAuth(username, password)
         # HA will manage the binary
-        temp_dir = mkdtemp(prefix="go2rtc-")
         # Manually created session (not using the helper) needs to be closed manually
         # See on_stop listener below
         session = ClientSession(
-            connector=UnixConnector(path=get_go2rtc_unix_socket_path(temp_dir)),
-            auth=auth,
+            connector=UnixConnector(path=HA_MANAGED_UNIX_SOCKET), auth=auth
         )
         server = Server(
             hass,
@@ -169,7 +166,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             enable_ui=domain_config.get(CONF_DEBUG_UI, False),
             username=username,
             password=password,
-            working_dir=temp_dir,
         )
         try:
             await server.start()

homeassistant/components/go2rtc/const.py

@@ -6,6 +6,7 @@ CONF_DEBUG_UI = "debug_ui"
 DEBUG_UI_URL_MESSAGE = "Url and debug_ui cannot be set at the same time."
 HA_MANAGED_API_PORT = 11984
 HA_MANAGED_URL = f"http://localhost:{HA_MANAGED_API_PORT}/"
+HA_MANAGED_UNIX_SOCKET = "/run/go2rtc.sock"
 # When changing this version, also update the corresponding SHA hash (_GO2RTC_SHA)
 # in script/hassfest/docker.py.
 RECOMMENDED_VERSION = "1.9.12"

homeassistant/components/go2rtc/server.py

@@ -12,13 +12,13 @@ from go2rtc_client import Go2RtcRestClient
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
-from .const import HA_MANAGED_API_PORT, HA_MANAGED_URL
-from .util import get_go2rtc_unix_socket_path
+from .const import HA_MANAGED_API_PORT, HA_MANAGED_UNIX_SOCKET, HA_MANAGED_URL
 
 _LOGGER = logging.getLogger(__name__)
 _TERMINATE_TIMEOUT = 5
 _SETUP_TIMEOUT = 30
 _SUCCESSFUL_BOOT_MESSAGE = "INF [api] listen addr="
+_LOCALHOST_IP = "127.0.0.1"
 _LOG_BUFFER_SIZE = 512
 _RESPAWN_COOLDOWN = 1
 
@@ -122,9 +122,7 @@ def _format_list_for_yaml(items: tuple[str, ...]) -> str:
     return f"[{formatted_items}]"
 
 
-def _create_temp_file(
-    enable_ui: bool, username: str, password: str, working_dir: str
-) -> str:
+def _create_temp_file(enable_ui: bool, username: str, password: str) -> str:
     """Create temporary config file."""
     app_modules: tuple[str, ...] = _APP_MODULES
     api_paths: tuple[str, ...] = _API_ALLOW_PATHS
@@ -141,13 +139,11 @@ def _create_temp_file(
 
     # Set delete=False to prevent the file from being deleted when the file is closed
     # Linux is clearing tmp folder on reboot, so no need to delete it manually
-    with NamedTemporaryFile(
-        prefix="go2rtc_", suffix=".yaml", dir=working_dir, delete=False
-    ) as file:
+    with NamedTemporaryFile(prefix="go2rtc_", suffix=".yaml", delete=False) as file:
         file.write(
             _GO2RTC_CONFIG_FORMAT.format(
                 listen_config=listen_config,
-                unix_socket=get_go2rtc_unix_socket_path(working_dir),
+                unix_socket=HA_MANAGED_UNIX_SOCKET,
                 app_modules=_format_list_for_yaml(app_modules),
                 api_allow_paths=_format_list_for_yaml(api_paths),
                 username=username,
@@ -169,7 +165,6 @@ class Server:
         enable_ui: bool = False,
         username: str,
         password: str,
-        working_dir: str,
     ) -> None:
         """Initialize the server."""
         self._hass = hass
@@ -178,7 +173,6 @@ class Server:
         self._enable_ui = enable_ui
         self._username = username
         self._password = password
-        self._working_dir = working_dir
         self._log_buffer: deque[str] = deque(maxlen=_LOG_BUFFER_SIZE)
         self._process: asyncio.subprocess.Process | None = None
         self._startup_complete = asyncio.Event()
@@ -196,11 +190,7 @@ class Server:
         """Start the server."""
         _LOGGER.debug("Starting go2rtc server")
         config_file = await self._hass.async_add_executor_job(
-            _create_temp_file,
-            self._enable_ui,
-            self._username,
-            self._password,
-            self._working_dir,
+            _create_temp_file, self._enable_ui, self._username, self._password
         )
 
         self._startup_complete.clear()

homeassistant/components/go2rtc/util.py

@@ -1,12 +0,0 @@
-"""Go2rtc utility functions."""
-
-from pathlib import Path
-
-_HA_MANAGED_UNIX_SOCKET_FILE = "go2rtc.sock"
-
-
-def get_go2rtc_unix_socket_path(path: str | Path) -> str:
-    """Get the Go2rtc unix socket path."""
-    if not isinstance(path, Path):
-        path = Path(path)
-    return str(path / _HA_MANAGED_UNIX_SOCKET_FILE)

homeassistant/components/google/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/google",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
   "requirements": ["gcal-sync==8.0.0", "oauth2client==4.1.3", "ical==11.1.0"]

homeassistant/components/google_air_quality/strings.json

@@ -59,14 +59,9 @@
         "user": "Add location"
       },
       "step": {
-        "location": {
+        "user": {
           "data": {
-            "location": "[%key:common::config_flow::data::location%]",
-            "name": "[%key:common::config_flow::data::name%]"
-          },
-          "data_description": {
-            "location": "[%key:component::google_air_quality::config::step::user::data_description::location%]",
-            "name": "[%key:component::google_air_quality::config::step::user::data_description::name%]"
+            "location": "[%key:common::config_flow::data::location%]"
           },
           "description": "Select the coordinates for which you want to create an entry.",
           "title": "Air quality data location"

homeassistant/components/google_translate/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/google_translate",
-  "integration_type": "service",
   "iot_class": "cloud_push",
   "loggers": ["gtts"],
   "requirements": ["gTTS==2.5.3"]

homeassistant/components/group/notify.py

@@ -18,12 +18,10 @@ from homeassistant.components.notify import (
     SERVICE_SEND_MESSAGE,
     BaseNotificationService,
     NotifyEntity,
-    NotifyEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_ENTITY_ID,
-    ATTR_SUPPORTED_FEATURES,
     CONF_ACTION,
     CONF_ENTITIES,
     CONF_SERVICE,
@@ -175,23 +173,14 @@ class NotifyGroup(GroupEntity, NotifyEntity):
 
     async def async_send_message(self, message: str, title: str | None = None) -> None:
         """Send a message to all members of the group."""
-
-        data = {
-            ATTR_MESSAGE: message,
-            ATTR_ENTITY_ID: self._entity_ids,
-        }
-
-        # add title only if supported and provided
-        if (
-            title is not None
-            and self._attr_supported_features & NotifyEntityFeature.TITLE
-        ):
-            data[ATTR_TITLE] = title
-
         await self.hass.services.async_call(
             NOTIFY_DOMAIN,
             SERVICE_SEND_MESSAGE,
-            data,
+            {
+                ATTR_MESSAGE: message,
+                ATTR_TITLE: title,
+                ATTR_ENTITY_ID: self._entity_ids,
+            },
             blocking=True,
             context=self._context,
         )
@@ -205,15 +194,3 @@ class NotifyGroup(GroupEntity, NotifyEntity):
             for entity_id in self._entity_ids
             if (state := self.hass.states.get(entity_id)) is not None
         )
-
-        # Support title if all members support it
-        self._attr_supported_features |= NotifyEntityFeature.TITLE
-        for entity_id in self._entity_ids:
-            state = self.hass.states.get(entity_id)
-            if (
-                state is None
-                or not state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
-                & NotifyEntityFeature.TITLE
-            ):
-                self._attr_supported_features &= ~NotifyEntityFeature.TITLE
-                break

homeassistant/components/growatt_server/__init__.py

@@ -37,6 +37,7 @@ def get_device_list_classic(
         login_response = api.login(config[CONF_USERNAME], config[CONF_PASSWORD])
         # DEBUG: Log the actual response structure
     except Exception as ex:
+        _LOGGER.error("DEBUG - Login response: %s", login_response)
         raise ConfigEntryError(
             f"Error communicating with Growatt API during login: {ex}"
         ) from ex

homeassistant/components/growatt_server/coordinator.py

@@ -113,6 +113,9 @@ class GrowattCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                 min_settings = self.api.min_settings(self.device_id)
                 min_energy = self.api.min_energy(self.device_id)
             except growattServer.GrowattV1ApiError as err:
+                _LOGGER.error(
+                    "Error fetching min device data for %s: %s", self.device_id, err
+                )
                 raise UpdateFailed(f"Error fetching min device data: {err}") from err
 
             min_info = {**min_details, **min_settings, **min_energy}
@@ -177,6 +180,7 @@ class GrowattCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         try:
             return await self.hass.async_add_executor_job(self._sync_update_data)
         except json.decoder.JSONDecodeError as err:
+            _LOGGER.error("Unable to fetch data from Growatt server: %s", err)
             raise UpdateFailed(f"Error fetching data: {err}") from err
 
     def get_currency(self):

homeassistant/components/growatt_server/quality_scale.yaml

@@ -1,74 +0,0 @@
-rules:
-  # Bronze
-  action-setup: done
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow:
-    status: todo
-    comment: data-descriptions missing
-  dependency-transparency: done
-  docs-actions: done
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup: done
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: done
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: todo
-    comment: Update server URL dropdown to show regional descriptions (e.g., 'China', 'United States') instead of raw URLs.
-  docs-installation-parameters: todo
-  entity-unavailable:
-    status: todo
-    comment: Replace bare Exception catches in __init__.py with specific growattServer exceptions.
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: todo
-  test-coverage: todo
-
-  # Gold
-  devices:
-    status: todo
-    comment: Add serial_number field to DeviceInfo in sensor, number, and switch platforms using device_id/serial_id.
-  diagnostics: todo
-  discovery-update-info: todo
-  discovery: todo
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category:
-    status: todo
-    comment: Add EntityCategory.DIAGNOSTIC to temperature and other diagnostic sensors. Merge GrowattRequiredKeysMixin into GrowattSensorEntityDescription using kw_only=True.
-  entity-device-class:
-    status: todo
-    comment: Replace custom precision field with suggested_display_precision to preserve full data granularity.
-  entity-disabled-by-default: todo
-  entity-translations: todo
-  exception-translations: todo
-  icon-translations: todo
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: Integration does not raise repairable issues.
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: todo
-  inject-websession: todo
-  strict-typing: todo

homeassistant/components/hassio/const.py

@@ -161,7 +161,6 @@ EXTRA_PLACEHOLDERS = {
     ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED: HELP_URLS,
     ISSUE_KEY_SYSTEM_FREE_SPACE: {
         "more_info_free_space": "https://www.home-assistant.io/more-info/free-space",
-        "storage_url": "/config/storage",
     },
     ISSUE_KEY_ADDON_PWNED: {
         "more_info_pwned": "https://www.home-assistant.io/more-info/pwned-passwords",

homeassistant/components/hassio/strings.json

@@ -130,7 +130,7 @@
       "title": "Restart(s) required"
     },
     "issue_system_free_space": {
-      "description": "The data disk has only {free_space}GB free space left. This may cause issues with system stability and interfere with functionality such as backups and updates. Go to [storage]({storage_url}) to see what is taking up space or see [clear up storage]({more_info_free_space}) for tips on how to free up space.",
+      "description": "The data disk has only {free_space}GB free space left. This may cause issues with system stability and interfere with functionality such as backups and updates. See [clear up storage]({more_info_free_space}) for tips on how to free up space.",
       "title": "Data disk is running low on free space"
     },
     "issue_system_multiple_data_disks": {

homeassistant/components/home_connect/manifest.json

@@ -23,6 +23,6 @@
   "iot_class": "cloud_push",
   "loggers": ["aiohomeconnect"],
   "quality_scale": "platinum",
-  "requirements": ["aiohomeconnect==0.24.0"],
+  "requirements": ["aiohomeconnect==0.23.1"],
   "zeroconf": ["_homeconnect._tcp.local."]
 }

homeassistant/components/homeassistant_connect_zbt2/config_flow.py

@@ -39,6 +39,8 @@ from .const import (
     NABU_CASA_FIRMWARE_RELEASES_URL,
     PID,
     PRODUCT,
+    RADIO_TX_POWER_DBM_BY_COUNTRY,
+    RADIO_TX_POWER_DBM_DEFAULT,
     SERIAL_NUMBER,
     VID,
 )
@@ -112,6 +114,21 @@ class ZBT2FirmwareMixin(ConfigEntryBaseFlow, FirmwareInstallFlowProtocol):
             next_step_id="finish_thread_installation",
         )
 
+    def _extra_zha_hardware_options(self) -> dict[str, Any]:
+        """Return extra ZHA hardware options."""
+        country = self.hass.config.country
+
+        if country is None:
+            tx_power = RADIO_TX_POWER_DBM_DEFAULT
+        else:
+            tx_power = RADIO_TX_POWER_DBM_BY_COUNTRY.get(
+                country, RADIO_TX_POWER_DBM_DEFAULT
+            )
+
+        return {
+            "tx_power": tx_power,
+        }
+
 
 class HomeAssistantConnectZBT2ConfigFlow(
     ZBT2FirmwareMixin,

homeassistant/components/homeassistant_connect_zbt2/const.py

@@ -1,5 +1,7 @@
 """Constants for the Home Assistant Connect ZBT-2 integration."""
 
+from homeassistant.generated.countries import COUNTRIES
+
 DOMAIN = "homeassistant_connect_zbt2"
 
 NABU_CASA_FIRMWARE_RELEASES_URL = (
@@ -17,3 +19,59 @@ VID = "vid"
 DEVICE = "device"
 
 HARDWARE_NAME = "Home Assistant Connect ZBT-2"
+
+RADIO_TX_POWER_DBM_DEFAULT = 8
+RADIO_TX_POWER_DBM_BY_COUNTRY = {
+    # EU Member States
+    "AT": 10,
+    "BE": 10,
+    "BG": 10,
+    "HR": 10,
+    "CY": 10,
+    "CZ": 10,
+    "DK": 10,
+    "EE": 10,
+    "FI": 10,
+    "FR": 10,
+    "DE": 10,
+    "GR": 10,
+    "HU": 10,
+    "IE": 10,
+    "IT": 10,
+    "LV": 10,
+    "LT": 10,
+    "LU": 10,
+    "MT": 10,
+    "NL": 10,
+    "PL": 10,
+    "PT": 10,
+    "RO": 10,
+    "SK": 10,
+    "SI": 10,
+    "ES": 10,
+    "SE": 10,
+    # EEA Members
+    "IS": 10,
+    "LI": 10,
+    "NO": 10,
+    # Standards harmonized with RED or ETSI
+    "CH": 10,
+    "GB": 10,
+    "TR": 10,
+    "AL": 10,
+    "BA": 10,
+    "GE": 10,
+    "MD": 10,
+    "ME": 10,
+    "MK": 10,
+    "RS": 10,
+    "UA": 10,
+    # Other CEPT nations
+    "AD": 10,
+    "AZ": 10,
+    "MC": 10,
+    "SM": 10,
+    "VA": 10,
+}
+
+assert set(RADIO_TX_POWER_DBM_BY_COUNTRY) <= COUNTRIES

homeassistant/components/homeassistant_hardware/firmware_config_flow.py

@@ -457,6 +457,10 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         # This step is necessary to prevent `user_input` from being passed through
         return await self.async_step_continue_zigbee()
 
+    def _extra_zha_hardware_options(self) -> dict[str, Any]:
+        """Return extra ZHA hardware options."""
+        return {}
+
     async def async_step_continue_zigbee(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -479,6 +483,7 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
                 },
                 "radio_type": "ezsp",
                 "flow_strategy": self._zigbee_flow_strategy,
+                **self._extra_zha_hardware_options(),
             },
         )
         return self._continue_zha_flow(result)

homeassistant/components/ibeacon/manifest.json

@@ -11,7 +11,6 @@
   "config_flow": true,
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/ibeacon",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["bleak"],
   "requirements": ["ibeacon-ble==1.2.0"],

homeassistant/components/iometer/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["iometer==0.3.0"],
+  "requirements": ["iometer==0.2.0"],
   "zeroconf": ["_iometer._tcp.local."]
 }

homeassistant/components/knx/const.py

@@ -162,11 +162,8 @@ SUPPORTED_PLATFORMS_UI: Final = {
     Platform.BINARY_SENSOR,
     Platform.CLIMATE,
     Platform.COVER,
-    Platform.DATE,
-    Platform.DATETIME,
     Platform.LIGHT,
     Platform.SWITCH,
-    Platform.TIME,
 }
 
 # Map KNX controller modes to HA modes. This list might not be complete.

homeassistant/components/knx/date.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 from datetime import date as dt_date
-from typing import Any
 
+from xknx import XKNX
 from xknx.devices import DateDevice as XknxDateDevice
 from xknx.dpt.dpt_11 import KNXDate as XKNXDate
 
@@ -18,10 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import (
-    AddConfigEntryEntitiesCallback,
-    async_get_current_platform,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -29,14 +26,11 @@ from .const import (
     CONF_RESPOND_TO_READ,
     CONF_STATE_ADDRESS,
     CONF_SYNC_STATE,
-    DOMAIN,
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .entity import KnxYamlEntity
 from .knx_module import KNXModule
-from .storage.const import CONF_ENTITY, CONF_GA_DATE
-from .storage.util import ConfigExtractor
 
 
 async def async_setup_entry(
@@ -46,36 +40,40 @@ async def async_setup_entry(
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
-    platform = async_get_current_platform()
-    knx_module.config_store.add_platform(
-        platform=Platform.DATE,
-        controller=KnxUiEntityPlatformController(
-            knx_module=knx_module,
-            entity_platform=platform,
-            entity_class=KnxUiDate,
-        ),
+    config: list[ConfigType] = knx_module.config_yaml[Platform.DATE]
+
+    async_add_entities(
+        KNXDateEntity(knx_module, entity_config) for entity_config in config
     )
 
-    entities: list[KnxYamlEntity | KnxUiEntity] = []
-    if yaml_platform_config := knx_module.config_yaml.get(Platform.DATE):
-        entities.extend(
-            KnxYamlDate(knx_module, entity_config)
-            for entity_config in yaml_platform_config
-        )
-    if ui_config := knx_module.config_store.data["entities"].get(Platform.DATE):
-        entities.extend(
-            KnxUiDate(knx_module, unique_id, config)
-            for unique_id, config in ui_config.items()
-        )
-    if entities:
-        async_add_entities(entities)
+
+def _create_xknx_device(xknx: XKNX, config: ConfigType) -> XknxDateDevice:
+    """Return a XKNX DateTime object to be used within XKNX."""
+    return XknxDateDevice(
+        xknx,
+        name=config[CONF_NAME],
+        localtime=False,
+        group_address=config[KNX_ADDRESS],
+        group_address_state=config.get(CONF_STATE_ADDRESS),
+        respond_to_read=config[CONF_RESPOND_TO_READ],
+        sync_state=config[CONF_SYNC_STATE],
+    )
 
 
-class _KNXDate(DateEntity, RestoreEntity):
+class KNXDateEntity(KnxYamlEntity, DateEntity, RestoreEntity):
     """Representation of a KNX date."""
 
     _device: XknxDateDevice
 
+    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
+        """Initialize a KNX time."""
+        super().__init__(
+            knx_module=knx_module,
+            device=_create_xknx_device(knx_module.xknx, config),
+        )
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_unique_id = str(self._device.remote_value.group_address)
+
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
         await super().async_added_to_hass()
@@ -96,52 +94,3 @@ class _KNXDate(DateEntity, RestoreEntity):
     async def async_set_value(self, value: dt_date) -> None:
         """Change the value."""
         await self._device.set(value)
-
-
-class KnxYamlDate(_KNXDate, KnxYamlEntity):
-    """Representation of a KNX date configured from YAML."""
-
-    _device: XknxDateDevice
-
-    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
-        """Initialize a KNX date."""
-        super().__init__(
-            knx_module=knx_module,
-            device=XknxDateDevice(
-                knx_module.xknx,
-                name=config[CONF_NAME],
-                localtime=False,
-                group_address=config[KNX_ADDRESS],
-                group_address_state=config.get(CONF_STATE_ADDRESS),
-                respond_to_read=config[CONF_RESPOND_TO_READ],
-                sync_state=config[CONF_SYNC_STATE],
-            ),
-        )
-        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
-        self._attr_unique_id = str(self._device.remote_value.group_address)
-
-
-class KnxUiDate(_KNXDate, KnxUiEntity):
-    """Representation of a KNX date configured from the UI."""
-
-    _device: XknxDateDevice
-
-    def __init__(
-        self, knx_module: KNXModule, unique_id: str, config: dict[str, Any]
-    ) -> None:
-        """Initialize KNX date."""
-        super().__init__(
-            knx_module=knx_module,
-            unique_id=unique_id,
-            entity_config=config[CONF_ENTITY],
-        )
-        knx_conf = ConfigExtractor(config[DOMAIN])
-        self._device = XknxDateDevice(
-            knx_module.xknx,
-            name=config[CONF_ENTITY][CONF_NAME],
-            localtime=False,
-            group_address=knx_conf.get_write(CONF_GA_DATE),
-            group_address_state=knx_conf.get_state_and_passive(CONF_GA_DATE),
-            respond_to_read=knx_conf.get(CONF_RESPOND_TO_READ),
-            sync_state=knx_conf.get(CONF_SYNC_STATE),
-        )

homeassistant/components/knx/datetime.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any
 
+from xknx import XKNX
 from xknx.devices import DateTimeDevice as XknxDateTimeDevice
 from xknx.dpt.dpt_19 import KNXDateTime as XKNXDateTime
 
@@ -18,10 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import (
-    AddConfigEntryEntitiesCallback,
-    async_get_current_platform,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
@@ -30,14 +27,11 @@ from .const import (
     CONF_RESPOND_TO_READ,
     CONF_STATE_ADDRESS,
     CONF_SYNC_STATE,
-    DOMAIN,
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .entity import KnxYamlEntity
 from .knx_module import KNXModule
-from .storage.const import CONF_ENTITY, CONF_GA_DATETIME
-from .storage.util import ConfigExtractor
 
 
 async def async_setup_entry(
@@ -47,36 +41,40 @@ async def async_setup_entry(
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
-    platform = async_get_current_platform()
-    knx_module.config_store.add_platform(
-        platform=Platform.DATETIME,
-        controller=KnxUiEntityPlatformController(
-            knx_module=knx_module,
-            entity_platform=platform,
-            entity_class=KnxUiDateTime,
-        ),
+    config: list[ConfigType] = knx_module.config_yaml[Platform.DATETIME]
+
+    async_add_entities(
+        KNXDateTimeEntity(knx_module, entity_config) for entity_config in config
     )
 
-    entities: list[KnxYamlEntity | KnxUiEntity] = []
-    if yaml_platform_config := knx_module.config_yaml.get(Platform.DATETIME):
-        entities.extend(
-            KnxYamlDateTime(knx_module, entity_config)
-            for entity_config in yaml_platform_config
-        )
-    if ui_config := knx_module.config_store.data["entities"].get(Platform.DATETIME):
-        entities.extend(
-            KnxUiDateTime(knx_module, unique_id, config)
-            for unique_id, config in ui_config.items()
-        )
-    if entities:
-        async_add_entities(entities)
+
+def _create_xknx_device(xknx: XKNX, config: ConfigType) -> XknxDateTimeDevice:
+    """Return a XKNX DateTime object to be used within XKNX."""
+    return XknxDateTimeDevice(
+        xknx,
+        name=config[CONF_NAME],
+        localtime=False,
+        group_address=config[KNX_ADDRESS],
+        group_address_state=config.get(CONF_STATE_ADDRESS),
+        respond_to_read=config[CONF_RESPOND_TO_READ],
+        sync_state=config[CONF_SYNC_STATE],
+    )
 
 
-class _KNXDateTime(DateTimeEntity, RestoreEntity):
+class KNXDateTimeEntity(KnxYamlEntity, DateTimeEntity, RestoreEntity):
     """Representation of a KNX datetime."""
 
     _device: XknxDateTimeDevice
 
+    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
+        """Initialize a KNX time."""
+        super().__init__(
+            knx_module=knx_module,
+            device=_create_xknx_device(knx_module.xknx, config),
+        )
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_unique_id = str(self._device.remote_value.group_address)
+
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
         await super().async_added_to_hass()
@@ -101,52 +99,3 @@ class _KNXDateTime(DateTimeEntity, RestoreEntity):
     async def async_set_value(self, value: datetime) -> None:
         """Change the value."""
         await self._device.set(value.astimezone(dt_util.get_default_time_zone()))
-
-
-class KnxYamlDateTime(_KNXDateTime, KnxYamlEntity):
-    """Representation of a KNX datetime configured from YAML."""
-
-    _device: XknxDateTimeDevice
-
-    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
-        """Initialize a KNX datetime."""
-        super().__init__(
-            knx_module=knx_module,
-            device=XknxDateTimeDevice(
-                knx_module.xknx,
-                name=config[CONF_NAME],
-                localtime=False,
-                group_address=config[KNX_ADDRESS],
-                group_address_state=config.get(CONF_STATE_ADDRESS),
-                respond_to_read=config[CONF_RESPOND_TO_READ],
-                sync_state=config[CONF_SYNC_STATE],
-            ),
-        )
-        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
-        self._attr_unique_id = str(self._device.remote_value.group_address)
-
-
-class KnxUiDateTime(_KNXDateTime, KnxUiEntity):
-    """Representation of a KNX datetime configured from the UI."""
-
-    _device: XknxDateTimeDevice
-
-    def __init__(
-        self, knx_module: KNXModule, unique_id: str, config: dict[str, Any]
-    ) -> None:
-        """Initialize KNX datetime."""
-        super().__init__(
-            knx_module=knx_module,
-            unique_id=unique_id,
-            entity_config=config[CONF_ENTITY],
-        )
-        knx_conf = ConfigExtractor(config[DOMAIN])
-        self._device = XknxDateTimeDevice(
-            knx_module.xknx,
-            name=config[CONF_ENTITY][CONF_NAME],
-            localtime=False,
-            group_address=knx_conf.get_write(CONF_GA_DATETIME),
-            group_address_state=knx_conf.get_state_and_passive(CONF_GA_DATETIME),
-            respond_to_read=knx_conf.get(CONF_RESPOND_TO_READ),
-            sync_state=knx_conf.get(CONF_SYNC_STATE),
-        )

homeassistant/components/knx/manifest.json

@@ -11,7 +11,7 @@
   "loggers": ["xknx", "xknxproject"],
   "quality_scale": "silver",
   "requirements": [
-    "xknx==3.12.0",
+    "xknx==3.11.0",
     "xknxproject==3.8.2",
     "knx-frontend==2025.10.31.195356"
   ],

homeassistant/components/knx/storage/const.py

@@ -13,9 +13,6 @@ CONF_DPT: Final = "dpt"
 
 CONF_GA_SENSOR: Final = "ga_sensor"
 CONF_GA_SWITCH: Final = "ga_switch"
-CONF_GA_DATE: Final = "ga_date"
-CONF_GA_DATETIME: Final = "ga_datetime"
-CONF_GA_TIME: Final = "ga_time"
 
 # Climate
 CONF_GA_TEMPERATURE_CURRENT: Final = "ga_temperature_current"

homeassistant/components/knx/storage/entity_store_schema.py

@@ -46,8 +46,6 @@ from .const import (
     CONF_GA_COLOR_TEMP,
     CONF_GA_CONTROLLER_MODE,
     CONF_GA_CONTROLLER_STATUS,
-    CONF_GA_DATE,
-    CONF_GA_DATETIME,
     CONF_GA_FAN_SPEED,
     CONF_GA_FAN_SWING,
     CONF_GA_FAN_SWING_HORIZONTAL,
@@ -74,7 +72,6 @@ from .const import (
     CONF_GA_SWITCH,
     CONF_GA_TEMPERATURE_CURRENT,
     CONF_GA_TEMPERATURE_TARGET,
-    CONF_GA_TIME,
     CONF_GA_UP_DOWN,
     CONF_GA_VALVE,
     CONF_GA_WHITE_BRIGHTNESS,
@@ -202,24 +199,6 @@ COVER_KNX_SCHEMA = AllSerializeFirst(
     ),
 )
 
-DATE_KNX_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_GA_DATE): GASelector(write_required=True, valid_dpt="11.001"),
-        vol.Optional(CONF_RESPOND_TO_READ, default=False): selector.BooleanSelector(),
-        vol.Optional(CONF_SYNC_STATE, default=True): SyncStateSelector(),
-    }
-)
-
-DATETIME_KNX_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_GA_DATETIME): GASelector(
-            write_required=True, valid_dpt="19.001"
-        ),
-        vol.Optional(CONF_RESPOND_TO_READ, default=False): selector.BooleanSelector(),
-        vol.Optional(CONF_SYNC_STATE, default=True): SyncStateSelector(),
-    }
-)
-
 
 @unique
 class LightColorMode(StrEnum):
@@ -357,14 +336,6 @@ SWITCH_KNX_SCHEMA = vol.Schema(
     },
 )
 
-TIME_KNX_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_GA_TIME): GASelector(write_required=True, valid_dpt="10.001"),
-        vol.Optional(CONF_RESPOND_TO_READ, default=False): selector.BooleanSelector(),
-        vol.Optional(CONF_SYNC_STATE, default=True): SyncStateSelector(),
-    }
-)
-
 
 @unique
 class ConfSetpointShiftMode(StrEnum):
@@ -511,11 +482,8 @@ KNX_SCHEMA_FOR_PLATFORM = {
     Platform.BINARY_SENSOR: BINARY_SENSOR_KNX_SCHEMA,
     Platform.CLIMATE: CLIMATE_KNX_SCHEMA,
     Platform.COVER: COVER_KNX_SCHEMA,
-    Platform.DATE: DATE_KNX_SCHEMA,
-    Platform.DATETIME: DATETIME_KNX_SCHEMA,
     Platform.LIGHT: LIGHT_KNX_SCHEMA,
     Platform.SWITCH: SWITCH_KNX_SCHEMA,
-    Platform.TIME: TIME_KNX_SCHEMA,
 }
 
 ENTITY_STORE_DATA_SCHEMA: VolSchemaType = vol.All(

homeassistant/components/knx/strings.json

@@ -176,10 +176,6 @@
               "state_address": "State address",
               "valid_dpts": "Valid DPTs"
             },
-            "respond_to_read": {
-              "description": "Respond to GroupValueRead telegrams received to the configured send address.",
-              "label": "Respond to read"
-            },
             "sync_state": {
               "description": "Actively request state updates from KNX bus for state addresses.",
               "options": {
@@ -442,24 +438,6 @@
             }
           }
         },
-        "date": {
-          "description": "The KNX date platform is used as an interface to date objects.",
-          "knx": {
-            "ga_date": {
-              "description": "The group address of the date object.",
-              "label": "Date"
-            }
-          }
-        },
-        "datetime": {
-          "description": "The KNX datetime platform is used as an interface to date and time objects.",
-          "knx": {
-            "ga_datetime": {
-              "description": "The group address of the date and time object.",
-              "label": "Date and time"
-            }
-          }
-        },
         "header": "Create new entity",
         "light": {
           "description": "The KNX light platform is used as an interface to dimming actuators, LED controllers, DALI gateways and similar.",
@@ -568,15 +546,10 @@
             "invert": {
               "description": "Invert payloads before processing or sending.",
               "label": "Invert"
-            }
-          }
-        },
-        "time": {
-          "description": "The KNX time platform is used as an interface to time objects.",
-          "knx": {
-            "ga_time": {
-              "description": "The group address of the time object.",
-              "label": "Time"
+            },
+            "respond_to_read": {
+              "description": "Respond to GroupValueRead telegrams received to the configured send address.",
+              "label": "Respond to read"
             }
           }
         },

homeassistant/components/knx/time.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 from datetime import time as dt_time
-from typing import Any
 
+from xknx import XKNX
 from xknx.devices import TimeDevice as XknxTimeDevice
 from xknx.dpt.dpt_10 import KNXTime as XknxTime
 
@@ -18,10 +18,7 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import (
-    AddConfigEntryEntitiesCallback,
-    async_get_current_platform,
-)
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
 
@@ -29,14 +26,11 @@ from .const import (
     CONF_RESPOND_TO_READ,
     CONF_STATE_ADDRESS,
     CONF_SYNC_STATE,
-    DOMAIN,
     KNX_ADDRESS,
     KNX_MODULE_KEY,
 )
-from .entity import KnxUiEntity, KnxUiEntityPlatformController, KnxYamlEntity
+from .entity import KnxYamlEntity
 from .knx_module import KNXModule
-from .storage.const import CONF_ENTITY, CONF_GA_TIME
-from .storage.util import ConfigExtractor
 
 
 async def async_setup_entry(
@@ -46,36 +40,40 @@ async def async_setup_entry(
 ) -> None:
     """Set up entities for KNX platform."""
     knx_module = hass.data[KNX_MODULE_KEY]
-    platform = async_get_current_platform()
-    knx_module.config_store.add_platform(
-        platform=Platform.TIME,
-        controller=KnxUiEntityPlatformController(
-            knx_module=knx_module,
-            entity_platform=platform,
-            entity_class=KnxUiTime,
-        ),
+    config: list[ConfigType] = knx_module.config_yaml[Platform.TIME]
+
+    async_add_entities(
+        KNXTimeEntity(knx_module, entity_config) for entity_config in config
     )
 
-    entities: list[KnxYamlEntity | KnxUiEntity] = []
-    if yaml_platform_config := knx_module.config_yaml.get(Platform.TIME):
-        entities.extend(
-            KnxYamlTime(knx_module, entity_config)
-            for entity_config in yaml_platform_config
-        )
-    if ui_config := knx_module.config_store.data["entities"].get(Platform.TIME):
-        entities.extend(
-            KnxUiTime(knx_module, unique_id, config)
-            for unique_id, config in ui_config.items()
-        )
-    if entities:
-        async_add_entities(entities)
+
+def _create_xknx_device(xknx: XKNX, config: ConfigType) -> XknxTimeDevice:
+    """Return a XKNX DateTime object to be used within XKNX."""
+    return XknxTimeDevice(
+        xknx,
+        name=config[CONF_NAME],
+        localtime=False,
+        group_address=config[KNX_ADDRESS],
+        group_address_state=config.get(CONF_STATE_ADDRESS),
+        respond_to_read=config[CONF_RESPOND_TO_READ],
+        sync_state=config[CONF_SYNC_STATE],
+    )
 
 
-class _KNXTime(TimeEntity, RestoreEntity):
+class KNXTimeEntity(KnxYamlEntity, TimeEntity, RestoreEntity):
     """Representation of a KNX time."""
 
     _device: XknxTimeDevice
 
+    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
+        """Initialize a KNX time."""
+        super().__init__(
+            knx_module=knx_module,
+            device=_create_xknx_device(knx_module.xknx, config),
+        )
+        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
+        self._attr_unique_id = str(self._device.remote_value.group_address)
+
     async def async_added_to_hass(self) -> None:
         """Restore last state."""
         await super().async_added_to_hass()
@@ -96,52 +94,3 @@ class _KNXTime(TimeEntity, RestoreEntity):
     async def async_set_value(self, value: dt_time) -> None:
         """Change the value."""
         await self._device.set(value)
-
-
-class KnxYamlTime(_KNXTime, KnxYamlEntity):
-    """Representation of a KNX time configured from YAML."""
-
-    _device: XknxTimeDevice
-
-    def __init__(self, knx_module: KNXModule, config: ConfigType) -> None:
-        """Initialize a KNX time."""
-        super().__init__(
-            knx_module=knx_module,
-            device=XknxTimeDevice(
-                knx_module.xknx,
-                name=config[CONF_NAME],
-                localtime=False,
-                group_address=config[KNX_ADDRESS],
-                group_address_state=config.get(CONF_STATE_ADDRESS),
-                respond_to_read=config[CONF_RESPOND_TO_READ],
-                sync_state=config[CONF_SYNC_STATE],
-            ),
-        )
-        self._attr_entity_category = config.get(CONF_ENTITY_CATEGORY)
-        self._attr_unique_id = str(self._device.remote_value.group_address)
-
-
-class KnxUiTime(_KNXTime, KnxUiEntity):
-    """Representation of a KNX time configured from the UI."""
-
-    _device: XknxTimeDevice
-
-    def __init__(
-        self, knx_module: KNXModule, unique_id: str, config: dict[str, Any]
-    ) -> None:
-        """Initialize KNX time."""
-        super().__init__(
-            knx_module=knx_module,
-            unique_id=unique_id,
-            entity_config=config[CONF_ENTITY],
-        )
-        knx_conf = ConfigExtractor(config[DOMAIN])
-        self._device = XknxTimeDevice(
-            knx_module.xknx,
-            name=config[CONF_ENTITY][CONF_NAME],
-            localtime=False,
-            group_address=knx_conf.get_write(CONF_GA_TIME),
-            group_address_state=knx_conf.get_state_and_passive(CONF_GA_TIME),
-            respond_to_read=knx_conf.get(CONF_RESPOND_TO_READ),
-            sync_state=knx_conf.get(CONF_SYNC_STATE),
-        )

homeassistant/components/konnected/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/konnected",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["konnected"],
   "requirements": ["konnected==1.2.0"],

homeassistant/components/labs/__init__.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 from collections.abc import Callable
 import logging
 
-from homeassistant.const import EVENT_LABS_UPDATED
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.generated.labs import LABS_PREVIEW_FEATURES
 from homeassistant.helpers import config_validation as cv
@@ -18,7 +17,7 @@ from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import async_get_custom_components
 
-from .const import DOMAIN, LABS_DATA, STORAGE_KEY, STORAGE_VERSION
+from .const import DOMAIN, EVENT_LABS_UPDATED, LABS_DATA, STORAGE_KEY, STORAGE_VERSION
 from .models import (
     EventLabsUpdatedData,
     LabPreviewFeature,

homeassistant/components/labs/const.py

@@ -11,4 +11,6 @@ DOMAIN = "labs"
 STORAGE_KEY = "core.labs"
 STORAGE_VERSION = 1
 
+EVENT_LABS_UPDATED = "labs_updated"
+
 LABS_DATA: HassKey[LabsData] = HassKey(DOMAIN)

homeassistant/components/labs/websocket_api.py

@@ -8,10 +8,9 @@ import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.components.backup import async_get_manager
-from homeassistant.const import EVENT_LABS_UPDATED
 from homeassistant.core import HomeAssistant, callback
 
-from .const import LABS_DATA
+from .const import EVENT_LABS_UPDATED, LABS_DATA
 from .models import EventLabsUpdatedData
 
 

homeassistant/components/lamarzocco/__init__.py

@@ -35,7 +35,6 @@ from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
 from .const import CONF_INSTALLATION_KEY, CONF_USE_BLUETOOTH, DOMAIN
 from .coordinator import (
-    LaMarzoccoBluetoothUpdateCoordinator,
     LaMarzoccoConfigEntry,
     LaMarzoccoConfigUpdateCoordinator,
     LaMarzoccoRuntimeData,
@@ -73,10 +72,38 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
         client=create_client_session(hass),
     )
 
+    try:
+        settings = await cloud_client.get_thing_settings(serial)
+    except AuthFail as ex:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN, translation_key="authentication_failed"
+        ) from ex
+    except (RequestNotSuccessful, TimeoutError) as ex:
+        _LOGGER.debug(ex, exc_info=True)
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN, translation_key="api_error"
+        ) from ex
+
+    gateway_version = version.parse(
+        settings.firmwares[FirmwareType.GATEWAY].build_version
+    )
+
+    if gateway_version < version.parse("v5.0.9"):
+        # incompatible gateway firmware, create an issue
+        ir.async_create_issue(
+            hass,
+            DOMAIN,
+            "unsupported_gateway_firmware",
+            is_fixable=False,
+            severity=ir.IssueSeverity.ERROR,
+            translation_key="unsupported_gateway_firmware",
+            translation_placeholders={"gateway_version": str(gateway_version)},
+        )
+
     # initialize Bluetooth
     bluetooth_client: LaMarzoccoBluetoothClient | None = None
     if entry.options.get(CONF_USE_BLUETOOTH, True) and (
-        token := entry.data.get(CONF_TOKEN)
+        token := (entry.data.get(CONF_TOKEN) or settings.ble_auth_token)
     ):
         if CONF_MAC not in entry.data:
             for discovery_info in async_discovered_service_info(hass):
@@ -118,44 +145,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
                 _LOGGER.info(
                     "Bluetooth device not found during lamarzocco setup, continuing with cloud only"
                 )
-    try:
-        settings = await cloud_client.get_thing_settings(serial)
-    except AuthFail as ex:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN, translation_key="authentication_failed"
-        ) from ex
-    except (RequestNotSuccessful, TimeoutError) as ex:
-        _LOGGER.debug(ex, exc_info=True)
-        if not bluetooth_client:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN, translation_key="api_error"
-            ) from ex
-        _LOGGER.debug("Cloud failed, continuing with Bluetooth only", exc_info=True)
-    else:
-        gateway_version = version.parse(
-            settings.firmwares[FirmwareType.GATEWAY].build_version
-        )
-
-        if gateway_version < version.parse("v5.0.9"):
-            # incompatible gateway firmware, create an issue
-            ir.async_create_issue(
-                hass,
-                DOMAIN,
-                "unsupported_gateway_firmware",
-                is_fixable=False,
-                severity=ir.IssueSeverity.ERROR,
-                translation_key="unsupported_gateway_firmware",
-                translation_placeholders={"gateway_version": str(gateway_version)},
-            )
-        # Update BLE Token if exists
-        if settings.ble_auth_token:
-            hass.config_entries.async_update_entry(
-                entry,
-                data={
-                    **entry.data,
-                    CONF_TOKEN: settings.ble_auth_token,
-                },
-            )
 
     device = LaMarzoccoMachine(
         serial_number=entry.unique_id,
@@ -164,7 +153,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
     )
 
     coordinators = LaMarzoccoRuntimeData(
-        LaMarzoccoConfigUpdateCoordinator(hass, entry, device),
+        LaMarzoccoConfigUpdateCoordinator(hass, entry, device, cloud_client),
         LaMarzoccoSettingsUpdateCoordinator(hass, entry, device),
         LaMarzoccoScheduleUpdateCoordinator(hass, entry, device),
         LaMarzoccoStatisticsUpdateCoordinator(hass, entry, device),
@@ -177,16 +166,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: LaMarzoccoConfigEntry) -
         coordinators.statistics_coordinator.async_config_entry_first_refresh(),
     )
 
-    # bt coordinator only if bluetooth client is available
-    # and after the initial refresh of the config coordinator
-    # to fetch only if the others failed
-    if bluetooth_client:
-        bluetooth_coordinator = LaMarzoccoBluetoothUpdateCoordinator(
-            hass, entry, device
-        )
-        await bluetooth_coordinator.async_config_entry_first_refresh()
-        coordinators.bluetooth_coordinator = bluetooth_coordinator
-
     entry.runtime_data = coordinators
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

homeassistant/components/lamarzocco/binary_sensor.py

@@ -6,7 +6,7 @@ from typing import cast
 
 from pylamarzocco import LaMarzoccoMachine
 from pylamarzocco.const import BackFlushStatus, MachineState, ModelName, WidgetType
-from pylamarzocco.models import BackFlush, MachineStatus, NoWater
+from pylamarzocco.models import BackFlush, MachineStatus
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -39,15 +39,8 @@ ENTITIES: tuple[LaMarzoccoBinarySensorEntityDescription, ...] = (
         key="water_tank",
         translation_key="water_tank",
         device_class=BinarySensorDeviceClass.PROBLEM,
-        is_on_fn=(
-            lambda machine: cast(
-                NoWater, machine.dashboard.config[WidgetType.CM_NO_WATER]
-            ).allarm
-            if WidgetType.CM_NO_WATER in machine.dashboard.config
-            else False
-        ),
+        is_on_fn=lambda machine: WidgetType.CM_NO_WATER in machine.dashboard.config,
         entity_category=EntityCategory.DIAGNOSTIC,
-        bt_offline_mode=True,
     ),
     LaMarzoccoBinarySensorEntityDescription(
         key="brew_active",
@@ -100,9 +93,7 @@ async def async_setup_entry(
     coordinator = entry.runtime_data.config_coordinator
 
     async_add_entities(
-        LaMarzoccoBinarySensorEntity(
-            coordinator, description, entry.runtime_data.bluetooth_coordinator
-        )
+        LaMarzoccoBinarySensorEntity(coordinator, description)
         for description in ENTITIES
         if description.supported_fn(coordinator)
     )

homeassistant/components/lamarzocco/coordinator.py

@@ -10,12 +10,8 @@ from datetime import timedelta
 import logging
 from typing import Any
 
-from pylamarzocco import LaMarzoccoMachine
-from pylamarzocco.exceptions import (
-    AuthFail,
-    BluetoothConnectionFailed,
-    RequestNotSuccessful,
-)
+from pylamarzocco import LaMarzoccoCloudClient, LaMarzoccoMachine
+from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
@@ -40,7 +36,6 @@ class LaMarzoccoRuntimeData:
     settings_coordinator: LaMarzoccoSettingsUpdateCoordinator
     schedule_coordinator: LaMarzoccoScheduleUpdateCoordinator
     statistics_coordinator: LaMarzoccoStatisticsUpdateCoordinator
-    bluetooth_coordinator: LaMarzoccoBluetoothUpdateCoordinator | None = None
 
 
 type LaMarzoccoConfigEntry = ConfigEntry[LaMarzoccoRuntimeData]
@@ -51,13 +46,14 @@ class LaMarzoccoUpdateCoordinator(DataUpdateCoordinator[None]):
 
     _default_update_interval = SCAN_INTERVAL
     config_entry: LaMarzoccoConfigEntry
-    update_success = False
+    _websocket_task: Task | None = None
 
     def __init__(
         self,
         hass: HomeAssistant,
         entry: LaMarzoccoConfigEntry,
         device: LaMarzoccoMachine,
+        cloud_client: LaMarzoccoCloudClient | None = None,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
@@ -68,7 +64,7 @@ class LaMarzoccoUpdateCoordinator(DataUpdateCoordinator[None]):
             update_interval=self._default_update_interval,
         )
         self.device = device
-        self._websocket_task: Task | None = None
+        self.cloud_client = cloud_client
 
     @property
     def websocket_terminated(self) -> bool:
@@ -85,28 +81,14 @@ class LaMarzoccoUpdateCoordinator(DataUpdateCoordinator[None]):
             await func()
         except AuthFail as ex:
             _LOGGER.debug("Authentication failed", exc_info=True)
-            self.update_success = False
             raise ConfigEntryAuthFailed(
                 translation_domain=DOMAIN, translation_key="authentication_failed"
             ) from ex
         except RequestNotSuccessful as ex:
             _LOGGER.debug(ex, exc_info=True)
-            self.update_success = False
-            # if no bluetooth coordinator, this is a fatal error
-            # otherwise, bluetooth may still work
-            if not self.device.bluetooth_client_available:
-                raise UpdateFailed(
-                    translation_domain=DOMAIN, translation_key="api_error"
-                ) from ex
-        except BluetoothConnectionFailed as err:
-            self.update_success = False
             raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="bluetooth_connection_failed",
-            ) from err
-        else:
-            self.update_success = True
-        _LOGGER.debug("Current status: %s", self.device.dashboard.to_dict())
+                translation_domain=DOMAIN, translation_key="api_error"
+            ) from ex
 
     async def _async_setup(self) -> None:
         """Set up coordinator."""
@@ -127,9 +109,11 @@ class LaMarzoccoUpdateCoordinator(DataUpdateCoordinator[None]):
 class LaMarzoccoConfigUpdateCoordinator(LaMarzoccoUpdateCoordinator):
     """Class to handle fetching data from the La Marzocco API centrally."""
 
+    cloud_client: LaMarzoccoCloudClient
+
     async def _internal_async_setup(self) -> None:
         """Set up the coordinator."""
-        await self.device.ensure_token_valid()
+        await self.cloud_client.async_get_access_token()
         await self.device.get_dashboard()
         _LOGGER.debug("Current status: %s", self.device.dashboard.to_dict())
 
@@ -137,7 +121,7 @@ class LaMarzoccoConfigUpdateCoordinator(LaMarzoccoUpdateCoordinator):
         """Fetch data from API endpoint."""
 
         # ensure token stays valid; does nothing if token is still valid
-        await self.device.ensure_token_valid()
+        await self.cloud_client.async_get_access_token()
 
         # Only skip websocket reconnection if it's currently connected and the task is still running
         if self.device.websocket.connected and not self.websocket_terminated:
@@ -209,19 +193,3 @@ class LaMarzoccoStatisticsUpdateCoordinator(LaMarzoccoUpdateCoordinator):
         """Fetch data from API endpoint."""
         await self.device.get_coffee_and_flush_counter()
         _LOGGER.debug("Current statistics: %s", self.device.statistics.to_dict())
-
-
-class LaMarzoccoBluetoothUpdateCoordinator(LaMarzoccoUpdateCoordinator):
-    """Class to handle fetching data from the La Marzocco Bluetooth API centrally."""
-
-    async def _internal_async_setup(self) -> None:
-        """Initial setup for Bluetooth coordinator."""
-        await self.device.get_model_info_from_bluetooth()
-
-    async def _internal_async_update_data(self) -> None:
-        """Fetch data from Bluetooth endpoint."""
-        # if the websocket is connected and the machine is connected to the cloud
-        # skip bluetooth update, because we get push updates
-        if self.device.websocket.connected and self.device.dashboard.connected:
-            return
-        await self.device.get_dashboard_from_bluetooth()

homeassistant/components/lamarzocco/entity.py

@@ -17,10 +17,7 @@ from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import (
-    LaMarzoccoBluetoothUpdateCoordinator,
-    LaMarzoccoUpdateCoordinator,
-)
+from .coordinator import LaMarzoccoUpdateCoordinator
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -29,7 +26,6 @@ class LaMarzoccoEntityDescription(EntityDescription):
 
     available_fn: Callable[[LaMarzoccoUpdateCoordinator], bool] = lambda _: True
     supported_fn: Callable[[LaMarzoccoUpdateCoordinator], bool] = lambda _: True
-    bt_offline_mode: bool = False
 
 
 class LaMarzoccoBaseEntity(
@@ -49,19 +45,14 @@ class LaMarzoccoBaseEntity(
         super().__init__(coordinator)
         device = coordinator.device
         self._attr_unique_id = f"{device.serial_number}_{key}"
-        sw_version = (
-            device.settings.firmwares[FirmwareType.MACHINE].build_version
-            if FirmwareType.MACHINE in device.settings.firmwares
-            else None
-        )
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, device.serial_number)},
-            name=device.dashboard.name or self.coordinator.config_entry.title,
+            name=device.dashboard.name,
             manufacturer="La Marzocco",
             model=device.dashboard.model_name.value,
             model_id=device.dashboard.model_code.value,
             serial_number=device.serial_number,
-            sw_version=sw_version,
+            sw_version=device.settings.firmwares[FirmwareType.MACHINE].build_version,
         )
         connections: set[tuple[str, str]] = set()
         if coordinator.config_entry.data.get(CONF_ADDRESS):
@@ -86,12 +77,8 @@ class LaMarzoccoBaseEntity(
             if WidgetType.CM_MACHINE_STATUS in self.coordinator.device.dashboard.config
             else MachineState.OFF
         )
-        return (
-            super().available
-            and not (
-                self._unavailable_when_machine_off and machine_state is MachineState.OFF
-            )
-            and self.coordinator.update_success
+        return super().available and not (
+            self._unavailable_when_machine_off and machine_state is MachineState.OFF
         )
 
 
@@ -103,11 +90,6 @@ class LaMarzoccoEntity(LaMarzoccoBaseEntity):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        if (
-            self.entity_description.bt_offline_mode
-            and self.bluetooth_coordinator is not None
-        ):
-            return self.bluetooth_coordinator.last_update_success
         if super().available:
             return self.entity_description.available_fn(self.coordinator)
         return False
@@ -116,17 +98,7 @@ class LaMarzoccoEntity(LaMarzoccoBaseEntity):
         self,
         coordinator: LaMarzoccoUpdateCoordinator,
         entity_description: LaMarzoccoEntityDescription,
-        bluetooth_coordinator: LaMarzoccoBluetoothUpdateCoordinator | None = None,
     ) -> None:
         """Initialize the entity."""
         super().__init__(coordinator, entity_description.key)
         self.entity_description = entity_description
-        self.bluetooth_coordinator = bluetooth_coordinator
-
-    async def async_added_to_hass(self) -> None:
-        """Handle when entity is added to hass."""
-        await super().async_added_to_hass()
-        if self.bluetooth_coordinator is not None:
-            self.async_on_remove(
-                self.bluetooth_coordinator.async_add_listener(self.async_write_ha_state)
-            )

homeassistant/components/lamarzocco/number.py

@@ -58,7 +58,6 @@ ENTITIES: tuple[LaMarzoccoNumberEntityDescription, ...] = (
                 CoffeeBoiler, machine.dashboard.config[WidgetType.CM_COFFEE_BOILER]
             ).target_temperature
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoNumberEntityDescription(
         key="steam_temp",
@@ -79,7 +78,6 @@ ENTITIES: tuple[LaMarzoccoNumberEntityDescription, ...] = (
             lambda coordinator: coordinator.device.dashboard.model_name
             in (ModelName.GS3_AV, ModelName.GS3_MP)
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoNumberEntityDescription(
         key="smart_standby_time",
@@ -98,7 +96,6 @@ ENTITIES: tuple[LaMarzoccoNumberEntityDescription, ...] = (
             )
         ),
         native_value_fn=lambda machine: machine.schedule.smart_wake_up_sleep.smart_stand_by_minutes,
-        bt_offline_mode=True,
     ),
     LaMarzoccoNumberEntityDescription(
         key="preinfusion_off",
@@ -229,14 +226,13 @@ async def async_setup_entry(
 ) -> None:
     """Set up number entities."""
     coordinator = entry.runtime_data.config_coordinator
-
-    async_add_entities(
-        LaMarzoccoNumberEntity(
-            coordinator, description, entry.runtime_data.bluetooth_coordinator
-        )
+    entities: list[NumberEntity] = [
+        LaMarzoccoNumberEntity(coordinator, description)
         for description in ENTITIES
         if description.supported_fn(coordinator)
-    )
+    ]
+
+    async_add_entities(entities)
 
 
 class LaMarzoccoNumberEntity(LaMarzoccoEntity, NumberEntity):

homeassistant/components/lamarzocco/select.py

@@ -80,7 +80,6 @@ ENTITIES: tuple[LaMarzoccoSelectEntityDescription, ...] = (
             lambda coordinator: coordinator.device.dashboard.model_name
             in (ModelName.LINEA_MINI_R, ModelName.LINEA_MICRA)
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoSelectEntityDescription(
         key="prebrew_infusion_select",
@@ -129,9 +128,7 @@ async def async_setup_entry(
     coordinator = entry.runtime_data.config_coordinator
 
     async_add_entities(
-        LaMarzoccoSelectEntity(
-            coordinator, description, entry.runtime_data.bluetooth_coordinator
-        )
+        LaMarzoccoSelectEntity(coordinator, description)
         for description in ENTITIES
         if description.supported_fn(coordinator)
     )

homeassistant/components/lamarzocco/strings.json

@@ -183,9 +183,6 @@
     "auto_on_off_error": {
       "message": "Error while setting auto on/off to {state} for {id}"
     },
-    "bluetooth_connection_failed": {
-      "message": "Error while connecting to machine via Bluetooth"
-    },
     "button_error": {
       "message": "Error while executing button {key}"
     },

homeassistant/components/lamarzocco/switch.py

@@ -50,7 +50,6 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
             ).mode
             is MachineMode.BREWING_MODE
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoSwitchEntityDescription(
         key="steam_boiler_enable",
@@ -66,7 +65,6 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
             lambda coordinator: coordinator.device.dashboard.model_name
             in (ModelName.LINEA_MINI_R, ModelName.LINEA_MICRA)
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoSwitchEntityDescription(
         key="steam_boiler_enable",
@@ -82,7 +80,6 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
             lambda coordinator: coordinator.device.dashboard.model_name
             not in (ModelName.LINEA_MINI_R, ModelName.LINEA_MICRA)
         ),
-        bt_offline_mode=True,
     ),
     LaMarzoccoSwitchEntityDescription(
         key="smart_standby_enabled",
@@ -94,7 +91,6 @@ ENTITIES: tuple[LaMarzoccoSwitchEntityDescription, ...] = (
             minutes=machine.schedule.smart_wake_up_sleep.smart_stand_by_minutes,
         ),
         is_on_fn=lambda machine: machine.schedule.smart_wake_up_sleep.smart_stand_by_enabled,
-        bt_offline_mode=True,
     ),
 )
 
@@ -110,9 +106,7 @@ async def async_setup_entry(
 
     entities: list[SwitchEntity] = []
     entities.extend(
-        LaMarzoccoSwitchEntity(
-            coordinator, description, entry.runtime_data.bluetooth_coordinator
-        )
+        LaMarzoccoSwitchEntity(coordinator, description)
         for description in ENTITIES
         if description.supported_fn(coordinator)
     )

homeassistant/components/lawn_mower/strings.json

@@ -41,44 +41,44 @@
   "title": "Lawn mower",
   "triggers": {
     "docked": {
-      "description": "Triggers after one or more lawn mowers return to dock.",
+      "description": "Triggers when a lawn mower has docked.",
       "fields": {
         "behavior": {
           "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
-      "name": "Lawn mower returned to dock"
+      "name": "When a lawn mower has docked"
     },
     "errored": {
-      "description": "Triggers after one or more lawn mowers encounter an error.",
+      "description": "Triggers when a lawn mower has errored.",
       "fields": {
         "behavior": {
           "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
-      "name": "Lawn mower encountered an error"
+      "name": "When a lawn mower has errored"
     },
     "paused_mowing": {
-      "description": "Triggers after one or more lawn mowers pause mowing.",
+      "description": "Triggers when a lawn mower has paused mowing.",
       "fields": {
         "behavior": {
           "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
-      "name": "Lawn mower paused mowing"
+      "name": "When a lawn mower has paused mowing"
     },
     "started_mowing": {
-      "description": "Triggers after one or more lawn mowers start mowing.",
+      "description": "Triggers when a lawn mower has started mowing.",
       "fields": {
         "behavior": {
           "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
-      "name": "Lawn mower started mowing"
+      "name": "When a lawn mower has started mowing"
     }
   }
 }

homeassistant/components/letpot/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["letpot"],
   "quality_scale": "silver",
-  "requirements": ["letpot==0.6.4"]
+  "requirements": ["letpot==0.6.3"]
 }

homeassistant/components/levoit/__init__.py

@@ -1 +0,0 @@
-"""Virtual integration: Levoit."""

homeassistant/components/levoit/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "levoit",
-  "name": "Levoit",
-  "integration_type": "virtual",
-  "supported_by": "vesync"
-}

homeassistant/components/libre_hardware_monitor/coordinator.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
+from types import MappingProxyType
 
 from librehardwaremonitor_api import (
     LibreHardwareMonitorClient,
@@ -54,11 +55,15 @@ class LibreHardwareMonitorCoordinator(DataUpdateCoordinator[LibreHardwareMonitor
         device_entries: list[DeviceEntry] = dr.async_entries_for_config_entry(
             registry=dr.async_get(self.hass), config_entry_id=config_entry.entry_id
         )
-        self._previous_devices: dict[DeviceId, DeviceName] = {
-            DeviceId(next(iter(device.identifiers))[1]): DeviceName(device.name)
-            for device in device_entries
-            if device.identifiers and device.name
-        }
+        self._previous_devices: MappingProxyType[DeviceId, DeviceName] = (
+            MappingProxyType(
+                {
+                    DeviceId(next(iter(device.identifiers))[1]): DeviceName(device.name)
+                    for device in device_entries
+                    if device.identifiers and device.name
+                }
+            )
+        )
 
     async def _async_update_data(self) -> LibreHardwareMonitorData:
         try:
@@ -70,9 +75,7 @@ class LibreHardwareMonitorCoordinator(DataUpdateCoordinator[LibreHardwareMonitor
         except LibreHardwareMonitorNoDevicesError as err:
             raise UpdateFailed("No sensor data available, will retry") from err
 
-        await self._async_handle_changes_in_devices(
-            dict(lhm_data.main_device_ids_and_names)
-        )
+        await self._async_handle_changes_in_devices(lhm_data.main_device_ids_and_names)
 
         return lhm_data
 
@@ -89,23 +92,20 @@ class LibreHardwareMonitorCoordinator(DataUpdateCoordinator[LibreHardwareMonitor
         )
 
     async def _async_handle_changes_in_devices(
-        self, detected_devices: dict[DeviceId, DeviceName]
+        self, detected_devices: MappingProxyType[DeviceId, DeviceName]
     ) -> None:
         """Handle device changes by deleting devices from / adding devices to Home Assistant."""
-        detected_devices = {
-            DeviceId(f"{self.config_entry.entry_id}_{detected_id}"): device_name
-            for detected_id, device_name in detected_devices.items()
-        }
-
         previous_device_ids = set(self._previous_devices.keys())
         detected_device_ids = set(detected_devices.keys())
 
-        _LOGGER.debug("Previous device_ids: %s", previous_device_ids)
-        _LOGGER.debug("Detected device_ids: %s", detected_device_ids)
-
         if previous_device_ids == detected_device_ids:
             return
 
+        if self.data is None:
+            # initial update during integration startup
+            self._previous_devices = detected_devices  # type: ignore[unreachable]
+            return
+
         if orphaned_devices := previous_device_ids - detected_device_ids:
             _LOGGER.warning(
                 "Device(s) no longer available, will be removed: %s",
@@ -114,21 +114,13 @@ class LibreHardwareMonitorCoordinator(DataUpdateCoordinator[LibreHardwareMonitor
             device_registry = dr.async_get(self.hass)
             for device_id in orphaned_devices:
                 if device := device_registry.async_get_device(
-                    identifiers={(DOMAIN, device_id)}
+                    identifiers={(DOMAIN, f"{self.config_entry.entry_id}_{device_id}")}
                 ):
-                    _LOGGER.debug(
-                        "Removing device: %s", self._previous_devices[device_id]
-                    )
                     device_registry.async_update_device(
                         device_id=device.id,
                         remove_config_entry_id=self.config_entry.entry_id,
                     )
 
-        if self.data is None:
-            # initial update during integration startup
-            self._previous_devices = detected_devices  # type: ignore[unreachable]
-            return
-
         if new_devices := detected_device_ids - previous_device_ids:
             _LOGGER.warning(
                 "New Device(s) detected, reload integration to add them to Home Assistant: %s",

homeassistant/components/light/strings.json

@@ -510,24 +510,24 @@
   "title": "Light",
   "triggers": {
     "turned_off": {
-      "description": "Triggers after one or more lights turn off.",
+      "description": "Triggers when a light is turned off.",
       "fields": {
         "behavior": {
           "description": "[%key:component::light::common::trigger_behavior_description%]",
           "name": "[%key:component::light::common::trigger_behavior_name%]"
         }
       },
-      "name": "Light turned off"
+      "name": "When a light is turned off"
     },
     "turned_on": {
-      "description": "Triggers after one or more lights turn on.",
+      "description": "Triggers when a light is turned on.",
       "fields": {
         "behavior": {
           "description": "[%key:component::light::common::trigger_behavior_description%]",
           "name": "[%key:component::light::common::trigger_behavior_name%]"
         }
       },
-      "name": "Light turned on"
+      "name": "When a light is turned on"
     }
   }
 }

homeassistant/components/matter/icons.json

@@ -86,12 +86,6 @@
       "current_phase": {
         "default": "mdi:state-machine"
       },
-      "door_closed_events": {
-        "default": "mdi:door-closed"
-      },
-      "door_open_events": {
-        "default": "mdi:door-open"
-      },
       "esa_opt_out_state": {
         "default": "mdi:home-lightning-bolt"
       },

homeassistant/components/matter/sensor.py

@@ -1488,30 +1488,4 @@ DISCOVERY_SCHEMAS = [
         entity_class=MatterSensor,
         required_attributes=(clusters.ServiceArea.Attributes.EstimatedEndTime,),
     ),
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="DoorLockDoorOpenEvents",
-            translation_key="door_open_events",
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            state_class=SensorStateClass.TOTAL_INCREASING,
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(clusters.DoorLock.Attributes.DoorOpenEvents,),
-        featuremap_contains=clusters.DoorLock.Bitmaps.Feature.kDoorPositionSensor,
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.SENSOR,
-        entity_description=MatterSensorEntityDescription(
-            key="DoorLockDoorClosedEvents",
-            translation_key="door_closed_events",
-            entity_category=EntityCategory.DIAGNOSTIC,
-            entity_registry_enabled_default=False,
-            state_class=SensorStateClass.TOTAL_INCREASING,
-        ),
-        entity_class=MatterSensor,
-        required_attributes=(clusters.DoorLock.Attributes.DoorClosedEvents,),
-        featuremap_contains=clusters.DoorLock.Bitmaps.Feature.kDoorPositionSensor,
-    ),
 ]