From 54cd0e81838bf750c344e36500edc01651b9e33a Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 27 Aug 2023 05:33:00 -0500 Subject: [PATCH] Add some missing typing to isy994 (#99110) --- homeassistant/components/isy994/binary_sensor.py | 3 ++- homeassistant/components/isy994/button.py | 3 ++- homeassistant/components/isy994/climate.py | 3 ++- homeassistant/components/isy994/cover.py | 3 ++- homeassistant/components/isy994/fan.py | 3 ++- homeassistant/components/isy994/light.py | 3 ++- homeassistant/components/isy994/lock.py | 3 ++- homeassistant/components/isy994/number.py | 3 ++- homeassistant/components/isy994/sensor.py | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/isy994/binary_sensor.py b/homeassistant/components/isy994/binary_sensor.py index 32fa72e5565..69db4afd1be 100644 --- a/homeassistant/components/isy994/binary_sensor.py +++ b/homeassistant/components/isy994/binary_sensor.py @@ -44,6 +44,7 @@ from .const import ( TYPE_INSTEON_MOTION, ) from .entity import ISYNodeEntity, ISYProgramEntity +from .models import IsyData DEVICE_PARENT_REQUIRED = [ BinarySensorDeviceClass.OPENING, @@ -79,7 +80,7 @@ async def async_setup_entry( | ISYBinarySensorProgramEntity ) - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] devices: dict[str, DeviceInfo] = isy_data.devices for node in isy_data.nodes[Platform.BINARY_SENSOR]: assert isinstance(node, Node) diff --git a/homeassistant/components/isy994/button.py b/homeassistant/components/isy994/button.py index 1ccc3acf659..6e00e1934f2 100644 --- a/homeassistant/components/isy994/button.py +++ b/homeassistant/components/isy994/button.py @@ -21,6 +21,7 @@ from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import CONF_NETWORK, DOMAIN +from .models import IsyData async def async_setup_entry( @@ -29,7 +30,7 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up ISY/IoX button from config entry.""" - isy_data = hass.data[DOMAIN][config_entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][config_entry.entry_id] isy: ISY = isy_data.root device_info = isy_data.devices entities: list[ diff --git a/homeassistant/components/isy994/climate.py b/homeassistant/components/isy994/climate.py index 8b244004da3..4ddbbd86060 100644 --- a/homeassistant/components/isy994/climate.py +++ b/homeassistant/components/isy994/climate.py @@ -56,6 +56,7 @@ from .const import ( ) from .entity import ISYNodeEntity from .helpers import convert_isy_value_to_hass +from .models import IsyData async def async_setup_entry( @@ -64,7 +65,7 @@ async def async_setup_entry( """Set up the ISY thermostat platform.""" entities = [] - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] devices: dict[str, DeviceInfo] = isy_data.devices for node in isy_data.nodes[Platform.CLIMATE]: entities.append(ISYThermostatEntity(node, devices.get(node.primary_node))) diff --git a/homeassistant/components/isy994/cover.py b/homeassistant/components/isy994/cover.py index 1b1b5e226f7..2ada6339295 100644 --- a/homeassistant/components/isy994/cover.py +++ b/homeassistant/components/isy994/cover.py @@ -18,13 +18,14 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from .const import _LOGGER, DOMAIN, UOM_8_BIT_RANGE from .entity import ISYNodeEntity, ISYProgramEntity +from .models import IsyData async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the ISY cover platform.""" - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] entities: list[ISYCoverEntity | ISYCoverProgramEntity] = [] devices: dict[str, DeviceInfo] = isy_data.devices for node in isy_data.nodes[Platform.COVER]: diff --git a/homeassistant/components/isy994/fan.py b/homeassistant/components/isy994/fan.py index 99e359b27b9..e451ef882b4 100644 --- a/homeassistant/components/isy994/fan.py +++ b/homeassistant/components/isy994/fan.py @@ -20,6 +20,7 @@ from homeassistant.util.percentage import ( from .const import _LOGGER, DOMAIN from .entity import ISYNodeEntity, ISYProgramEntity +from .models import IsyData SPEED_RANGE = (1, 255) # off is not included @@ -28,7 +29,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the ISY fan platform.""" - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] devices: dict[str, DeviceInfo] = isy_data.devices entities: list[ISYFanEntity | ISYFanProgramEntity] = [] diff --git a/homeassistant/components/isy994/light.py b/homeassistant/components/isy994/light.py index a1fa8975e79..b16b4ca5a83 100644 --- a/homeassistant/components/isy994/light.py +++ b/homeassistant/components/isy994/light.py @@ -17,6 +17,7 @@ from homeassistant.helpers.restore_state import RestoreEntity from .const import _LOGGER, CONF_RESTORE_LIGHT_STATE, DOMAIN, UOM_PERCENTAGE from .entity import ISYNodeEntity +from .models import IsyData ATTR_LAST_BRIGHTNESS = "last_brightness" @@ -25,7 +26,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the ISY light platform.""" - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] devices: dict[str, DeviceInfo] = isy_data.devices isy_options = entry.options restore_light_state = isy_options.get(CONF_RESTORE_LIGHT_STATE, False) diff --git a/homeassistant/components/isy994/lock.py b/homeassistant/components/isy994/lock.py index 81c7e925af2..67c2587a238 100644 --- a/homeassistant/components/isy994/lock.py +++ b/homeassistant/components/isy994/lock.py @@ -18,6 +18,7 @@ from homeassistant.helpers.entity_platform import ( from .const import DOMAIN from .entity import ISYNodeEntity, ISYProgramEntity +from .models import IsyData from .services import ( SERVICE_DELETE_USER_CODE_SCHEMA, SERVICE_DELETE_ZWAVE_LOCK_USER_CODE, @@ -49,7 +50,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the ISY lock platform.""" - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] devices: dict[str, DeviceInfo] = isy_data.devices entities: list[ISYLockEntity | ISYLockProgramEntity] = [] for node in isy_data.nodes[Platform.LOCK]: diff --git a/homeassistant/components/isy994/number.py b/homeassistant/components/isy994/number.py index 7448ba7ff27..baadf3b2dc7 100644 --- a/homeassistant/components/isy994/number.py +++ b/homeassistant/components/isy994/number.py @@ -51,6 +51,7 @@ from .const import ( ) from .entity import ISYAuxControlEntity from .helpers import convert_isy_value_to_hass +from .models import IsyData ISY_MAX_SIZE = (2**32) / 2 ON_RANGE = (1, 255) # Off is not included @@ -81,7 +82,7 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up ISY/IoX number entities from config entry.""" - isy_data = hass.data[DOMAIN][config_entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][config_entry.entry_id] device_info = isy_data.devices entities: list[ ISYVariableNumberEntity | ISYAuxControlNumberEntity | ISYBacklightNumberEntity diff --git a/homeassistant/components/isy994/sensor.py b/homeassistant/components/isy994/sensor.py index a994e1dadef..b1899100dd4 100644 --- a/homeassistant/components/isy994/sensor.py +++ b/homeassistant/components/isy994/sensor.py @@ -45,6 +45,7 @@ from .const import ( ) from .entity import ISYNodeEntity from .helpers import convert_isy_value_to_hass +from .models import IsyData # Disable general purpose and redundant sensors by default AUX_DISABLED_BY_DEFAULT_MATCH = ["GV", "DO"] @@ -109,7 +110,7 @@ async def async_setup_entry( hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback ) -> None: """Set up the ISY sensor platform.""" - isy_data = hass.data[DOMAIN][entry.entry_id] + isy_data: IsyData = hass.data[DOMAIN][entry.entry_id] entities: list[ISYSensorEntity] = [] devices: dict[str, DeviceInfo] = isy_data.devices