Use singleton helper for registries (#117027)

homeassistant/helpers/area_registry.py

@@ -18,6 +18,7 @@ from .normalized_name_base_registry import (
     normalize_name,
 )
 from .registry import BaseRegistry
+from .singleton import singleton
 from .storage import Store
 from .typing import UNDEFINED, UndefinedType
 
@@ -417,16 +418,16 @@ class AreaRegistry(BaseRegistry[AreasRegistryStoreData]):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> AreaRegistry:
     """Get area registry."""
-    return hass.data[DATA_REGISTRY]
+    return AreaRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load area registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = AreaRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()
 
 
 @callback

homeassistant/helpers/category_registry.py

@@ -13,6 +13,7 @@ from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.ulid import ulid_now
 
 from .registry import BaseRegistry
+from .singleton import singleton
 from .storage import Store
 from .typing import UNDEFINED, UndefinedType
 
@@ -217,13 +218,13 @@ class CategoryRegistry(BaseRegistry[CategoryRegistryStoreData]):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> CategoryRegistry:
     """Get category registry."""
-    return hass.data[DATA_REGISTRY]
+    return CategoryRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load category registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = CategoryRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()

homeassistant/helpers/device_registry.py

@@ -38,6 +38,7 @@ from .deprecation import (
 from .frame import report
 from .json import JSON_DUMP, find_paths_unserializable_data, json_bytes, json_fragment
 from .registry import BaseRegistry, BaseRegistryItems
+from .singleton import singleton
 from .typing import UNDEFINED, UndefinedType
 
 if TYPE_CHECKING:
@@ -1077,16 +1078,16 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> DeviceRegistry:
     """Get device registry."""
-    return hass.data[DATA_REGISTRY]
+    return DeviceRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load device registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = DeviceRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()
 
 
 @callback

homeassistant/helpers/entity_registry.py

@@ -59,6 +59,7 @@ from .device_registry import (
 )
 from .json import JSON_DUMP, find_paths_unserializable_data, json_bytes, json_fragment
 from .registry import BaseRegistry, BaseRegistryItems
+from .singleton import singleton
 from .typing import UNDEFINED, UndefinedType
 
 if TYPE_CHECKING:
@@ -1374,16 +1375,16 @@ class EntityRegistry(BaseRegistry):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> EntityRegistry:
     """Get entity registry."""
-    return hass.data[DATA_REGISTRY]
+    return EntityRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load entity registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = EntityRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()
 
 
 @callback

homeassistant/helpers/floor_registry.py

@@ -18,6 +18,7 @@ from .normalized_name_base_registry import (
     normalize_name,
 )
 from .registry import BaseRegistry
+from .singleton import singleton
 from .storage import Store
 from .typing import UNDEFINED, UndefinedType
 
@@ -239,13 +240,13 @@ class FloorRegistry(BaseRegistry[FloorRegistryStoreData]):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> FloorRegistry:
     """Get floor registry."""
-    return hass.data[DATA_REGISTRY]
+    return FloorRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load floor registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = FloorRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()

homeassistant/helpers/label_registry.py

@@ -18,6 +18,7 @@ from .normalized_name_base_registry import (
     normalize_name,
 )
 from .registry import BaseRegistry
+from .singleton import singleton
 from .storage import Store
 from .typing import UNDEFINED, UndefinedType
 
@@ -240,13 +241,13 @@ class LabelRegistry(BaseRegistry[LabelRegistryStoreData]):
 
 
 @callback
+@singleton(DATA_REGISTRY)
 def async_get(hass: HomeAssistant) -> LabelRegistry:
     """Get label registry."""
-    return hass.data[DATA_REGISTRY]
+    return LabelRegistry(hass)
 
 
 async def async_load(hass: HomeAssistant) -> None:
     """Load label registry."""
     assert DATA_REGISTRY not in hass.data
-    hass.data[DATA_REGISTRY] = LabelRegistry(hass)
+    await async_get(hass).async_load()
-    await hass.data[DATA_REGISTRY].async_load()

tests/common.py

@@ -631,6 +631,7 @@ def mock_registry(
         registry.entities[key] = entry
 
     hass.data[er.DATA_REGISTRY] = registry
+    er.async_get.cache_clear()
     return registry
 
 
@@ -654,6 +655,7 @@ def mock_area_registry(
         registry.areas[key] = entry
 
     hass.data[ar.DATA_REGISTRY] = registry
+    ar.async_get.cache_clear()
     return registry
 
 
@@ -682,6 +684,7 @@ def mock_device_registry(
     registry.deleted_devices = dr.DeviceRegistryItems()
 
     hass.data[dr.DATA_REGISTRY] = registry
+    dr.async_get.cache_clear()
     return registry