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

Fix api, button and climate type hints in zha (#73771)

Browse Source 
* Fix zha api type hints

* Fix zha button type hints

* Fix zha climate type hints
This commit is contained in:
epenet 2022-06-22 03:02:08 +02:00 committed by GitHub
parent 21275669d5
commit 6c83ed4c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/zha/api.py
View File

@ -346,7 +346,7 @@ async def websocket_get_groupable_devices(
groupable_devices = [] groupable_devices = []
for device in devices: for device in devices:
entity_refs = zha_gateway.device_registry.get(device.ieee) entity_refs = zha_gateway.device_registry[device.ieee]
for ep_id in device.async_get_groupable_endpoints(): for ep_id in device.async_get_groupable_endpoints():
groupable_devices.append( groupable_devices.append(
{ {
@ -456,6 +456,7 @@ async def websocket_add_group(
group_id: int | None = msg.get(GROUP_ID) group_id: int | None = msg.get(GROUP_ID)
members: list[GroupMember] | None = msg.get(ATTR_MEMBERS) members: list[GroupMember] | None = msg.get(ATTR_MEMBERS)
group = await zha_gateway.async_create_zigpy_group(group_name, members, group_id) group = await zha_gateway.async_create_zigpy_group(group_name, members, group_id)
assert group
connection.send_result(msg[ID], group.group_info) connection.send_result(msg[ID], group.group_info)
@ -559,7 +560,7 @@ async def websocket_reconfigure_node(
"""Reconfigure a ZHA nodes entities by its ieee address.""" """Reconfigure a ZHA nodes entities by its ieee address."""
zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY] zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
ieee: EUI64 = msg[ATTR_IEEE] ieee: EUI64 = msg[ATTR_IEEE]
device: ZHADevice = zha_gateway.get_device(ieee) device: ZHADevice | None = zha_gateway.get_device(ieee)
async def forward_messages(data): async def forward_messages(data):
"""Forward events to websocket.""" """Forward events to websocket."""
@ -577,6 +578,7 @@ async def websocket_reconfigure_node(
connection.subscriptions[msg["id"]] = async_cleanup connection.subscriptions[msg["id"]] = async_cleanup
_LOGGER.debug("Reconfiguring node with ieee_address: %s", ieee) _LOGGER.debug("Reconfiguring node with ieee_address: %s", ieee)
assert device
hass.async_create_task(device.async_configure()) hass.async_create_task(device.async_configure())
@ -905,6 +907,7 @@ async def websocket_bind_group(
group_id: int = msg[GROUP_ID] group_id: int = msg[GROUP_ID]
bindings: list[ClusterBinding] = msg[BINDINGS] bindings: list[ClusterBinding] = msg[BINDINGS]
source_device = zha_gateway.get_device(source_ieee) source_device = zha_gateway.get_device(source_ieee)
assert source_device
await source_device.async_bind_to_group(group_id, bindings) await source_device.async_bind_to_group(group_id, bindings)
@ -927,6 +930,7 @@ async def websocket_unbind_group(
group_id: int = msg[GROUP_ID] group_id: int = msg[GROUP_ID]
bindings: list[ClusterBinding] = msg[BINDINGS] bindings: list[ClusterBinding] = msg[BINDINGS]
source_device = zha_gateway.get_device(source_ieee) source_device = zha_gateway.get_device(source_ieee)
assert source_device
await source_device.async_unbind_from_group(group_id, bindings) await source_device.async_unbind_from_group(group_id, bindings)
@ -941,6 +945,8 @@ async def async_binding_operation(
source_device = zha_gateway.get_device(source_ieee) source_device = zha_gateway.get_device(source_ieee)
target_device = zha_gateway.get_device(target_ieee) target_device = zha_gateway.get_device(target_ieee)
assert source_device
assert target_device
clusters_to_bind = await get_matched_clusters(source_device, target_device) clusters_to_bind = await get_matched_clusters(source_device, target_device)
zdo = source_device.device.zdo zdo = source_device.device.zdo
@ -997,7 +1003,7 @@ async def websocket_get_configuration(
return cv.custom_serializer(schema) return cv.custom_serializer(schema)
data = {"schemas": {}, "data": {}} data: dict[str, dict[str, Any]] = {"schemas": {}, "data": {}}
for section, schema in ZHA_CONFIG_SCHEMAS.items(): for section, schema in ZHA_CONFIG_SCHEMAS.items():
if section == ZHA_ALARM_OPTIONS and not async_cluster_exists( if section == ZHA_ALARM_OPTIONS and not async_cluster_exists(
hass, IasAce.cluster_id hass, IasAce.cluster_id
@ -1084,7 +1090,7 @@ def async_load_api(hass: HomeAssistant) -> None:
"""Remove a node from the network.""" """Remove a node from the network."""
zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY] zha_gateway: ZHAGateway = hass.data[DATA_ZHA][DATA_ZHA_GATEWAY]
ieee: EUI64 = service.data[ATTR_IEEE] ieee: EUI64 = service.data[ATTR_IEEE]
zha_device: ZHADevice = zha_gateway.get_device(ieee) zha_device: ZHADevice | None = zha_gateway.get_device(ieee)
if zha_device is not None and ( if zha_device is not None and (
zha_device.is_coordinator zha_device.is_coordinator
and zha_device.ieee == zha_gateway.application_controller.ieee and zha_device.ieee == zha_gateway.application_controller.ieee

4
homeassistant/components/zha/button.py
View File

@ -59,7 +59,7 @@ async def async_setup_entry(
class ZHAButton(ZhaEntity, ButtonEntity): class ZHAButton(ZhaEntity, ButtonEntity):
"""Defines a ZHA button.""" """Defines a ZHA button."""
_command_name: str = None _command_name: str
def __init__( def __init__(
self, self,
@ -118,7 +118,7 @@ class ZHAIdentifyButton(ZHAButton):
class ZHAAttributeButton(ZhaEntity, ButtonEntity): class ZHAAttributeButton(ZhaEntity, ButtonEntity):
"""Defines a ZHA button, which stes value to an attribute.""" """Defines a ZHA button, which stes value to an attribute."""
_attribute_name: str = None _attribute_name: str
_attribute_value: Any = None _attribute_value: Any = None
def __init__( def __init__(

26
homeassistant/components/zha/climate.py
View File

@ -73,16 +73,16 @@ MULTI_MATCH = functools.partial(ZHA_ENTITIES.multipass_match, Platform.CLIMATE)
RUNNING_MODE = {0x00: HVACMode.OFF, 0x03: HVACMode.COOL, 0x04: HVACMode.HEAT} RUNNING_MODE = {0x00: HVACMode.OFF, 0x03: HVACMode.COOL, 0x04: HVACMode.HEAT}
SEQ_OF_OPERATION = { SEQ_OF_OPERATION = {
0x00: (HVACMode.OFF, HVACMode.COOL), # cooling only 0x00: [HVACMode.OFF, HVACMode.COOL], # cooling only
0x01: (HVACMode.OFF, HVACMode.COOL), # cooling with reheat 0x01: [HVACMode.OFF, HVACMode.COOL], # cooling with reheat
0x02: (HVACMode.OFF, HVACMode.HEAT), # heating only 0x02: [HVACMode.OFF, HVACMode.HEAT], # heating only
0x03: (HVACMode.OFF, HVACMode.HEAT), # heating with reheat 0x03: [HVACMode.OFF, HVACMode.HEAT], # heating with reheat
# cooling and heating 4-pipes # cooling and heating 4-pipes
0x04: (HVACMode.OFF, HVACMode.HEAT_COOL, HVACMode.COOL, HVACMode.HEAT), 0x04: [HVACMode.OFF, HVACMode.HEAT_COOL, HVACMode.COOL, HVACMode.HEAT],
# cooling and heating 4-pipes # cooling and heating 4-pipes
0x05: (HVACMode.OFF, HVACMode.HEAT_COOL, HVACMode.COOL, HVACMode.HEAT), 0x05: [HVACMode.OFF, HVACMode.HEAT_COOL, HVACMode.COOL, HVACMode.HEAT],
0x06: (HVACMode.COOL, HVACMode.HEAT, HVACMode.OFF), # centralite specific 0x06: [HVACMode.COOL, HVACMode.HEAT, HVACMode.OFF], # centralite specific
0x07: (HVACMode.HEAT_COOL, HVACMode.OFF), # centralite specific 0x07: [HVACMode.HEAT_COOL, HVACMode.OFF], # centralite specific
} }
HVAC_MODE_2_SYSTEM = { HVAC_MODE_2_SYSTEM = {
@ -268,7 +268,7 @@ class Thermostat(ZhaEntity, ClimateEntity):
return PRECISION_TENTHS return PRECISION_TENTHS
@property @property
def preset_mode(self) -> str | None: def preset_mode(self) -> str:
"""Return current preset mode.""" """Return current preset mode."""
return self._preset return self._preset
@ -389,7 +389,7 @@ class Thermostat(ZhaEntity, ClimateEntity):
async def async_set_fan_mode(self, fan_mode: str) -> None: async def async_set_fan_mode(self, fan_mode: str) -> None:
"""Set fan mode.""" """Set fan mode."""
if fan_mode not in self.fan_modes: if not self.fan_modes or fan_mode not in self.fan_modes:
self.warning("Unsupported '%s' fan mode", fan_mode) self.warning("Unsupported '%s' fan mode", fan_mode)
return return
@ -415,8 +415,8 @@ class Thermostat(ZhaEntity, ClimateEntity):
async def async_set_preset_mode(self, preset_mode: str) -> None: async def async_set_preset_mode(self, preset_mode: str) -> None:
"""Set new preset mode.""" """Set new preset mode."""
if preset_mode not in self.preset_modes: if not self.preset_modes or preset_mode not in self.preset_modes:
self.debug("preset mode '%s' is not supported", preset_mode) self.debug("Preset mode '%s' is not supported", preset_mode)
return return
if self.preset_mode not in ( if self.preset_mode not in (
@ -505,7 +505,7 @@ class SinopeTechnologiesThermostat(Thermostat):
self._manufacturer_ch = self.cluster_channels["sinope_manufacturer_specific"] self._manufacturer_ch = self.cluster_channels["sinope_manufacturer_specific"]
@property @property
def _rm_rs_action(self) -> str | None: def _rm_rs_action(self) -> HVACAction:
"""Return the current HVAC action based on running mode and running state.""" """Return the current HVAC action based on running mode and running state."""
running_mode = self._thrm.running_mode running_mode = self._thrm.running_mode

9
mypy.ini
View File

@ -2985,15 +2985,6 @@ ignore_errors = true
[mypy-homeassistant.components.xiaomi_miio.switch] [mypy-homeassistant.components.xiaomi_miio.switch]
ignore_errors = true ignore_errors = true
[mypy-homeassistant.components.zha.api]
ignore_errors = true
[mypy-homeassistant.components.zha.button]
ignore_errors = true
[mypy-homeassistant.components.zha.climate]
ignore_errors = true
[mypy-homeassistant.components.zha.core.channels.base] [mypy-homeassistant.components.zha.core.channels.base]
ignore_errors = true ignore_errors = true

3
script/hassfest/mypy_config.py
View File

@ -144,9 +144,6 @@ IGNORED_MODULES: Final[list[str]] = [
"homeassistant.components.xiaomi_miio.light", "homeassistant.components.xiaomi_miio.light",
"homeassistant.components.xiaomi_miio.sensor", "homeassistant.components.xiaomi_miio.sensor",
"homeassistant.components.xiaomi_miio.switch", "homeassistant.components.xiaomi_miio.switch",
"homeassistant.components.zha.api",
"homeassistant.components.zha.button",
"homeassistant.components.zha.climate",
"homeassistant.components.zha.core.channels.base", "homeassistant.components.zha.core.channels.base",
"homeassistant.components.zha.core.channels.homeautomation", "homeassistant.components.zha.core.channels.homeautomation",
"homeassistant.components.zha.core.channels.hvac", "homeassistant.components.zha.core.channels.hvac",