Fix entity in 2026.2 (#4349)

Author: andrew-codechimp

custom_components/battery_notes/binary_sensor.py

@@ -25,7 +25,6 @@
     Event,
     HomeAssistant,
     callback,
-    split_entity_id,
 )
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import (
@@ -54,7 +53,10 @@
     TemplateStateFromEntityId,
 )
 
-from .common import utcnow_no_timezone, validate_is_float
+from .common import (
+    utcnow_no_timezone,
+    validate_is_float,
+)
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LOW_THRESHOLD,
@@ -288,23 +290,6 @@ def __init__(
         self._template_attrs: dict[Template, list[_TemplateAttribute]] = {}
         self._template_result_info: TrackTemplateResultInfo | None = None
 
-        if coordinator.source_entity_id and not coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.device_name + " "
-            }
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-        elif coordinator.source_entity_id and coordinator.device_id:
-            _, source_object_id = split_entity_id(coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.source_entity_name + " "
-            }
-            self.entity_id = (
-                f"binary_sensor.{source_object_id}_{entity_description.key}"
-            )
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-
         self._template = battery_low_template
         self._state: bool | None = None
 
@@ -476,23 +461,6 @@ def __init__(
             hass=hass, coordinator=coordinator, entity_description=entity_description
         )
 
-        if coordinator.source_entity_id and not coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.device_name + " "
-            }
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-        elif coordinator.source_entity_id and coordinator.device_id:
-            _, source_object_id = split_entity_id(coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.source_entity_name + " "
-            }
-            self.entity_id = (
-                f"binary_sensor.{source_object_id}_{entity_description.key}"
-            )
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-
         self._attr_unique_id = unique_id
 
     async def async_added_to_hass(self) -> None:
@@ -538,29 +506,13 @@ def __init__(
         unique_id: str,
     ) -> None:
         """Create a low battery binary sensor."""
+
+        self._attr_unique_id = unique_id
+
         super().__init__(
             hass=hass, coordinator=coordinator, entity_description=entity_description
         )
 
-        if coordinator.source_entity_id and not coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.device_name + " "
-            }
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-        elif coordinator.source_entity_id and coordinator.device_id:
-            _, source_object_id = split_entity_id(coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.source_entity_name + " "
-            }
-            self.entity_id = (
-                f"binary_sensor.{source_object_id}_{entity_description.key}"
-            )
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-
-        self._attr_unique_id = unique_id
-
     async def async_added_to_hass(self) -> None:
         """Handle added to Hass."""
 
@@ -620,23 +572,6 @@ def __init__(
             hass=hass, coordinator=coordinator, entity_description=entity_description
         )
 
-        if coordinator.source_entity_id and not coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.device_name + " "
-            }
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-        elif coordinator.source_entity_id and coordinator.device_id:
-            _, source_object_id = split_entity_id(coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.source_entity_name + " "
-            }
-            self.entity_id = (
-                f"binary_sensor.{source_object_id}_{entity_description.key}"
-            )
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = f"binary_sensor.{coordinator.device_name.lower()}_{entity_description.key}"
-
         self._attr_unique_id = unique_id
 
         self._state: bool | None = None

custom_components/battery_notes/button.py

@@ -12,7 +12,7 @@
 from homeassistant.const import (
     CONF_DEVICE_ID,
 )
-from homeassistant.core import HomeAssistant, callback, split_entity_id
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
@@ -131,25 +131,6 @@ def __init__(
             hass=hass, entity_description=entity_description, coordinator=coordinator
         )
 
-        if coordinator.source_entity_id and not coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.device_name + " "
-            }
-            self.entity_id = (
-                f"button.{coordinator.device_name.lower()}_{entity_description.key}"
-            )
-        elif coordinator.source_entity_id and coordinator.device_id:
-            _, source_object_id = split_entity_id(coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": coordinator.source_entity_name + " "
-            }
-            self.entity_id = f"button.{source_object_id}_{entity_description.key}"
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = (
-                f"button.{coordinator.device_name.lower()}_{entity_description.key}"
-            )
-
         self._attr_unique_id = unique_id
         self._source_entity_id = coordinator.source_entity_id
 

custom_components/battery_notes/entity.py

@@ -2,13 +2,15 @@
 
 from __future__ import annotations
 
+from collections.abc import Mapping
 from dataclasses import dataclass
 
 from homeassistant.core import HomeAssistant, split_entity_id
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device import async_entity_id_to_device_id
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util import slugify
 
 from .coordinator import BatteryNotesSubentryCoordinator
 
@@ -50,28 +52,12 @@ def __init__(
         self._attr_has_entity_name = True
 
         # Set up entity naming and translation placeholders
-        self._set_entity_id(entity_description)
+        self._attr_translation_placeholders = self._generate_translation_placeholders()
+        self.entity_id = self._generate_entity_id()
 
         # Set up device association
         self._associate_device(hass, device_registry)
 
-    def _set_entity_id(self, entity_description: BatteryNotesEntityDescription) -> None:
-        """Set up entity naming and translation placeholders."""
-        if self.coordinator.source_entity_id and not self.coordinator.device_id:
-            self._attr_translation_placeholders = {
-                "device_name": self.coordinator.device_name + " "
-            }
-            self.entity_id = f"{entity_description.entity_type}.{self.coordinator.device_name.lower()}_{entity_description.key}"
-        elif self.coordinator.source_entity_id and self.coordinator.device_id:
-            _, source_object_id = split_entity_id(self.coordinator.source_entity_id)
-            self._attr_translation_placeholders = {
-                "device_name": self.coordinator.source_entity_name + " "
-            }
-            self.entity_id = f"{entity_description.entity_type}.{source_object_id}_{entity_description.key}"
-        else:
-            self._attr_translation_placeholders = {"device_name": ""}
-            self.entity_id = f"{entity_description.entity_type}.{self.coordinator.device_name.lower()}_{entity_description.key}"
-
     def _associate_device(
         self, hass: HomeAssistant, device_registry: dr.DeviceRegistry
     ) -> None:
@@ -94,3 +80,31 @@ def _associate_device(
         else:
             # No device, leave hanging
             self.device_entry = None
+
+    def _generate_translation_placeholders(self) -> Mapping[str, str]:
+        """Generate translation placeholders."""
+        if self.coordinator.source_entity_id and not self.coordinator.device_id:
+            return {"device_name": self.coordinator.device_name + " "}
+        elif self.coordinator.source_entity_id and self.coordinator.device_id:
+            return {"device_name": self.coordinator.source_entity_name + " "}
+        else:
+            return {"device_name": ""}
+
+    def _generate_entity_id(
+        self,
+    ) -> str:
+        """Generate a consistent entity ID."""
+        entity_type = self.entity_description.entity_type
+        entity_key = self.entity_description.key
+
+        if self.coordinator.source_entity_id and not self.coordinator.device_id:
+            return f"{entity_type}.{slugify(self.coordinator.device_name.lower())}_{entity_key}".replace(
+                "__", "_"
+            )
+        elif self.coordinator.source_entity_id and self.coordinator.device_id:
+            _, source_object_id = split_entity_id(self.coordinator.source_entity_id)
+            return f"{entity_type}.{source_object_id}_{entity_key}".replace("__", "_")
+        else:
+            return f"{entity_type}.{slugify(self.coordinator.device_name.lower())}_{entity_key}".replace(
+                "__", "_"
+            )