mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Warn when lights violate color mode rules (#110336)
* Warn when lights violate color mode rules * Update test * Remove redundant warning, add tests * Improve test coverage
This commit is contained in:
parent
8de038527f
commit
1764c031df
@ -882,6 +882,8 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
_attr_supported_features: LightEntityFeature = LightEntityFeature(0)
|
_attr_supported_features: LightEntityFeature = LightEntityFeature(0)
|
||||||
_attr_xy_color: tuple[float, float] | None = None
|
_attr_xy_color: tuple[float, float] | None = None
|
||||||
|
|
||||||
|
__color_mode_reported = False
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def brightness(self) -> int | None:
|
def brightness(self) -> int | None:
|
||||||
"""Return the brightness of this light between 0..255."""
|
"""Return the brightness of this light between 0..255."""
|
||||||
@ -897,7 +899,20 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
"""Return the color mode of the light with backwards compatibility."""
|
"""Return the color mode of the light with backwards compatibility."""
|
||||||
if (color_mode := self.color_mode) is None:
|
if (color_mode := self.color_mode) is None:
|
||||||
# Backwards compatibility for color_mode added in 2021.4
|
# Backwards compatibility for color_mode added in 2021.4
|
||||||
# Add warning in 2024.3, remove in 2025.3
|
# Warning added in 2024.3, break in 2025.3
|
||||||
|
if not self.__color_mode_reported and self.__should_report_light_issue():
|
||||||
|
self.__color_mode_reported = True
|
||||||
|
report_issue = self._suggest_report_issue()
|
||||||
|
_LOGGER.warning(
|
||||||
|
(
|
||||||
|
"%s (%s) does not report a color mode, this will stop working "
|
||||||
|
"in Home Assistant Core 2025.3, please %s"
|
||||||
|
),
|
||||||
|
self.entity_id,
|
||||||
|
type(self),
|
||||||
|
report_issue,
|
||||||
|
)
|
||||||
|
|
||||||
supported = self._light_internal_supported_color_modes
|
supported = self._light_internal_supported_color_modes
|
||||||
|
|
||||||
if ColorMode.HS in supported and self.hs_color is not None:
|
if ColorMode.HS in supported and self.hs_color is not None:
|
||||||
@ -1068,8 +1083,8 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
effect: str | None,
|
effect: str | None,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Validate the color mode."""
|
"""Validate the color mode."""
|
||||||
if color_mode is None:
|
if color_mode is None or color_mode == ColorMode.UNKNOWN:
|
||||||
# The light is turned off
|
# The light is turned off or in an unknown state
|
||||||
return
|
return
|
||||||
|
|
||||||
if not effect or effect == EFFECT_OFF:
|
if not effect or effect == EFFECT_OFF:
|
||||||
@ -1077,12 +1092,21 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
# color modes
|
# color modes
|
||||||
if color_mode in supported_color_modes:
|
if color_mode in supported_color_modes:
|
||||||
return
|
return
|
||||||
# Increase severity to warning in 2024.3, reject in 2025.3
|
# Warning added in 2024.3, reject in 2025.3
|
||||||
_LOGGER.debug(
|
if not self.__color_mode_reported and self.__should_report_light_issue():
|
||||||
"%s: set to unsupported color_mode: %s, supported_color_modes: %s",
|
self.__color_mode_reported = True
|
||||||
|
report_issue = self._suggest_report_issue()
|
||||||
|
_LOGGER.warning(
|
||||||
|
(
|
||||||
|
"%s (%s) set to unsupported color mode %s, expected one of %s, "
|
||||||
|
"this will stop working in Home Assistant Core 2025.3, "
|
||||||
|
"please %s"
|
||||||
|
),
|
||||||
self.entity_id,
|
self.entity_id,
|
||||||
|
type(self),
|
||||||
color_mode,
|
color_mode,
|
||||||
supported_color_modes,
|
supported_color_modes,
|
||||||
|
report_issue,
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -1097,15 +1121,50 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
if color_mode in effect_color_modes:
|
if color_mode in effect_color_modes:
|
||||||
return
|
return
|
||||||
|
|
||||||
# Increase severity to warning in 2024.3, reject in 2025.3
|
# Warning added in 2024.3, reject in 2025.3
|
||||||
_LOGGER.debug(
|
if not self.__color_mode_reported and self.__should_report_light_issue():
|
||||||
"%s: set to unsupported color_mode: %s, supported for effect: %s",
|
self.__color_mode_reported = True
|
||||||
|
report_issue = self._suggest_report_issue()
|
||||||
|
_LOGGER.warning(
|
||||||
|
(
|
||||||
|
"%s (%s) set to unsupported color mode %s when rendering an effect,"
|
||||||
|
" expected one of %s, this will stop working in Home Assistant "
|
||||||
|
"Core 2025.3, please %s"
|
||||||
|
),
|
||||||
self.entity_id,
|
self.entity_id,
|
||||||
|
type(self),
|
||||||
color_mode,
|
color_mode,
|
||||||
effect_color_modes,
|
effect_color_modes,
|
||||||
|
report_issue,
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
def __validate_supported_color_modes(
|
||||||
|
self,
|
||||||
|
supported_color_modes: set[ColorMode] | set[str],
|
||||||
|
) -> None:
|
||||||
|
"""Validate the supported color modes."""
|
||||||
|
if self.__color_mode_reported:
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
valid_supported_color_modes(supported_color_modes)
|
||||||
|
except vol.Error:
|
||||||
|
# Warning added in 2024.3, reject in 2025.3
|
||||||
|
if not self.__color_mode_reported and self.__should_report_light_issue():
|
||||||
|
self.__color_mode_reported = True
|
||||||
|
report_issue = self._suggest_report_issue()
|
||||||
|
_LOGGER.warning(
|
||||||
|
(
|
||||||
|
"%s (%s) sets invalid supported color modes %s, this will stop "
|
||||||
|
"working in Home Assistant Core 2025.3, please %s"
|
||||||
|
),
|
||||||
|
self.entity_id,
|
||||||
|
type(self),
|
||||||
|
supported_color_modes,
|
||||||
|
report_issue,
|
||||||
|
)
|
||||||
|
|
||||||
@final
|
@final
|
||||||
@property
|
@property
|
||||||
def state_attributes(self) -> dict[str, Any] | None:
|
def state_attributes(self) -> dict[str, Any] | None:
|
||||||
@ -1137,7 +1196,7 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
data[ATTR_BRIGHTNESS] = None
|
data[ATTR_BRIGHTNESS] = None
|
||||||
elif supported_features_value & SUPPORT_BRIGHTNESS:
|
elif supported_features_value & SUPPORT_BRIGHTNESS:
|
||||||
# Backwards compatibility for ambiguous / incomplete states
|
# Backwards compatibility for ambiguous / incomplete states
|
||||||
# Add warning in 2024.3, remove in 2025.3
|
# Warning is printed by supported_features_compat, remove in 2025.1
|
||||||
if _is_on:
|
if _is_on:
|
||||||
data[ATTR_BRIGHTNESS] = self.brightness
|
data[ATTR_BRIGHTNESS] = self.brightness
|
||||||
else:
|
else:
|
||||||
@ -1158,7 +1217,7 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
data[ATTR_COLOR_TEMP] = None
|
data[ATTR_COLOR_TEMP] = None
|
||||||
elif supported_features_value & SUPPORT_COLOR_TEMP:
|
elif supported_features_value & SUPPORT_COLOR_TEMP:
|
||||||
# Backwards compatibility
|
# Backwards compatibility
|
||||||
# Add warning in 2024.3, remove in 2025.3
|
# Warning is printed by supported_features_compat, remove in 2025.1
|
||||||
if _is_on:
|
if _is_on:
|
||||||
color_temp_kelvin = self.color_temp_kelvin
|
color_temp_kelvin = self.color_temp_kelvin
|
||||||
data[ATTR_COLOR_TEMP_KELVIN] = color_temp_kelvin
|
data[ATTR_COLOR_TEMP_KELVIN] = color_temp_kelvin
|
||||||
@ -1191,10 +1250,23 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
def _light_internal_supported_color_modes(self) -> set[ColorMode] | set[str]:
|
def _light_internal_supported_color_modes(self) -> set[ColorMode] | set[str]:
|
||||||
"""Calculate supported color modes with backwards compatibility."""
|
"""Calculate supported color modes with backwards compatibility."""
|
||||||
if (_supported_color_modes := self.supported_color_modes) is not None:
|
if (_supported_color_modes := self.supported_color_modes) is not None:
|
||||||
|
self.__validate_supported_color_modes(_supported_color_modes)
|
||||||
return _supported_color_modes
|
return _supported_color_modes
|
||||||
|
|
||||||
# Backwards compatibility for supported_color_modes added in 2021.4
|
# Backwards compatibility for supported_color_modes added in 2021.4
|
||||||
# Add warning in 2024.3, remove in 2025.3
|
# Warning added in 2024.3, remove in 2025.3
|
||||||
|
if not self.__color_mode_reported and self.__should_report_light_issue():
|
||||||
|
self.__color_mode_reported = True
|
||||||
|
report_issue = self._suggest_report_issue()
|
||||||
|
_LOGGER.warning(
|
||||||
|
(
|
||||||
|
"%s (%s) does not set supported color modes, this will stop working"
|
||||||
|
" in Home Assistant Core 2025.3, please %s"
|
||||||
|
),
|
||||||
|
self.entity_id,
|
||||||
|
type(self),
|
||||||
|
report_issue,
|
||||||
|
)
|
||||||
supported_features = self.supported_features_compat
|
supported_features = self.supported_features_compat
|
||||||
supported_features_value = supported_features.value
|
supported_features_value = supported_features.value
|
||||||
supported_color_modes: set[ColorMode] = set()
|
supported_color_modes: set[ColorMode] = set()
|
||||||
@ -1251,3 +1323,10 @@ class LightEntity(ToggleEntity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
|
|||||||
report_issue,
|
report_issue,
|
||||||
)
|
)
|
||||||
return new_features
|
return new_features
|
||||||
|
|
||||||
|
def __should_report_light_issue(self) -> bool:
|
||||||
|
"""Return if light color mode issues should be reported."""
|
||||||
|
if not self.platform:
|
||||||
|
return True
|
||||||
|
# philips_js and zha have known issues, we don't need users to open issues
|
||||||
|
return self.platform.platform_name not in {"philips_js", "zha"}
|
||||||
|
@ -21,7 +21,7 @@ from homeassistant.exceptions import HomeAssistantError, Unauthorized
|
|||||||
from homeassistant.setup import async_setup_component
|
from homeassistant.setup import async_setup_component
|
||||||
import homeassistant.util.color as color_util
|
import homeassistant.util.color as color_util
|
||||||
|
|
||||||
from tests.common import MockUser, async_mock_service
|
from tests.common import MockEntityPlatform, MockUser, async_mock_service
|
||||||
|
|
||||||
orig_Profiles = light.Profiles
|
orig_Profiles = light.Profiles
|
||||||
|
|
||||||
@ -2657,6 +2657,62 @@ def test_deprecated_supported_features_ints(caplog: pytest.LogCaptureFixture) ->
|
|||||||
assert "is using deprecated supported features values" not in caplog.text
|
assert "is using deprecated supported features values" not in caplog.text
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
("color_mode", "supported_color_modes", "warning_expected"),
|
||||||
|
[
|
||||||
|
(None, {light.ColorMode.ONOFF}, True),
|
||||||
|
(light.ColorMode.ONOFF, {light.ColorMode.ONOFF}, False),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_report_no_color_mode(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
caplog: pytest.LogCaptureFixture,
|
||||||
|
color_mode: str,
|
||||||
|
supported_color_modes: set[str],
|
||||||
|
warning_expected: bool,
|
||||||
|
) -> None:
|
||||||
|
"""Test a light setting no color mode."""
|
||||||
|
|
||||||
|
class MockLightEntityEntity(light.LightEntity):
|
||||||
|
_attr_color_mode = color_mode
|
||||||
|
_attr_is_on = True
|
||||||
|
_attr_supported_features = light.LightEntityFeature.EFFECT
|
||||||
|
_attr_supported_color_modes = supported_color_modes
|
||||||
|
|
||||||
|
entity = MockLightEntityEntity()
|
||||||
|
entity._async_calculate_state()
|
||||||
|
expected_warning = "does not report a color mode"
|
||||||
|
assert (expected_warning in caplog.text) is warning_expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
("color_mode", "supported_color_modes", "warning_expected"),
|
||||||
|
[
|
||||||
|
(light.ColorMode.ONOFF, None, True),
|
||||||
|
(light.ColorMode.ONOFF, {light.ColorMode.ONOFF}, False),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_report_no_color_modes(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
caplog: pytest.LogCaptureFixture,
|
||||||
|
color_mode: str,
|
||||||
|
supported_color_modes: set[str],
|
||||||
|
warning_expected: bool,
|
||||||
|
) -> None:
|
||||||
|
"""Test a light setting no color mode."""
|
||||||
|
|
||||||
|
class MockLightEntityEntity(light.LightEntity):
|
||||||
|
_attr_color_mode = color_mode
|
||||||
|
_attr_is_on = True
|
||||||
|
_attr_supported_features = light.LightEntityFeature.EFFECT
|
||||||
|
_attr_supported_color_modes = supported_color_modes
|
||||||
|
|
||||||
|
entity = MockLightEntityEntity()
|
||||||
|
entity._async_calculate_state()
|
||||||
|
expected_warning = "does not set supported color modes"
|
||||||
|
assert (expected_warning in caplog.text) is warning_expected
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
("color_mode", "supported_color_modes", "effect", "warning_expected"),
|
("color_mode", "supported_color_modes", "effect", "warning_expected"),
|
||||||
[
|
[
|
||||||
@ -2701,5 +2757,63 @@ def test_report_invalid_color_mode(
|
|||||||
|
|
||||||
entity = MockLightEntityEntity()
|
entity = MockLightEntityEntity()
|
||||||
entity._async_calculate_state()
|
entity._async_calculate_state()
|
||||||
expected_warning = f"set to unsupported color_mode: {color_mode}"
|
expected_warning = f"set to unsupported color mode {color_mode}"
|
||||||
|
assert (expected_warning in caplog.text) is warning_expected
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
("color_mode", "supported_color_modes", "platform_name", "warning_expected"),
|
||||||
|
[
|
||||||
|
(
|
||||||
|
light.ColorMode.ONOFF,
|
||||||
|
{light.ColorMode.ONOFF},
|
||||||
|
"test",
|
||||||
|
False,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
light.ColorMode.ONOFF,
|
||||||
|
{light.ColorMode.ONOFF, light.ColorMode.BRIGHTNESS},
|
||||||
|
"test",
|
||||||
|
True,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
light.ColorMode.HS,
|
||||||
|
{light.ColorMode.HS, light.ColorMode.BRIGHTNESS},
|
||||||
|
"test",
|
||||||
|
True,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
light.ColorMode.HS,
|
||||||
|
{light.ColorMode.COLOR_TEMP, light.ColorMode.HS},
|
||||||
|
"test",
|
||||||
|
False,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
light.ColorMode.ONOFF,
|
||||||
|
{light.ColorMode.ONOFF, light.ColorMode.BRIGHTNESS},
|
||||||
|
"zha", # We don't log issues for zha
|
||||||
|
False,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_report_invalid_color_modes(
|
||||||
|
hass: HomeAssistant,
|
||||||
|
caplog: pytest.LogCaptureFixture,
|
||||||
|
color_mode: str,
|
||||||
|
supported_color_modes: set[str],
|
||||||
|
platform_name: str,
|
||||||
|
warning_expected: bool,
|
||||||
|
) -> None:
|
||||||
|
"""Test a light setting an invalid color mode."""
|
||||||
|
|
||||||
|
class MockLightEntityEntity(light.LightEntity):
|
||||||
|
_attr_color_mode = color_mode
|
||||||
|
_attr_is_on = True
|
||||||
|
_attr_supported_features = light.LightEntityFeature.EFFECT
|
||||||
|
_attr_supported_color_modes = supported_color_modes
|
||||||
|
platform = MockEntityPlatform(hass, platform_name=platform_name)
|
||||||
|
|
||||||
|
entity = MockLightEntityEntity()
|
||||||
|
entity._async_calculate_state()
|
||||||
|
expected_warning = "sets invalid supported color modes"
|
||||||
assert (expected_warning in caplog.text) is warning_expected
|
assert (expected_warning in caplog.text) is warning_expected
|
||||||
|
Loading…
x
Reference in New Issue
Block a user