Fix identifiers

Author: roblandry

custom_components/redsea/binary_sensor.py

@@ -475,7 +475,7 @@ def device_info(self) -> DeviceInfo:
         domain, ident = next(iter(cast(set[tuple[str, str]], base_identifiers)))
 
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

custom_components/redsea/button.py

@@ -625,7 +625,7 @@ def device_info(self) -> DeviceInfo:
         domain, ident = next(iter(cast(set[tuple[str, str]], base_identifiers)))
 
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

custom_components/redsea/number.py

@@ -783,7 +783,7 @@ def __init__(
             domain, ident = next(iter(cast(set[tuple[str, str]], base_identifiers)))
 
             di_dict: dict[str, Any] = {
-                "identifiers": {(domain, f"{ident}_head_{self._head}")},
+                "identifiers": {(domain, ident, f"head_{self._head}")},
                 "name": f"{self._device.title} head {self._head}",
             }
 
@@ -833,8 +833,8 @@ async def async_added_to_hass(self) -> None:
         base_identifiers = base_di.get("identifiers") or {(DOMAIN, self._device.serial)}
         domain, ident = next(iter(cast(set[tuple[str, str]], base_identifiers)))
         via_device = base_di.get("via_device")
-        di: DeviceInfo = {
-            "identifiers": {(domain, f"{ident}_head_{head}")},
+        di_dict: dict[str, Any] = {
+            "identifiers": {(domain, ident, f"head_{head}")},
             "name": f"{self._device.title} head {head}",
             "manufacturer": base_di.get("manufacturer"),
             "model": base_di.get("model"),
@@ -843,8 +843,8 @@ async def async_added_to_hass(self) -> None:
             "sw_version": base_di.get("sw_version"),
         }
         if via_device is not None:
-            di["via_device"] = via_device
-        self._attr_device_info = di
+            di_dict["via_device"] = via_device
+        self._attr_device_info = cast(DeviceInfo, di_dict)
 
 
 # REEFRUN

custom_components/redsea/select.py

@@ -470,7 +470,7 @@ def device_info(self) -> DeviceInfo:
         # DeviceInfo is a TypedDict; copying values from a generic dict makes mypy/pyright
         # widen types to object | None, so we guard and only assign strings (or omit keys).
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

custom_components/redsea/sensor.py

@@ -1422,7 +1422,7 @@ def device_info(self) -> DeviceInfo:
         # DeviceInfo is a TypedDict; copying values from a generic dict makes mypy/pyright
         # widen types to object | None, so we guard and only assign strings (or omit keys).
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

custom_components/redsea/switch.py

@@ -749,7 +749,7 @@ def device_info(self) -> DeviceInfo:
         # DeviceInfo is a TypedDict; copying values from a generic dict makes mypy/pyright
         # widen types to object | None, so we guard and only assign strings (or omit keys).
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

custom_components/redsea/text.py

@@ -261,7 +261,7 @@ def device_info(self) -> DeviceInfo:
         # DeviceInfo is a TypedDict; copying values from a generic dict makes mypy/pyright
         # widen types to object | None, so we guard and only assign strings (or omit keys).
         di_dict: dict[str, Any] = {
-            "identifiers": {(domain, f"{ident}_head_{self._head}")},
+            "identifiers": {(domain, ident, f"head_{self._head}")},
             "name": f"{self._device.title} head {self._head}",
         }
 

tests/test_binary_sensor_dose_unit.py

@@ -101,7 +101,7 @@ def test_dose_device_info_builds_head_device_and_copies_fields_and_via_device()
     ent = ReefDoseBinarySensorEntity(cast(Any, device), desc)
     di = cast(dict[str, Any], ent.device_info)
 
-    assert di["identifiers"] == {("redsea", "IDENT_head_3")}
+    assert di["identifiers"] == {("redsea", "IDENT", "head_3")}
     assert di["name"] == "Dose head 3"
     assert di["manufacturer"] == "Red Sea"
     assert di["model"] is None
@@ -128,4 +128,4 @@ def test_dose_device_info_falls_back_to_default_identifiers_when_missing() -> No
     ent = ReefDoseBinarySensorEntity(cast(Any, device), desc)
     di = cast(dict[str, Any], ent.device_info)
 
-    assert di["identifiers"] == {("redsea", "SER123_head_1")}
+    assert di["identifiers"] == {("redsea", "SER123", "head_1")}

tests/test_select_dose_unit.py

@@ -111,7 +111,7 @@ def test_reefdose_select_device_info_builds_head_device_and_copies_fields(
     ent = ReefDoseSelectEntity(cast(Any, device), desc)
 
     di = cast(DeviceInfo, ent.device_info)
-    assert ("redsea", "IDENT_head_1") in (di.get("identifiers") or set())
+    assert ("redsea", "IDENT", "head_1") in (di.get("identifiers") or set())
     assert di.get("name") == "Dose head 1"
 
     assert di.get("manufacturer") == "Red Sea"

tests/test_text_unit.py

@@ -260,7 +260,7 @@ def test_reefdose_text_device_info_builds_head_device_and_copies_fields_and_via_
     ent = ReefDoseTextEntity(cast(Any, device), desc)
     di = cast(dict[str, Any], ent.device_info)
 
-    assert di["identifiers"] == {("redsea", "IDENT_head_3")}
+    assert di["identifiers"] == {("redsea", "IDENT", "head_3")}
     assert di["name"] == "Dose head 3"
     assert di["manufacturer"] == "Red Sea"
     assert di["model"] is None
@@ -288,7 +288,7 @@ def test_reefdose_text_device_info_falls_back_to_default_identifiers_when_missin
     ent = ReefDoseTextEntity(cast(Any, device), desc)
     di = cast(dict[str, Any], ent.device_info)
 
-    assert di["identifiers"] == {("redsea", "SER123_head_1")}
+    assert di["identifiers"] == {("redsea", "SER123", "head_1")}
 
 
 def test_reefbeat_text_restore_value_returns_state() -> None: