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

Make ring device generic in RingEntity (#115406)

Browse source 
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
This commit is contained in:
Steven B 2024-04-11 10:31:37 +01:00 • committed by GitHub
parent 5308e02c99
commit df5d818c08
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
homeassistant/components/ring/sensor.py
View file

@ -14,7 +14,6 @@ from ring_doorbell import (
RingGeneric,
RingOther,
)
from typing_extensions import TypeVar
from homeassistant.components.sensor import (
SensorDeviceClass,
@ -35,9 +34,7 @@ from homeassistant.helpers.typing import StateType
from . import RingData
from .const import DOMAIN
from .coordinator import RingDataCoordinator
from .entity import RingEntity
_RingDeviceT = TypeVar("_RingDeviceT", bound=RingGeneric, default=RingGeneric)
from .entity import RingDeviceT, RingEntity
async def async_setup_entry(
@ -59,17 +56,16 @@ async def async_setup_entry(
async_add_entities(entities)
class RingSensor(RingEntity, SensorEntity, Generic[_RingDeviceT]):
class RingSensor(RingEntity[RingDeviceT], SensorEntity):
"""A sensor implementation for Ring device."""
entity_description: RingSensorEntityDescription[_RingDeviceT]
_device: _RingDeviceT
entity_description: RingSensorEntityDescription[RingDeviceT]
def __init__(
self,
device: RingGeneric,
device: RingDeviceT,
coordinator: RingDataCoordinator,
description: RingSensorEntityDescription[_RingDeviceT],
description: RingSensorEntityDescription[RingDeviceT],
) -> None:
"""Initialize a sensor for Ring device."""
super().__init__(device, coordinator)
@ -85,7 +81,7 @@ class RingSensor(RingEntity, SensorEntity, Generic[_RingDeviceT]):
"""Call update method."""
self._device = cast(
_RingDeviceT,
RingDeviceT,
self._get_coordinator_data().get_device(self._device.device_api_id),
)
# History values can drop off the last 10 events so only update
@ -126,12 +122,12 @@ def _get_last_event_attrs(
@dataclass(frozen=True, kw_only=True)
class RingSensorEntityDescription(SensorEntityDescription, Generic[_RingDeviceT]):
class RingSensorEntityDescription(SensorEntityDescription, Generic[RingDeviceT]):
"""Describes Ring sensor entity."""
value_fn: Callable[[_RingDeviceT], StateType] = lambda _: True
value_fn: Callable[[RingDeviceT], StateType] = lambda _: True
exists_fn: Callable[[RingGeneric], bool] = lambda _: True
extra_state_attributes_fn: Callable[[_RingDeviceT], dict[str, Any] | None] = (
extra_state_attributes_fn: Callable[[RingDeviceT], dict[str, Any] | None] = (
lambda _: None
)