evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve flume generic typing (#85329)

Browse source
This commit is contained in:
Marc Mueller 2023-01-07 14:10:44 +01:00 • committed by GitHub
parent dddba4ba45
commit b27e89b40e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
homeassistant/components/flume/binary_sensor.py
View file

@ -125,11 +125,12 @@ async def async_setup_entry(
async_add_entities(flume_entity_list) async_add_entities(flume_entity_list)
class FlumeNotificationBinarySensor(FlumeEntity, BinarySensorEntity): class FlumeNotificationBinarySensor(
FlumeEntity[FlumeNotificationDataUpdateCoordinator], BinarySensorEntity
):
"""Binary sensor class.""" """Binary sensor class."""
entity_description: FlumeBinarySensorEntityDescription entity_description: FlumeBinarySensorEntityDescription
coordinator: FlumeNotificationDataUpdateCoordinator
@property @property
def is_on(self) -> bool: def is_on(self) -> bool:
@ -144,11 +145,12 @@ class FlumeNotificationBinarySensor(FlumeEntity, BinarySensorEntity):
) )
class FlumeConnectionBinarySensor(FlumeEntity, BinarySensorEntity): class FlumeConnectionBinarySensor(
FlumeEntity[FlumeDeviceConnectionUpdateCoordinator], BinarySensorEntity
):
"""Binary Sensor class for WIFI Connection status.""" """Binary Sensor class for WIFI Connection status."""
entity_description: FlumeBinarySensorEntityDescription entity_description: FlumeBinarySensorEntityDescription
coordinator: FlumeDeviceConnectionUpdateCoordinator
_attr_entity_category = EntityCategory.DIAGNOSTIC _attr_entity_category = EntityCategory.DIAGNOSTIC
_attr_device_class = BinarySensorDeviceClass.CONNECTIVITY _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY

25
homeassistant/components/flume/entity.py
View file

@ -1,16 +1,29 @@
"""Platform for shared base classes for sensors.""" """Platform for shared base classes for sensors."""
from __future__ import annotations from __future__ import annotations
from typing import TypeVar, Union
from homeassistant.helpers.entity import DeviceInfo, EntityDescription from homeassistant.helpers.entity import DeviceInfo, EntityDescription
from homeassistant.helpers.update_coordinator import ( from homeassistant.helpers.update_coordinator import CoordinatorEntity
CoordinatorEntity,
DataUpdateCoordinator,
)
from .const import DOMAIN from .const import DOMAIN
from .coordinator import (
FlumeDeviceConnectionUpdateCoordinator,
FlumeDeviceDataUpdateCoordinator,
FlumeNotificationDataUpdateCoordinator,
)
_FlumeCoordinatorT = TypeVar(
"_FlumeCoordinatorT",
bound=Union[
FlumeDeviceDataUpdateCoordinator,
FlumeDeviceConnectionUpdateCoordinator,
FlumeNotificationDataUpdateCoordinator,
],
)
class FlumeEntity(CoordinatorEntity[DataUpdateCoordinator[None]]): class FlumeEntity(CoordinatorEntity[_FlumeCoordinatorT]):
"""Base entity class.""" """Base entity class."""
_attr_attribution = "Data provided by Flume API" _attr_attribution = "Data provided by Flume API"
@ -18,7 +31,7 @@ class FlumeEntity(CoordinatorEntity[DataUpdateCoordinator[None]]):
def __init__( def __init__(
self, self,
coordinator: DataUpdateCoordinator, coordinator: _FlumeCoordinatorT,
description: EntityDescription, description: EntityDescription,
device_id: str, device_id: str,
location_name: str, location_name: str,

4
homeassistant/components/flume/sensor.py
View file

@ -130,11 +130,9 @@ async def async_setup_entry(
async_add_entities(flume_entity_list) async_add_entities(flume_entity_list)
class FlumeSensor(FlumeEntity, SensorEntity): class FlumeSensor(FlumeEntity[FlumeDeviceDataUpdateCoordinator], SensorEntity):
"""Representation of the Flume sensor.""" """Representation of the Flume sensor."""
coordinator: FlumeDeviceDataUpdateCoordinator
@property @property
def native_value(self): def native_value(self):
"""Return the state of the sensor.""" """Return the state of the sensor."""