Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomer-w merged 1 commit into from
Jul 7, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions custom_components/victron_mqtt/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
27 changes: 5 additions & 22 deletions tests/test_hub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,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(
Expand Down Expand Up @@ -677,14 +672,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")])
Expand All @@ -711,13 +699,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)
Expand Down
Loading