jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 10:59:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix _is_valid_suggested_unit in sensor platform (#151912)

Browse Source
This commit is contained in:
epenet
2025-09-08 16:35:33 +02:00
committed by GitHub
parent b7360dfad8
commit 56c865dcfe
3 changed files with 233 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/sensor/__init__.py
View File

@@ -365,7 +365,7 @@ class SensorEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
unit converter supports both the native and the suggested units of measurement.
"""
# Make sure we can convert the units
if (
if self.native_unit_of_measurement != suggested_unit_of_measurement and (
(unit_converter := UNIT_CONVERTERS.get(self.device_class)) is None
or self.__native_unit_of_measurement_compat
not in unit_converter.VALID_UNITS

8
tests/components/sensor/test_init.py
View File

@@ -32,6 +32,7 @@ from homeassistant.components.sensor.const import STATE_CLASS_UNITS, UNIT_CONVER
from homeassistant.config_entries import ConfigEntry, ConfigFlow
from homeassistant.const import (
ATTR_UNIT_OF_MEASUREMENT,
CONCENTRATION_PARTS_PER_MILLION,
PERCENTAGE,
STATE_UNKNOWN,
EntityCategory,
@@ -2938,6 +2939,13 @@ async def test_suggested_unit_guard_invalid_unit(
UnitOfDataRate.BITS_PER_SECOND,
10000,
),
(
SensorDeviceClass.CO2,
CONCENTRATION_PARTS_PER_MILLION,
10,
CONCENTRATION_PARTS_PER_MILLION,
10,
),
],
)
async def test_suggested_unit_guard_valid_unit(

224
tests/components/tuya/snapshots/test_sensor.ambr
View File

@@ -507,6 +507,62 @@
'state': '100.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_carbon_dioxide-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.aqi_carbon_dioxide',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
'sensor.private': dict({
'suggested_unit_of_measurement': 'ppm',
}),
}),
'original_device_class': <SensorDeviceClass.CO2: 'carbon_dioxide'>,
'original_icon': None,
'original_name': 'Carbon dioxide',
'platform': 'tuya',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'carbon_dioxide',
'unique_id': 'tuya.iks13mcaiyie3rryjb2occo2_value',
'unit_of_measurement': 'ppm',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_carbon_dioxide-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'carbon_dioxide',
'friendly_name': 'AQI Carbon dioxide',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'ppm',
}),
'context': <ANY>,
'entity_id': 'sensor.aqi_carbon_dioxide',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '541.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_formaldehyde-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -612,6 +668,62 @@
'state': '53.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_pm2_5-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.aqi_pm2_5',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
'sensor.private': dict({
'suggested_unit_of_measurement': 'μg/m³',
}),
}),
'original_device_class': <SensorDeviceClass.PM25: 'pm25'>,
'original_icon': None,
'original_name': 'PM2.5',
'platform': 'tuya',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'pm25',
'unique_id': 'tuya.iks13mcaiyie3rryjb2ocpm25_value',
'unit_of_measurement': 'μg/m³',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_pm2_5-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'pm25',
'friendly_name': 'AQI PM2.5',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'μg/m³',
}),
'context': <ANY>,
'entity_id': 'sensor.aqi_pm2_5',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '17.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.aqi_temperature-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -8146,6 +8258,62 @@
'state': '42.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.kalado_air_purifier_pm2_5-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.kalado_air_purifier_pm2_5',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
'sensor.private': dict({
'suggested_unit_of_measurement': 'μg/m³',
}),
}),
'original_device_class': <SensorDeviceClass.PM25: 'pm25'>,
'original_icon': None,
'original_name': 'PM2.5',
'platform': 'tuya',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'pm25',
'unique_id': 'tuya.yo2karkjuhzztxsfjkpm25',
'unit_of_measurement': 'μg/m³',
})
# ---
# name: test_platform_setup_and_discovery[sensor.kalado_air_purifier_pm2_5-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'pm25',
'friendly_name': 'Kalado Air Purifier PM2.5',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'μg/m³',
}),
'context': <ANY>,
'entity_id': 'sensor.kalado_air_purifier_pm2_5',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '3.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.keller_current-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -13310,6 +13478,62 @@
'state': '97.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.smogo_carbon_monoxide-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.smogo_carbon_monoxide',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'options': dict({
'sensor.private': dict({
'suggested_unit_of_measurement': 'ppm',
}),
}),
'original_device_class': <SensorDeviceClass.CO: 'carbon_monoxide'>,
'original_icon': None,
'original_name': 'Carbon monoxide',
'platform': 'tuya',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'carbon_monoxide',
'unique_id': 'tuya.swhtzki3qrz5ydchjbocco_value',
'unit_of_measurement': 'ppm',
})
# ---
# name: test_platform_setup_and_discovery[sensor.smogo_carbon_monoxide-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'carbon_monoxide',
'friendly_name': 'Smogo Carbon monoxide',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'ppm',
}),
'context': <ANY>,
'entity_id': 'sensor.smogo_carbon_monoxide',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '0.0',
})
# ---
# name: test_platform_setup_and_discovery[sensor.smoke_alarm_battery-entry]
EntityRegistryEntrySnapshot({
'aliases': set({