Always use Celsius in Shelly integration, part 2

homeassistant/components/shelly/entity.py

@@ -9,6 +9,7 @@
 from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError, RpcCallError
 
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry, entity, entity_registry
@@ -615,6 +616,7 @@ def __init__(
         """Initialize the sleeping sensor."""
         self.sensors = sensors
         self.last_state: StateType = None
+        self.last_unit: str | None = None
         self.coordinator = coordinator
         self.attribute = attribute
         self.block: Block | None = block  # type: ignore[assignment]
@@ -644,6 +646,7 @@ async def async_added_to_hass(self) -> None:
 
         if last_state is not None:
             self.last_state = last_state.state
+            self.last_unit = last_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
 
     @callback
     def _update_callback(self) -> None:
@@ -696,6 +699,7 @@ def __init__(
     ) -> None:
         """Initialize the sleeping sensor."""
         self.last_state: StateType = None
+        self.last_unit: str | None = None
         self.coordinator = coordinator
         self.key = key
         self.attribute = attribute
@@ -725,3 +729,4 @@ async def async_added_to_hass(self) -> None:
 
         if last_state is not None:
             self.last_state = last_state.state
+            self.last_unit = last_state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)

homeassistant/components/shelly/sensor.py

@@ -47,7 +47,7 @@
     async_setup_entry_rest,
     async_setup_entry_rpc,
 )
-from .utils import get_device_entry_gen, get_device_uptime, temperature_unit
+from .utils import get_device_entry_gen, get_device_uptime
 
 
 @dataclass
@@ -79,7 +79,7 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
     ("device", "deviceTemp"): BlockSensorDescription(
         key="device|deviceTemp",
         name="Device Temperature",
-        unit_fn=temperature_unit,
+        native_unit_of_measurement=TEMP_CELSIUS,
         value=lambda value: round(value, 1),
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -221,7 +221,7 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
     ("sensor", "temp"): BlockSensorDescription(
         key="sensor|temp",
         name="Temperature",
-        unit_fn=temperature_unit,
+        native_unit_of_measurement=TEMP_CELSIUS,
         value=lambda value: round(value, 1),
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -230,7 +230,7 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
     ("sensor", "extTemp"): BlockSensorDescription(
         key="sensor|extTemp",
         name="Temperature",
-        unit_fn=temperature_unit,
+        native_unit_of_measurement=TEMP_CELSIUS,
         value=lambda value: round(value, 1),
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
@@ -499,8 +499,6 @@ def __init__(
         super().__init__(coordinator, block, attribute, description)
 
         self._attr_native_unit_of_measurement = description.native_unit_of_measurement
-        if unit_fn := description.unit_fn:
-            self._attr_native_unit_of_measurement = unit_fn(block.info(attribute))
 
     @property
     def native_value(self) -> StateType:
@@ -547,10 +545,6 @@ def __init__(
         """Initialize the sleeping sensor."""
         super().__init__(coordinator, block, attribute, description, entry, sensors)
 
-        self._attr_native_unit_of_measurement = description.native_unit_of_measurement
-        if block and (unit_fn := description.unit_fn):
-            self._attr_native_unit_of_measurement = unit_fn(block.info(attribute))
-
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
@@ -559,6 +553,14 @@ def native_value(self) -> StateType:
 
         return self.last_state
 
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the unit of measurement of the sensor, if any."""
+        if self.block is not None:
+            return self.entity_description.native_unit_of_measurement
+
+        return self.last_unit
+
 
 class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, SensorEntity):
     """Represent a RPC sleeping sensor."""
@@ -572,3 +574,11 @@ def native_value(self) -> StateType:
             return self.attribute_value
 
         return self.last_state
+
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        """Return the unit of measurement of the sensor, if any."""
+        if self.coordinator.device.initialized:
+            return self.entity_description.native_unit_of_measurement
+
+        return self.last_unit

homeassistant/components/shelly/utils.py

@@ -5,13 +5,13 @@
 from typing import Any, cast
 
 from aiohttp.web import Request, WebSocketResponse
-from aioshelly.block_device import BLOCK_VALUE_UNIT, COAP, Block, BlockDevice
+from aioshelly.block_device import COAP, Block, BlockDevice
 from aioshelly.const import MODEL_NAMES
 from aioshelly.rpc_device import RpcDevice, WsServer
 
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP, TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry, entity_registry, singleton
 from homeassistant.helpers.typing import EventType
@@ -43,13 +43,6 @@ def async_remove_shelly_entity(
         entity_reg.async_remove(entity_id)
 
 
-def temperature_unit(block_info: dict[str, Any]) -> str:
-    """Detect temperature unit."""
-    if block_info[BLOCK_VALUE_UNIT] == "F":
-        return TEMP_FAHRENHEIT
-    return TEMP_CELSIUS
-
-
 def get_block_device_name(device: BlockDevice) -> str:
     """Naming for device."""
     return cast(str, device.settings["name"] or device.settings["device"]["hostname"])