Skip to content

Update Nest doorbell event to use standard DoorbellEventType.RING #169691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
allenporter wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −12
Open

Update Nest doorbell event to use standard DoorbellEventType.RING #169691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions homeassistant/components/nest/event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from google_nest_sdm.traits import TraitType

from homeassistant.components.event import (
DoorbellEventType,
EventDeviceClass,
EventEntity,
EventEntityDescription,
Expand Down Expand Up @@ -42,7 +43,7 @@ class NestEventEntityDescription(EventEntityDescription):
key=EVENT_DOORBELL_CHIME,
translation_key="chime",
device_class=EventDeviceClass.DOORBELL,
event_types=[EVENT_DOORBELL_CHIME],
event_types=[DoorbellEventType.RING],
trait_types=[TraitType.DOORBELL_CHIME],
api_event_types=[EventType.DOORBELL_CHIME],
),
Expand Down Expand Up @@ -80,7 +81,7 @@ async def async_setup_entry(


class NestTraitEventEntity(EventEntity):
"""Nest doorbell event entity."""
"""Nest event entity for event entity descriptions."""

entity_description: NestEventEntityDescription
_attr_has_entity_name = True
Expand Down Expand Up @@ -113,6 +114,9 @@ async def _async_handle_event(self, event_message: EventMessage) -> None:
# This event is a duplicate message in the same thread
return

if event_type == EVENT_DOORBELL_CHIME:
event_type = DoorbellEventType.RING
Comment thread
allenporter marked this conversation as resolved.

self._trigger_event(
event_type,
{"nest_event_id": nest_event_id},
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/nest/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"state_attributes": {
"event_type": {
"state": {
"doorbell_chime": "[%key:component::nest::entity::event::chime::name%]"
"ring": "[%key:component::event::entity_component::doorbell::state_attributes::event_type::state::ring%]"
Comment thread
allenporter marked this conversation as resolved.
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions tests/components/nest/test_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ def create_event_messages(
"event.front_chime",
{
"device_class": "doorbell",
"event_types": ["doorbell_chime"],
"event_types": ["ring"],
"friendly_name": "Front Chime",
},
EventType.DOORBELL_CHIME,
"doorbell_chime",
"ring",
),
(
[TraitType.CAMERA_MOTION, TraitType.CAMERA_PERSON, TraitType.CAMERA_SOUND],
Expand Down Expand Up @@ -205,7 +205,7 @@ async def test_ignore_unrelated_event(
assert state.attributes == {
"device_class": "doorbell",
"event_type": None,
"event_types": ["doorbell_chime"],
"event_types": ["ring"],
"friendly_name": "Front Chime",
}

Expand Down Expand Up @@ -249,9 +249,9 @@ async def test_event_threads(
assert state.state == "2024-08-24T12:00:02.000+00:00"
assert state.attributes == {
"device_class": "doorbell",
"event_types": ["doorbell_chime"],
"event_types": ["ring"],
"friendly_name": "Front Chime",
"event_type": "doorbell_chime",
"event_type": "ring",
"nest_event_id": ENCODED_EVENT_ID,
}

Expand Down Expand Up @@ -280,9 +280,9 @@ async def test_event_threads(
) # A second event is not received
assert state.attributes == {
"device_class": "doorbell",
"event_types": ["doorbell_chime"],
"event_types": ["ring"],
"friendly_name": "Front Chime",
"event_type": "doorbell_chime",
"event_type": "ring",
"nest_event_id": ENCODED_EVENT_ID,
}

Expand All @@ -309,8 +309,8 @@ async def test_event_threads(
assert state.state == "2024-08-24T12:00:06.000+00:00" # Third event is received
assert state.attributes == {
"device_class": "doorbell",
"event_types": ["doorbell_chime"],
"event_types": ["ring"],
"friendly_name": "Front Chime",
"event_type": "doorbell_chime",
"event_type": "ring",
"nest_event_id": ENCODED_EVENT_ID2,
}
Loading