ha(H3): ниты повторного ревью — пустой диапазон, merge значений, чистка
- R1: config flow отклоняет пустое пересечение override и таблицы (достижимый диапазон), + тест - R2: async_sync_now перечитывает снимок без await (события не затираются) - R3: translation_key климата убран (FglairEntity принимает None) - R4: caps==0 «не сообщено» покрыт тестом - R5: SWING_HORIZONTAL_MODES удалён (общий SWING_MODES)
This commit is contained in:
@@ -30,7 +30,6 @@ from .const import (
|
|||||||
PRESET_CAP,
|
PRESET_CAP,
|
||||||
PRESET_ECO,
|
PRESET_ECO,
|
||||||
PRESET_PROP,
|
PRESET_PROP,
|
||||||
SWING_HORIZONTAL_MODES,
|
|
||||||
SWING_MODES,
|
SWING_MODES,
|
||||||
)
|
)
|
||||||
from .coordinator import FglairCoordinator, FglairRuntime
|
from .coordinator import FglairCoordinator, FglairRuntime
|
||||||
@@ -47,7 +46,8 @@ class FglairClimate(FglairEntity, ClimateEntity):
|
|||||||
_attr_temperature_unit = UnitOfTemperature.CELSIUS
|
_attr_temperature_unit = UnitOfTemperature.CELSIUS
|
||||||
|
|
||||||
def __init__(self, coordinator: FglairCoordinator) -> None:
|
def __init__(self, coordinator: FglairCoordinator) -> None:
|
||||||
super().__init__(coordinator, "climate", "climate")
|
# translation_key не нужен: имя = имя устройства (has_entity_name).
|
||||||
|
super().__init__(coordinator, "climate", None)
|
||||||
self._last_hvac_mode: Optional[HVACMode] = None
|
self._last_hvac_mode: Optional[HVACMode] = None
|
||||||
|
|
||||||
# -- свойства шаблона --------------------------------------------------
|
# -- свойства шаблона --------------------------------------------------
|
||||||
@@ -186,11 +186,7 @@ class FglairClimate(FglairEntity, ClimateEntity):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def swing_horizontal_modes(self) -> Optional[list[str]]:
|
def swing_horizontal_modes(self) -> Optional[list[str]]:
|
||||||
return (
|
return SWING_MODES if self._horizontal_swing_supported() else None
|
||||||
SWING_HORIZONTAL_MODES
|
|
||||||
if self._horizontal_swing_supported()
|
|
||||||
else None
|
|
||||||
)
|
|
||||||
|
|
||||||
# -- команды ----------------------------------------------------------
|
# -- команды ----------------------------------------------------------
|
||||||
async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
|
async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ from .const import (
|
|||||||
TRIAL_ERRORS,
|
TRIAL_ERRORS,
|
||||||
TRIAL_TIMEOUT,
|
TRIAL_TIMEOUT,
|
||||||
)
|
)
|
||||||
|
from .overrides import ConversionSet, LinearOverride
|
||||||
from .trial import TrialResult, trial_connect
|
from .trial import TrialResult, trial_connect
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
@@ -408,16 +409,39 @@ class FglairConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
temp_min = int(round(float(user_input[CONF_TEMP_MIN]) * 10))
|
temp_min = int(round(float(user_input[CONF_TEMP_MIN]) * 10))
|
||||||
temp_max = int(round(float(user_input[CONF_TEMP_MAX]) * 10))
|
temp_max = int(round(float(user_input[CONF_TEMP_MAX]) * 10))
|
||||||
step = int(round(float(user_input[CONF_TEMP_STEP]) * 10))
|
step = int(round(float(user_input[CONF_TEMP_STEP]) * 10))
|
||||||
if temp_min >= temp_max:
|
num = int(user_input[CONF_TEMP_NUM])
|
||||||
|
den = int(user_input[CONF_TEMP_DEN])
|
||||||
|
offset = int(user_input[CONF_TEMP_OFFSET])
|
||||||
|
conversions = ConversionSet(
|
||||||
|
template,
|
||||||
|
{
|
||||||
|
Prop.ADJUST_TEMPERATURE: LinearOverride(
|
||||||
|
num=num,
|
||||||
|
den=den,
|
||||||
|
offset=offset,
|
||||||
|
min_value=temp_min,
|
||||||
|
max_value=temp_max,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
step,
|
||||||
|
)
|
||||||
|
bounds = conversions.range(Prop.ADJUST_TEMPERATURE)
|
||||||
|
if (
|
||||||
|
temp_min >= temp_max
|
||||||
|
or bounds is None
|
||||||
|
or bounds[0] >= bounds[1]
|
||||||
|
):
|
||||||
|
# Достижимый диапазон пуст: конверсия выводит таблицу
|
||||||
|
# шаблона за пределы, которые не пересекаются с min/max.
|
||||||
errors["base"] = "invalid_range"
|
errors["base"] = "invalid_range"
|
||||||
else:
|
else:
|
||||||
data[CONF_TEMPLATE] = template.name
|
data[CONF_TEMPLATE] = template.name
|
||||||
data[CONF_TEMP_STEP] = step
|
data[CONF_TEMP_STEP] = step
|
||||||
data[CONF_OVERRIDES] = {
|
data[CONF_OVERRIDES] = {
|
||||||
Prop.ADJUST_TEMPERATURE.name.lower(): {
|
Prop.ADJUST_TEMPERATURE.name.lower(): {
|
||||||
"num": int(user_input[CONF_TEMP_NUM]),
|
"num": num,
|
||||||
"den": int(user_input[CONF_TEMP_DEN]),
|
"den": den,
|
||||||
"offset": int(user_input[CONF_TEMP_OFFSET]),
|
"offset": offset,
|
||||||
"min": temp_min,
|
"min": temp_min,
|
||||||
"max": temp_max,
|
"max": temp_max,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,6 @@ PRESET_CAP = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SWING_MODES = ["off", "on"]
|
SWING_MODES = ["off", "on"]
|
||||||
SWING_HORIZONTAL_MODES = ["off", "on"]
|
|
||||||
|
|
||||||
# switch-свойства: prop -> (translation_key, capability bit | None)
|
# switch-свойства: prop -> (translation_key, capability bit | None)
|
||||||
SWITCH_PROPS: dict[Prop, tuple[str, int | None]] = {
|
SWITCH_PROPS: dict[Prop, tuple[str, int | None]] = {
|
||||||
|
|||||||
@@ -112,15 +112,9 @@ class FglairCoordinator(DataUpdateCoordinator[FglairData]):
|
|||||||
self._async_initial_sync()
|
self._async_initial_sync()
|
||||||
)
|
)
|
||||||
await self._sync_task
|
await self._sync_task
|
||||||
# Снимок создавался до ONLINE: обновляем состояние/доступность из
|
# Снимок создавался до ONLINE: перечитываем его без await (события
|
||||||
# актуального состояния клиента (значения приходят событиями).
|
# не могут вклиниться между чтением и присваиванием).
|
||||||
state = self.client.state
|
self.data = self._snapshot()
|
||||||
self.data = replace(
|
|
||||||
self.data,
|
|
||||||
state=state,
|
|
||||||
last_error=self.client.last_error,
|
|
||||||
available=state in AVAILABLE_STATES,
|
|
||||||
)
|
|
||||||
self.async_set_updated_data(self.data)
|
self.async_set_updated_data(self.data)
|
||||||
|
|
||||||
@callback
|
@callback
|
||||||
|
|||||||
@@ -21,12 +21,13 @@ class FglairEntity(CoordinatorEntity[FglairCoordinator]):
|
|||||||
self,
|
self,
|
||||||
coordinator: FglairCoordinator,
|
coordinator: FglairCoordinator,
|
||||||
unique_suffix: str,
|
unique_suffix: str,
|
||||||
translation_key: str,
|
translation_key: Optional[str],
|
||||||
) -> None:
|
) -> None:
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator)
|
||||||
data = coordinator.client.data
|
data = coordinator.client.data
|
||||||
dsn = data[CONF_DSN]
|
dsn = data[CONF_DSN]
|
||||||
self._attr_unique_id = f"{dsn}_{unique_suffix}"
|
self._attr_unique_id = f"{dsn}_{unique_suffix}"
|
||||||
|
if translation_key is not None:
|
||||||
self._attr_translation_key = translation_key
|
self._attr_translation_key = translation_key
|
||||||
self._attr_device_info = DeviceInfo(
|
self._attr_device_info = DeviceInfo(
|
||||||
identifiers={(DOMAIN, dsn)},
|
identifiers={(DOMAIN, dsn)},
|
||||||
|
|||||||
@@ -157,6 +157,30 @@ async def test_preview_invalid_range(hass: HomeAssistant):
|
|||||||
assert result["type"] == "create_entry"
|
assert result["type"] == "create_entry"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_preview_unreachable_range(hass: HomeAssistant):
|
||||||
|
"""Конверсия выводит таблицу за min/max — пустой достижимый диапазон."""
|
||||||
|
with patch(
|
||||||
|
"custom_components.fglair.config_flow._run_trial",
|
||||||
|
return_value=TRIAL_OK,
|
||||||
|
):
|
||||||
|
result = await _menu(hass)
|
||||||
|
result = await _select(hass, result["flow_id"], "manual")
|
||||||
|
result = await _configure(hass, result["flow_id"], MANUAL_INPUT)
|
||||||
|
result = await _configure(
|
||||||
|
hass,
|
||||||
|
result["flow_id"],
|
||||||
|
{
|
||||||
|
**PREVIEW_INPUT,
|
||||||
|
"temp_min": 30.0,
|
||||||
|
"temp_max": 40.0,
|
||||||
|
"temp_num": 1,
|
||||||
|
"temp_den": 2,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
assert result["type"] == "form"
|
||||||
|
assert result["errors"] == {"base": "invalid_range"}
|
||||||
|
|
||||||
|
|
||||||
async def test_preview_contains_trial_values(hass: HomeAssistant):
|
async def test_preview_contains_trial_values(hass: HomeAssistant):
|
||||||
props = {
|
props = {
|
||||||
Prop.DISPLAY_TEMPERATURE: Value(ValueKind.INT, 200),
|
Prop.DISPLAY_TEMPERATURE: Value(ValueKind.INT, 200),
|
||||||
|
|||||||
@@ -296,3 +296,23 @@ async def test_manual_conversion_applied(
|
|||||||
)
|
)
|
||||||
assert proc.wait_line("CMD SET adjust_temperature=245", 10)
|
assert proc.wait_line("CMD SET adjust_temperature=245", 10)
|
||||||
assert await hass.config_entries.async_unload(entry.entry_id)
|
assert await hass.config_entries.async_unload(entry.entry_id)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_capabilities_zero_is_unknown(
|
||||||
|
hass: HomeAssistant, mock_ac, socket_enabled
|
||||||
|
):
|
||||||
|
"""device_capabilities=0 трактуем как «не сообщено» — режимы не режем."""
|
||||||
|
proc = mock_ac([
|
||||||
|
"--set", "operation_mode=6",
|
||||||
|
"--set", "device_capabilities=0",
|
||||||
|
])
|
||||||
|
entry = await _setup_entry(hass, proc.port)
|
||||||
|
runtime = entry.runtime_data
|
||||||
|
await _wait_for(lambda: runtime.client.state == State.ONLINE)
|
||||||
|
climate_id = _entity_id(hass, "climate", f"{DSN}_climate")
|
||||||
|
await _wait_for(
|
||||||
|
lambda: climate_id and hass.states.get(climate_id) is not None
|
||||||
|
and hass.states.get(climate_id).state == "heat"
|
||||||
|
)
|
||||||
|
assert "heat" in hass.states.get(climate_id).attributes["hvac_modes"]
|
||||||
|
assert await hass.config_entries.async_unload(entry.entry_id)
|
||||||
|
|||||||
Reference in New Issue
Block a user