Skip to content

Add unit_of_measurement to climate and water_heater #168747

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

Draft
jhenkens wants to merge 12 commits into
base: dev
Choose a base branch
from
Draft

Add unit_of_measurement to climate and water_heater #168747

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d333329
Add unit_of_measurement to climate and water_heater
jhenkens Apr 22, 2026
4c5d595
Move map to const
jhenkens Apr 22, 2026
c52b56e
Merge branch 'dev' into add-temperature-unit-to-climate-and-water-heater
bdraco Apr 22, 2026
32d39b4
Add basic tests
jhenkens Apr 22, 2026
362921b
Not sure how prek missed this one line
jhenkens Apr 22, 2026
20491e3
Add dictionary .get fallback
jhenkens Apr 22, 2026
d530d0b
Remove None from const
jhenkens Apr 22, 2026
9acdea7
Make lookups safer
jhenkens Apr 22, 2026
95b24f1
Merge branch 'dev' into add-temperature-unit-to-climate-and-water-heater
jhenkens Apr 22, 2026
54d066b
Merge remote-tracking branch 'upstream/dev' into add-temperature-unit…
jhenkens May 2, 2026
d098f2c
Merge remote-tracking branch 'origin/add-temperature-unit-to-climate-…
jhenkens May 2, 2026
28e6032
Make copilot happy with new comments
jhenkens May 2, 2026
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
5 changes: 2 additions & 3 deletions homeassistant/components/esphome/climate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@
PRECISION_HALVES,
PRECISION_TENTHS,
PRECISION_WHOLE,
UnitOfTemperature,
)
from homeassistant.core import callback
from homeassistant.exceptions import ServiceValidationError

from .const import DOMAIN
from .const import DOMAIN, TEMPERATURE_UNIT_MAP
from .entity import (
EsphomeEntity,
convert_api_error_ha_error,
Expand Down Expand Up @@ -133,7 +132,6 @@
class EsphomeClimateEntity(EsphomeEntity[ClimateInfo, ClimateState], ClimateEntity):
"""A climate implementation for ESPHome."""

_attr_temperature_unit = UnitOfTemperature.CELSIUS
_attr_translation_key = "climate"
_feature_flags = ClimateFeature(0)

Expand All @@ -145,6 +143,7 @@ def _on_static_info_update(self, static_info: EntityInfo) -> None:
self._feature_flags = ClimateFeature(
static_info.supported_feature_flags_compat(self._api_version)
)
self._attr_temperature_unit = TEMPERATURE_UNIT_MAP[static_info.temperature_unit]
Copy link

Copilot AI Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add test coverage that sets temperature_unit in ClimateInfo (e.g., Fahrenheit) and asserts the entity reports the correct temperature unit and that service calls pass the raw temperature values without unintended conversion.

Copilot uses AI. Check for mistakes.
self._attr_precision = self._get_precision()
self._attr_hvac_modes = [
_CLIMATE_MODES.from_esphome(mode) for mode in static_info.supported_modes
Expand Down
10 changes: 10 additions & 0 deletions homeassistant/components/esphome/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

from typing import Final

from aioesphomeapi import TemperatureUnit
from awesomeversion import AwesomeVersion

from homeassistant.const import UnitOfTemperature

DOMAIN = "esphome"

CONF_ALLOW_SERVICE_CALLS = "allow_service_calls"
Expand All @@ -30,3 +33,10 @@

WAKE_WORDS_DIR_NAME = "custom_wake_words"
WAKE_WORDS_API_PATH = "/api/esphome/wake_words"

TEMPERATURE_UNIT_MAP: dict[TemperatureUnit | None, UnitOfTemperature] = {
None: UnitOfTemperature.CELSIUS,
TemperatureUnit.CELSIUS: UnitOfTemperature.CELSIUS,
TemperatureUnit.FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
TemperatureUnit.KELVIN: UnitOfTemperature.KELVIN,
}
5 changes: 3 additions & 2 deletions homeassistant/components/esphome/water_heater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
WaterHeaterEntity,
WaterHeaterEntityFeature,
)
from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS
from homeassistant.core import callback

from .const import TEMPERATURE_UNIT_MAP
from .entity import (
EsphomeEntity,
convert_api_error_ha_error,
Expand Down Expand Up @@ -51,14 +52,14 @@ class EsphomeWaterHeater(
):
"""A water heater implementation for ESPHome."""

_attr_temperature_unit = UnitOfTemperature.CELSIUS
_attr_precision = PRECISION_TENTHS

@callback
def _on_static_info_update(self, static_info: EntityInfo) -> None:
"""Set attrs from static info."""
super()._on_static_info_update(static_info)
static_info = self._static_info
self._attr_temperature_unit = TEMPERATURE_UNIT_MAP[static_info.temperature_unit]
Copy link

Copilot AI Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add test coverage that sets temperature_unit in WaterHeaterInfo (e.g., Fahrenheit) and asserts the entity exposes the correct temperature unit and that async_set_temperature forwards the intended value in that unit.

Copilot uses AI. Check for mistakes.
Comment thread
jhenkens marked this conversation as resolved.
Outdated
self._attr_min_temp = static_info.min_temperature
self._attr_max_temp = static_info.max_temperature
self._attr_target_temperature_step = static_info.target_temperature_step
Expand Down
40 changes: 39 additions & 1 deletion tests/components/esphome/test_climate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
ClimatePreset,
ClimateState,
ClimateSwingMode,
TemperatureUnit,
)
import pytest
from syrupy.assertion import SnapshotAssertion
Expand All @@ -30,6 +31,7 @@
ATTR_TARGET_TEMP_HIGH,
ATTR_TARGET_TEMP_LOW,
ATTR_TEMPERATURE,
DATA_COMPONENT,
DOMAIN as CLIMATE_DOMAIN,
FAN_HIGH,
SERVICE_SET_FAN_MODE,
Expand All @@ -41,7 +43,7 @@
SWING_BOTH,
HVACMode,
)
from homeassistant.const import ATTR_ENTITY_ID
from homeassistant.const import ATTR_ENTITY_ID, UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError

Expand Down Expand Up @@ -685,3 +687,39 @@ async def test_climate_entity_attribute_current_temperature_unsupported(
state = hass.states.get("climate.test_my_climate")
assert state is not None
assert state.attributes[ATTR_CURRENT_TEMPERATURE] is None


@pytest.mark.parametrize(
("temperature_unit", "expected_unit"),
[
(TemperatureUnit.CELSIUS, UnitOfTemperature.CELSIUS),
(TemperatureUnit.FAHRENHEIT, UnitOfTemperature.FAHRENHEIT),
(TemperatureUnit.KELVIN, UnitOfTemperature.KELVIN),
],
)
async def test_climate_entity_temperature_unit(
hass: HomeAssistant,
mock_client: APIClient,
mock_generic_device_entry: MockGenericDeviceEntryType,
temperature_unit: TemperatureUnit,
expected_unit: UnitOfTemperature,
) -> None:
"""Test that the temperature unit is passed through correctly."""
entity_info = [
ClimateInfo(
object_id="myclimate",
key=1,
name="my climate",
temperature_unit=temperature_unit,
)
]
states = [ClimateState(key=1, mode=ClimateMode.COOL, target_temperature=22)]
await mock_generic_device_entry(
mock_client=mock_client,
entity_info=entity_info,
states=states,
)
assert hass.states.get("climate.test_my_climate") is not None
entity = hass.data[DATA_COMPONENT].get_entity("climate.test_my_climate")
assert entity is not None
assert entity.temperature_unit == expected_unit
40 changes: 40 additions & 0 deletions tests/components/esphome/test_water_heater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from aioesphomeapi import (
APIClient,
TemperatureUnit,
WaterHeaterFeature,
WaterHeaterInfo,
WaterHeaterMode,
Expand All @@ -15,6 +16,7 @@
from homeassistant.components.water_heater import (
ATTR_AWAY_MODE,
ATTR_OPERATION_LIST,
DATA_COMPONENT,
DOMAIN as WATER_HEATER_DOMAIN,
SERVICE_SET_AWAY_MODE,
SERVICE_SET_OPERATION_MODE,
Expand All @@ -27,6 +29,7 @@
ATTR_ENTITY_ID,
ATTR_SUPPORTED_FEATURES,
ATTR_TEMPERATURE,
UnitOfTemperature
)
from homeassistant.core import HomeAssistant

Expand Down Expand Up @@ -462,3 +465,40 @@ async def test_water_heater_set_away_mode(
mock_client.water_heater_command.assert_has_calls(
[call(key=1, away=away_mode, device_id=0)]
)

@pytest.mark.parametrize(
("temperature_unit", "expected_unit"),
[
(TemperatureUnit.CELSIUS, UnitOfTemperature.CELSIUS),
(TemperatureUnit.FAHRENHEIT, UnitOfTemperature.FAHRENHEIT),
(TemperatureUnit.KELVIN, UnitOfTemperature.KELVIN),
],
)
async def test_water_heater_temperature_unit(
hass: HomeAssistant,
mock_client: APIClient,
mock_generic_device_entry: MockGenericDeviceEntryType,
temperature_unit: TemperatureUnit,
expected_unit: UnitOfTemperature,
) -> None:
"""Test that the temperature unit is passed through correctly."""
entity_info = [
WaterHeaterInfo(
object_id="my_boiler",
key=1,
name="My Boiler",
min_temperature=10.0,
max_temperature=85.0,
temperature_unit=temperature_unit,
)
]
states = [WaterHeaterState(key=1, target_temperature=50.0)]
await mock_generic_device_entry(
mock_client=mock_client,
entity_info=entity_info,
states=states,
)
assert hass.states.get("water_heater.test_my_boiler") is not None
entity = hass.data[DATA_COMPONENT].get_entity("water_heater.test_my_boiler")
assert entity is not None
assert entity.temperature_unit == expected_unit
Loading