diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py index d22fb86537a..333462a4d9f 100644 --- a/homeassistant/components/abode/alarm_control_panel.py +++ b/homeassistant/components/abode/alarm_control_panel.py @@ -2,10 +2,12 @@ from __future__ import annotations -from jaraco.abode.devices.alarm import Alarm as AbodeAl +from jaraco.abode.devices.alarm import Alarm -import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature +from homeassistant.components.alarm_control_panel import ( + AlarmControlPanelEntity, + AlarmControlPanelEntityFeature, +) from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( STATE_ALARM_ARMED_AWAY, @@ -29,7 +31,7 @@ async def async_setup_entry( ) -class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity): +class AbodeAlarm(AbodeDevice, AlarmControlPanelEntity): """An alarm_control_panel implementation for Abode.""" _attr_name = None @@ -38,7 +40,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity): AlarmControlPanelEntityFeature.ARM_HOME | AlarmControlPanelEntityFeature.ARM_AWAY ) - _device: AbodeAl + _device: Alarm @property def state(self) -> str | None: diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py index d19b17219a2..4968d5378e1 100644 --- a/homeassistant/components/abode/binary_sensor.py +++ b/homeassistant/components/abode/binary_sensor.py @@ -4,8 +4,14 @@ from __future__ import annotations from typing import cast -from jaraco.abode.devices.sensor import BinarySensor as ABBinarySensor -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.sensor import BinarySensor +from jaraco.abode.helpers.constants import ( + TYPE_CONNECTIVITY, + TYPE_MOISTURE, + TYPE_MOTION, + TYPE_OCCUPANCY, + TYPE_OPENING, +) from homeassistant.components.binary_sensor import ( BinarySensorDeviceClass, @@ -27,11 +33,11 @@ async def async_setup_entry( data: AbodeSystem = hass.data[DOMAIN] device_types = [ - CONST.TYPE_CONNECTIVITY, - CONST.TYPE_MOISTURE, - CONST.TYPE_MOTION, - CONST.TYPE_OCCUPANCY, - CONST.TYPE_OPENING, + TYPE_CONNECTIVITY, + TYPE_MOISTURE, + TYPE_MOTION, + TYPE_OCCUPANCY, + TYPE_OPENING, ] async_add_entities( @@ -44,7 +50,7 @@ class AbodeBinarySensor(AbodeDevice, BinarySensorEntity): """A binary sensor implementation for Abode device.""" _attr_name = None - _device: ABBinarySensor + _device: BinarySensor @property def is_on(self) -> bool: diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py index 4ccd0725df6..8ffa90a9b82 100644 --- a/homeassistant/components/abode/camera.py +++ b/homeassistant/components/abode/camera.py @@ -5,9 +5,10 @@ from __future__ import annotations from datetime import timedelta from typing import Any, cast -from jaraco.abode.devices.base import Device as AbodeDev +from jaraco.abode.devices.base import Device from jaraco.abode.devices.camera import Camera as AbodeCam -from jaraco.abode.helpers import constants as CONST, timeline as TIMELINE +from jaraco.abode.helpers import timeline +from jaraco.abode.helpers.constants import TYPE_CAMERA import requests from requests.models import Response @@ -31,8 +32,8 @@ async def async_setup_entry( data: AbodeSystem = hass.data[DOMAIN] async_add_entities( - AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE) - for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA) + AbodeCamera(data, device, timeline.CAPTURE_IMAGE) + for device in data.abode.get_devices(generic_type=TYPE_CAMERA) ) @@ -42,7 +43,7 @@ class AbodeCamera(AbodeDevice, Camera): _device: AbodeCam _attr_name = None - def __init__(self, data: AbodeSystem, device: AbodeDev, event: Event) -> None: + def __init__(self, data: AbodeSystem, device: Device, event: Event) -> None: """Initialize the Abode device.""" AbodeDevice.__init__(self, data, device) Camera.__init__(self) diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py index 511435e50c3..e3fbb1a5b8f 100644 --- a/homeassistant/components/abode/cover.py +++ b/homeassistant/components/abode/cover.py @@ -2,8 +2,8 @@ from typing import Any -from jaraco.abode.devices.cover import Cover as AbodeCV -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.cover import Cover +from jaraco.abode.helpers.constants import TYPE_COVER from homeassistant.components.cover import CoverEntity from homeassistant.config_entries import ConfigEntry @@ -22,14 +22,14 @@ async def async_setup_entry( async_add_entities( AbodeCover(data, device) - for device in data.abode.get_devices(generic_type=CONST.TYPE_COVER) + for device in data.abode.get_devices(generic_type=TYPE_COVER) ) class AbodeCover(AbodeDevice, CoverEntity): """Representation of an Abode cover.""" - _device: AbodeCV + _device: Cover _attr_name = None @property diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py index f3df1810bcd..188d3c18e40 100644 --- a/homeassistant/components/abode/light.py +++ b/homeassistant/components/abode/light.py @@ -5,8 +5,8 @@ from __future__ import annotations from math import ceil from typing import Any -from jaraco.abode.devices.light import Light as AbodeLT -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.light import Light +from jaraco.abode.helpers.constants import TYPE_LIGHT from homeassistant.components.light import ( ATTR_BRIGHTNESS, @@ -35,14 +35,14 @@ async def async_setup_entry( async_add_entities( AbodeLight(data, device) - for device in data.abode.get_devices(generic_type=CONST.TYPE_LIGHT) + for device in data.abode.get_devices(generic_type=TYPE_LIGHT) ) class AbodeLight(AbodeDevice, LightEntity): """Representation of an Abode light.""" - _device: AbodeLT + _device: Light _attr_name = None def turn_on(self, **kwargs: Any) -> None: diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py index 6458c9abf29..1135d3c3b36 100644 --- a/homeassistant/components/abode/lock.py +++ b/homeassistant/components/abode/lock.py @@ -2,8 +2,8 @@ from typing import Any -from jaraco.abode.devices.lock import Lock as AbodeLK -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.lock import Lock +from jaraco.abode.helpers.constants import TYPE_LOCK from homeassistant.components.lock import LockEntity from homeassistant.config_entries import ConfigEntry @@ -22,14 +22,14 @@ async def async_setup_entry( async_add_entities( AbodeLock(data, device) - for device in data.abode.get_devices(generic_type=CONST.TYPE_LOCK) + for device in data.abode.get_devices(generic_type=TYPE_LOCK) ) class AbodeLock(AbodeDevice, LockEntity): """Representation of an Abode lock.""" - _device: AbodeLK + _device: Lock _attr_name = None def lock(self, **kwargs: Any) -> None: diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py index 405f3db5a67..89e5cf574fb 100644 --- a/homeassistant/components/abode/sensor.py +++ b/homeassistant/components/abode/sensor.py @@ -6,8 +6,16 @@ from collections.abc import Callable from dataclasses import dataclass from typing import cast -from jaraco.abode.devices.sensor import Sensor as AbodeSense -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.sensor import Sensor +from jaraco.abode.helpers.constants import ( + HUMI_STATUS_KEY, + LUX_STATUS_KEY, + STATUSES_KEY, + TEMP_STATUS_KEY, + TYPE_SENSOR, + UNIT_CELSIUS, + UNIT_FAHRENHEIT, +) from homeassistant.components.sensor import ( SensorDeviceClass, @@ -23,8 +31,8 @@ from . import AbodeDevice, AbodeSystem from .const import DOMAIN ABODE_TEMPERATURE_UNIT_HA_UNIT = { - CONST.UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT, - CONST.UNIT_CELSIUS: UnitOfTemperature.CELSIUS, + UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT, + UNIT_CELSIUS: UnitOfTemperature.CELSIUS, } @@ -32,13 +40,13 @@ ABODE_TEMPERATURE_UNIT_HA_UNIT = { class AbodeSensorDescription(SensorEntityDescription): """Class describing Abode sensor entities.""" - value_fn: Callable[[AbodeSense], float] - native_unit_of_measurement_fn: Callable[[AbodeSense], str] + value_fn: Callable[[Sensor], float] + native_unit_of_measurement_fn: Callable[[Sensor], str] SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = ( AbodeSensorDescription( - key=CONST.TEMP_STATUS_KEY, + key=TEMP_STATUS_KEY, device_class=SensorDeviceClass.TEMPERATURE, native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[ device.temp_unit @@ -46,13 +54,13 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = ( value_fn=lambda device: cast(float, device.temp), ), AbodeSensorDescription( - key=CONST.HUMI_STATUS_KEY, + key=HUMI_STATUS_KEY, device_class=SensorDeviceClass.HUMIDITY, native_unit_of_measurement_fn=lambda _: PERCENTAGE, value_fn=lambda device: cast(float, device.humidity), ), AbodeSensorDescription( - key=CONST.LUX_STATUS_KEY, + key=LUX_STATUS_KEY, device_class=SensorDeviceClass.ILLUMINANCE, native_unit_of_measurement_fn=lambda _: LIGHT_LUX, value_fn=lambda device: cast(float, device.lux), @@ -69,8 +77,8 @@ async def async_setup_entry( async_add_entities( AbodeSensor(data, device, description) for description in SENSOR_TYPES - for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR) - if description.key in device.get_value(CONST.STATUSES_KEY) + for device in data.abode.get_devices(generic_type=TYPE_SENSOR) + if description.key in device.get_value(STATUSES_KEY) ) @@ -78,12 +86,12 @@ class AbodeSensor(AbodeDevice, SensorEntity): """A sensor implementation for Abode devices.""" entity_description: AbodeSensorDescription - _device: AbodeSense + _device: Sensor def __init__( self, data: AbodeSystem, - device: AbodeSense, + device: Sensor, description: AbodeSensorDescription, ) -> None: """Initialize a sensor for an Abode device.""" diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py index 3d33632e19a..9a33a04e341 100644 --- a/homeassistant/components/abode/switch.py +++ b/homeassistant/components/abode/switch.py @@ -4,8 +4,8 @@ from __future__ import annotations from typing import Any, cast -from jaraco.abode.devices.switch import Switch as AbodeSW -from jaraco.abode.helpers import constants as CONST +from jaraco.abode.devices.switch import Switch +from jaraco.abode.helpers.constants import TYPE_SWITCH, TYPE_VALVE from homeassistant.components.switch import SwitchEntity from homeassistant.config_entries import ConfigEntry @@ -16,7 +16,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import AbodeAutomation, AbodeDevice, AbodeSystem from .const import DOMAIN -DEVICE_TYPES = [CONST.TYPE_SWITCH, CONST.TYPE_VALVE] +DEVICE_TYPES = [TYPE_SWITCH, TYPE_VALVE] async def async_setup_entry( @@ -42,7 +42,7 @@ async def async_setup_entry( class AbodeSwitch(AbodeDevice, SwitchEntity): """Representation of an Abode switch.""" - _device: AbodeSW + _device: Switch _attr_name = None def turn_on(self, **kwargs: Any) -> None: