Align with core changes

Author: tomer-w

custom_components/victron_mqtt/entity.py

@@ -90,10 +90,9 @@ def __init__(
             metric.generic_short_id not in ENTITIES_DISABLE_BY_DEFAULT
         )
 
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the metric unit before entity registration."""
-        if self._metric.metric_type == MetricType.COST:
+    def _resolve_native_unit_of_measurement(self) -> str | None:
+        """Resolve native unit of measurement for platforms that support it."""
+        if self._metric.metric_type is MetricType.COST:
             return self.hass.config.currency
 
         unit_of_measurement = self._metric.unit_of_measurement

custom_components/victron_mqtt/number.py

@@ -101,6 +101,11 @@ def __init__(
         if metric.step is not None:
             self._attr_native_step = metric.step
 
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the native unit of measurement."""
+        return self._resolve_native_unit_of_measurement()
+
     @callback
     def _on_update_cb(self, value: Any) -> None:
         self._attr_native_value = value

custom_components/victron_mqtt/sensor.py

@@ -115,6 +115,11 @@ def __init__(
             )
         self._attr_native_value = VictronSensor._normalize_value(metric.value)
 
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the native unit of measurement."""
+        return self._resolve_native_unit_of_measurement()
+
     @callback
     def _on_update_cb(self, value: Any) -> None:
         if self._baseline is not None:

tests/test_hub.py

@@ -358,6 +358,29 @@ async def test_monetary_sensor_uses_ha_currency(
     assert state.attributes.get("unit_of_measurement") == "EUR"
 
 
+async def test_native_unit_of_measurement_special_unit(
+    hass: HomeAssistant,
+    init_integration,
+) -> None:
+    """Test special units like % are exposed as native units."""
+    victron_hub, mock_config_entry = init_integration
+
+    await inject_message(victron_hub, "N/123/battery/0/Soc", '{"value": 85}')
+    await finalize_injection(victron_hub)
+    await hass.async_block_till_done()
+
+    entity_registry = er.async_get(hass)
+    entities = er.async_entries_for_config_entry(
+        entity_registry, mock_config_entry.entry_id
+    )
+    entity = next((entry for entry in entities if entry.unit_of_measurement == "%"), None)
+    assert entity is not None
+
+    state = hass.states.get(entity.entity_id)
+    assert state is not None
+    assert state.attributes["unit_of_measurement"] == "%"
+
+
 async def test_sensor_complex(
     hass: HomeAssistant,
     init_integration,