refactor(entity): drop explicit entity_id override in complex naming (#448)

Complex naming was setting self.entity_id to force an installation-id-
prefixed entity_id, which tomer-w noted was a historical mistake from
before proper HA entity naming patterns were established.

Since DEFAULT_SIMPLE_NAMING is True, new installations already get
clean HA-derived entity_ids via simple naming. Complex naming only
exists for backward compatibility; existing entities keep their already-
registered entity_ids regardless. Removing the explicit self.entity_id
override lets HA derive entity_ids from the entity name — the same
approach simple naming uses.

The unique_id in complex naming is unchanged, so entity identity is
fully preserved. No display_id needed.

Co-authored-by: pos-ei-don <philipp.wacker@ibf-solutions.com>

Author: pos-ei-don

custom_components/victron_mqtt/entity.py

@@ -68,8 +68,6 @@ def __init__(
             entity_id = f"{entity_platform}.{ENTITY_PREFIX}_{metric.unique_id}"
         else:
             entity_id = f"{entity_platform}.{ENTITY_PREFIX}_{installation_id}_{metric.unique_id}"
-            # you have to set the entity_id if we want to make the unique_id different from the default entity_id generation (which is based on the entity name)
-            self.entity_id = entity_id
         self._attr_unique_id = entity_id
         self._attr_suggested_display_precision = metric.precision
         # Always set translation_key so HA can resolve state/option translations (e.g. select options).

tests/test_hub.py

@@ -399,13 +399,8 @@ async def test_sensor_complex(
     )
 
     assert len(entities) == 2
-    simple_naming = mock_config_entry.data[CONF_SIMPLE_NAMING]
-    if simple_naming:
-        day_entity_id = "select.victron_venus_ess_batterylife_schedule_charge_2_days"
-        enabled_entity_id = "switch.victron_venus_ess_batterylife_schedule_charge_2_enabled"
-    else:
-        day_entity_id = "select.victron_mqtt_123_system_0_system_ess_schedule_charge_2_days"
-        enabled_entity_id = "switch.victron_mqtt_123_system_0_system_ess_schedule_charge_2_enabled"
+    day_entity_id = "select.victron_venus_ess_batterylife_schedule_charge_2_days"
+    enabled_entity_id = "switch.victron_venus_ess_batterylife_schedule_charge_2_enabled"
 
     day_entity = next(entity for entity in entities if entity.entity_id == day_entity_id)
     enabled_entity = next(
@@ -700,14 +695,7 @@ async def test_sensor_with_baseline(
     # Mock time.monotonic() to return a fixed time
     mock_time.return_value = 0
 
-    # The entity_id depends on the naming convention:
-    # simple_naming: HA generates from device name + entity name
-    # complex_naming: includes installation_id in the unique_id/entity_id
-    simple_naming = mock_config_entry.data[CONF_SIMPLE_NAMING]
-    if simple_naming:
-        entity_id = "sensor.victron_venus_pv_energy"
-    else:
-        entity_id = "sensor.victron_mqtt_123_system_0_system_dc_pv_energy"
+    entity_id = "sensor.victron_venus_pv_energy"
 
     # Mock the restore cache with a previous state value of 1000.0
     mock_restore_cache(hass, [State(entity_id, "1000.0")])
@@ -734,13 +722,8 @@ async def test_sensor_with_baseline(
     assert state is not None
     assert float(state.state) == 1000.004
     assert len(entities) == 2
-    simple_naming = mock_config_entry.data[CONF_SIMPLE_NAMING]
-    if simple_naming:
-        energy_entity_id = "sensor.victron_venus_pv_energy"
-        power_entity_id = "sensor.victron_venus_pv_power"
-    else:
-        energy_entity_id = "sensor.victron_mqtt_123_system_0_system_dc_pv_energy"
-        power_entity_id = "sensor.victron_mqtt_123_system_0_system_dc_pv_power"
+    energy_entity_id = "sensor.victron_venus_pv_energy"
+    power_entity_id = "sensor.victron_venus_pv_power"
 
     energy_entity = next(entity for entity in entities if entity.entity_id == energy_entity_id)
     energy_state = hass.states.get(energy_entity.entity_id)