Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-27 14:31:13 +00:00
Code Activity

Improve typing of floor registry events (#157624)

Browse Source
This commit is contained in:
Erik Montnemery
2025-12-01 19:36:50 +01:00
committed by GitHub
parent f00a944ac1
commit ce6bfdebfc
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/helpers/area_registry.py
View File

@@ -516,9 +516,9 @@ class AreaRegistry(BaseRegistry[AreasRegistryStoreData]):
@callback
def _handle_floor_registry_update(event: fr.EventFloorRegistryUpdated) -> None:
"""Update areas that are associated with a floor that has been removed."""
floor_id = event.data.get("floor_id")
if floor_id is None:
return
if TYPE_CHECKING:
assert event.data["action"] == "remove"
floor_id = event.data["floor_id"]
for area in self.areas.get_areas_for_floor(floor_id):
self.async_update(area.id, floor_id=None)

27
homeassistant/helpers/floor_registry.py
View File

@@ -51,13 +51,24 @@ class FloorRegistryStoreData(TypedDict):
floors: list[_FloorStoreData]
class EventFloorRegistryUpdatedData(TypedDict):
class _EventFloorRegistryUpdatedData_Create_Remove_Update(TypedDict):
"""Event data for when the floor registry is updated."""
action: Literal["create", "remove", "update", "reorder"]
floor_id: str | None
action: Literal["create", "remove", "update"]
floor_id: str
class _EventFloorRegistryUpdatedData_Reorder(TypedDict):
"""Event data for when the floor registry is updated."""
action: Literal["reorder"]
type EventFloorRegistryUpdatedData = (
_EventFloorRegistryUpdatedData_Create_Remove_Update
| _EventFloorRegistryUpdatedData_Reorder
)
type EventFloorRegistryUpdated = Event[EventFloorRegistryUpdatedData]
@@ -200,7 +211,9 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
self.hass.bus.async_fire_internal(
EVENT_FLOOR_REGISTRY_UPDATED,
EventFloorRegistryUpdatedData(action="create", floor_id=floor_id),
_EventFloorRegistryUpdatedData_Create_Remove_Update(
action="create", floor_id=floor_id
),
)
return floor
@@ -211,7 +224,7 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
del self.floors[floor_id]
self.hass.bus.async_fire_internal(
EVENT_FLOOR_REGISTRY_UPDATED,
EventFloorRegistryUpdatedData(
_EventFloorRegistryUpdatedData_Create_Remove_Update(
action="remove",
floor_id=floor_id,
),
@@ -253,7 +266,7 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
self.async_schedule_save()
self.hass.bus.async_fire_internal(
EVENT_FLOOR_REGISTRY_UPDATED,
EventFloorRegistryUpdatedData(
_EventFloorRegistryUpdatedData_Create_Remove_Update(
action="update",
floor_id=floor_id,
),
@@ -280,7 +293,7 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
self.async_schedule_save()
self.hass.bus.async_fire_internal(
EVENT_FLOOR_REGISTRY_UPDATED,
EventFloorRegistryUpdatedData(action="reorder", floor_id=None),
_EventFloorRegistryUpdatedData_Reorder(action="reorder"),
)
async def async_load(self) -> None: