jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 15:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve type hint in fibaro climate entity (#77153)

Browse Source
This commit is contained in:
epenet 2022-08-26 10:52:57 +02:00 committed by GitHub
parent 79bdc02829
commit c840026198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
homeassistant/components/fibaro/climate.py
View File

@ -121,15 +121,12 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
def __init__(self, fibaro_device): def __init__(self, fibaro_device):
"""Initialize the Fibaro device.""" """Initialize the Fibaro device."""
super().__init__(fibaro_device) super().__init__(fibaro_device)
self._temp_sensor_device = None self._temp_sensor_device: FibaroDevice | None = None
self._target_temp_device = None self._target_temp_device: FibaroDevice | None = None
self._op_mode_device = None self._op_mode_device: FibaroDevice | None = None
self._fan_mode_device = None self._fan_mode_device: FibaroDevice | None = None
self._support_flags = 0 self._attr_supported_features = 0
self.entity_id = ENTITY_ID_FORMAT.format(self.ha_id) self.entity_id = ENTITY_ID_FORMAT.format(self.ha_id)
self._hvac_support = []
self._preset_support = []
self._fan_support = []
siblings = fibaro_device.fibaro_controller.get_siblings(fibaro_device) siblings = fibaro_device.fibaro_controller.get_siblings(fibaro_device)
_LOGGER.debug("%s siblings: %s", fibaro_device.ha_id, siblings) _LOGGER.debug("%s siblings: %s", fibaro_device.ha_id, siblings)
@ -158,34 +155,38 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
or "setHeatingThermostatSetpoint" in device.actions or "setHeatingThermostatSetpoint" in device.actions
): ):
self._target_temp_device = FibaroDevice(device) self._target_temp_device = FibaroDevice(device)
self._support_flags |= ClimateEntityFeature.TARGET_TEMPERATURE self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
tempunit = device.properties.unit tempunit = device.properties.unit
if "setMode" in device.actions or "setOperatingMode" in device.actions: if "setMode" in device.actions or "setOperatingMode" in device.actions:
self._op_mode_device = FibaroDevice(device) self._op_mode_device = FibaroDevice(device)
self._support_flags |= ClimateEntityFeature.PRESET_MODE self._attr_supported_features |= ClimateEntityFeature.PRESET_MODE
if "setFanMode" in device.actions: if "setFanMode" in device.actions:
self._fan_mode_device = FibaroDevice(device) self._fan_mode_device = FibaroDevice(device)
self._support_flags |= ClimateEntityFeature.FAN_MODE self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
if tempunit == "F": if tempunit == "F":
self._unit_of_temp = TEMP_FAHRENHEIT self._attr_temperature_unit = TEMP_FAHRENHEIT
else: else:
self._unit_of_temp = TEMP_CELSIUS self._attr_temperature_unit = TEMP_CELSIUS
if self._fan_mode_device: if self._fan_mode_device:
fan_modes = ( fan_modes = (
self._fan_mode_device.fibaro_device.properties.supportedModes.split(",") self._fan_mode_device.fibaro_device.properties.supportedModes.split(",")
) )
self._attr_fan_modes = []
for mode in fan_modes: for mode in fan_modes:
mode = int(mode) mode = int(mode)
if mode not in FANMODES: if mode not in FANMODES:
_LOGGER.warning("%d unknown fan mode", mode) _LOGGER.warning("%d unknown fan mode", mode)
continue continue
self._fan_support.append(FANMODES[int(mode)]) self._attr_fan_modes.append(FANMODES[int(mode)])
self._attr_hvac_modes = [HVACMode.AUTO] # default
if self._op_mode_device: if self._op_mode_device:
self._attr_preset_modes = []
self._attr_hvac_modes = []
prop = self._op_mode_device.fibaro_device.properties prop = self._op_mode_device.fibaro_device.properties
if "supportedOperatingModes" in prop: if "supportedOperatingModes" in prop:
op_modes = prop.supportedOperatingModes.split(",") op_modes = prop.supportedOperatingModes.split(",")
@ -195,10 +196,10 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
mode = int(mode) mode = int(mode)
if mode in OPMODES_HVAC: if mode in OPMODES_HVAC:
mode_ha = OPMODES_HVAC[mode] mode_ha = OPMODES_HVAC[mode]
if mode_ha not in self._hvac_support: if mode_ha not in self._attr_hvac_modes:
self._hvac_support.append(mode_ha) self._attr_hvac_modes.append(mode_ha)
if mode in OPMODES_PRESET: if mode in OPMODES_PRESET:
self._preset_support.append(OPMODES_PRESET[mode]) self._attr_preset_modes.append(OPMODES_PRESET[mode])
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:
"""Call when entity is added to hass.""" """Call when entity is added to hass."""
@ -223,19 +224,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
self.controller.register(device.id, self._update_callback) self.controller.register(device.id, self._update_callback)
@property @property
def supported_features(self): def fan_mode(self) -> str | None:
"""Return the list of supported features."""
return self._support_flags
@property
def fan_modes(self):
"""Return the list of available fan modes."""
if not self._fan_mode_device:
return None
return self._fan_support
@property
def fan_mode(self):
"""Return the fan setting.""" """Return the fan setting."""
if not self._fan_mode_device: if not self._fan_mode_device:
return None return None
@ -249,7 +238,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
self._fan_mode_device.action("setFanMode", HA_FANMODES[fan_mode]) self._fan_mode_device.action("setFanMode", HA_FANMODES[fan_mode])
@property @property
def fibaro_op_mode(self): def fibaro_op_mode(self) -> int:
"""Return the operating mode of the device.""" """Return the operating mode of the device."""
if not self._op_mode_device: if not self._op_mode_device:
return 3 # Default to AUTO return 3 # Default to AUTO
@ -260,17 +249,10 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
return int(self._op_mode_device.fibaro_device.properties.mode) return int(self._op_mode_device.fibaro_device.properties.mode)
@property @property
def hvac_mode(self): def hvac_mode(self) -> HVACMode:
"""Return current operation ie. heat, cool, idle.""" """Return current operation ie. heat, cool, idle."""
return OPMODES_HVAC[self.fibaro_op_mode] return OPMODES_HVAC[self.fibaro_op_mode]
@property
def hvac_modes(self):
"""Return the list of available operation modes."""
if not self._op_mode_device:
return [HVACMode.AUTO] # Default to this
return self._hvac_support
def set_hvac_mode(self, hvac_mode: HVACMode) -> None: def set_hvac_mode(self, hvac_mode: HVACMode) -> None:
"""Set new target operation mode.""" """Set new target operation mode."""
if not self._op_mode_device: if not self._op_mode_device:
@ -284,7 +266,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
self._op_mode_device.action("setMode", HA_OPMODES_HVAC[hvac_mode]) self._op_mode_device.action("setMode", HA_OPMODES_HVAC[hvac_mode])
@property @property
def preset_mode(self): def preset_mode(self) -> str | None:
"""Return the current preset mode, e.g., home, away, temp. """Return the current preset mode, e.g., home, away, temp.
Requires ClimateEntityFeature.PRESET_MODE. Requires ClimateEntityFeature.PRESET_MODE.
@ -301,16 +283,6 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
return None return None
return OPMODES_PRESET[mode] return OPMODES_PRESET[mode]
@property
def preset_modes(self):
"""Return a list of available preset modes.
Requires ClimateEntityFeature.PRESET_MODE.
"""
if not self._op_mode_device:
return None
return self._preset_support
def set_preset_mode(self, preset_mode: str) -> None: def set_preset_mode(self, preset_mode: str) -> None:
"""Set new preset mode.""" """Set new preset mode."""
if self._op_mode_device is None: if self._op_mode_device is None:
@ -323,12 +295,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
self._op_mode_device.action("setMode", HA_OPMODES_PRESET[preset_mode]) self._op_mode_device.action("setMode", HA_OPMODES_PRESET[preset_mode])
@property @property
def temperature_unit(self): def current_temperature(self) -> float | None:
"""Return the unit of measurement."""
return self._unit_of_temp
@property
def current_temperature(self):
"""Return the current temperature.""" """Return the current temperature."""
if self._temp_sensor_device: if self._temp_sensor_device:
device = self._temp_sensor_device.fibaro_device device = self._temp_sensor_device.fibaro_device
@ -338,7 +305,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
return None return None
@property @property
def target_temperature(self): def target_temperature(self) -> float | None:
"""Return the temperature we try to reach.""" """Return the temperature we try to reach."""
if self._target_temp_device: if self._target_temp_device:
device = self._target_temp_device.fibaro_device device = self._target_temp_device.fibaro_device
@ -351,7 +318,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
"""Set new target temperatures.""" """Set new target temperatures."""
temperature = kwargs.get(ATTR_TEMPERATURE) temperature = kwargs.get(ATTR_TEMPERATURE)
target = self._target_temp_device target = self._target_temp_device
if temperature is not None: if target is not None and temperature is not None:
if "setThermostatSetpoint" in target.fibaro_device.actions: if "setThermostatSetpoint" in target.fibaro_device.actions:
target.action("setThermostatSetpoint", self.fibaro_op_mode, temperature) target.action("setThermostatSetpoint", self.fibaro_op_mode, temperature)
elif "setHeatingThermostatSetpoint" in target.fibaro_device.actions: elif "setHeatingThermostatSetpoint" in target.fibaro_device.actions: