Merge pull request #136 from c-st/device-info

Extract device_info to area

Author: c-st

custom_components/auto_areas/auto_area.py

@@ -4,6 +4,7 @@
 from homeassistant.helpers.area_registry import async_get as async_get_area_registry
 from homeassistant.helpers.device_registry import async_get as async_get_device_registry
 from homeassistant.helpers.entity_registry import async_get as async_get_entity_registry
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.issue_registry import async_create_issue, IssueSeverity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.util import slugify
@@ -20,6 +21,8 @@
     ISSUE_TYPE_INVALID_AREA,
     LOGGER,
     RELEVANT_DOMAINS,
+    NAME,
+    VERSION
 )
 
 
@@ -102,6 +105,17 @@ def get_area_entity_ids(self, device_classes: list[str]) -> list[str]:
             or entity.original_device_class in device_classes
         ]
 
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Information about this device."""
+        return {
+            "identifiers": {(DOMAIN, self.config_entry.entry_id)},
+            "name": NAME,
+            "model": VERSION,
+            "manufacturer": NAME,
+            "suggested_area": self.area_name,
+        }
+
     @property
     def area_name(self) -> str:
         """Return area name or fallback."""

custom_components/auto_areas/auto_entity.py

@@ -16,7 +16,7 @@
 from custom_components.auto_areas.calculations import get_calculation
 
 from .auto_area import AutoArea
-from .const import DOMAIN, LOGGER, NAME, VERSION
+from .const import LOGGER
 
 _TEntity = TypeVar("_TEntity", bound=Entity)
 _TDeviceClass = TypeVar(
@@ -83,13 +83,7 @@ def device_class(self) -> _TDeviceClass:
     @cached_property
     def device_info(self) -> DeviceInfo:
         """Information about this device."""
-        return {
-            "identifiers": {(DOMAIN, self.auto_area.config_entry.entry_id)},
-            "name": NAME,
-            "model": VERSION,
-            "manufacturer": NAME,
-            "suggested_area": self.auto_area.area_name,
-        }
+        return self.auto_area.device_info
 
     @cached_property
     def suggested_display_precision(self) -> int | None:

custom_components/auto_areas/binary_sensors/presence.py

@@ -1,7 +1,6 @@
 """Presence binary sensor."""
 
 from __future__ import annotations
-from custom_components.auto_areas.ha_helpers import all_states_are_off
 
 from functools import cached_property
 from typing import Literal, override
@@ -12,6 +11,8 @@
     BinarySensorEntity,
 )
 from homeassistant.helpers.event import async_track_state_change_event
+
+from custom_components.auto_areas.ha_helpers import all_states_are_off
 from custom_components.auto_areas.auto_area import AutoArea
 from custom_components.auto_areas.auto_entity import AutoEntity
 from custom_components.auto_areas.const import (

custom_components/auto_areas/const.py

@@ -18,8 +18,7 @@
 
 NAME = "Auto Areas"
 DOMAIN = "auto_areas"
-VERSION = "2.0.0"
-ATTRIBUTION = "Data provided by http://jsonplaceholder.typicode.com/"
+VERSION = "2.6.2"
 
 #
 # Naming constants

custom_components/auto_areas/cover.py

@@ -14,9 +14,7 @@
     COVER_GROUP_ENTITY_PREFIX,
     COVER_GROUP_PREFIX,
     DOMAIN,
-    LOGGER,
-    NAME,
-    VERSION
+    LOGGER
 )
 
 
@@ -69,13 +67,7 @@ def name(self):
     @cached_property
     def device_info(self) -> DeviceInfo:
         """Information about this device."""
-        return {
-            "identifiers": {(DOMAIN, self.auto_area.config_entry.entry_id)},
-            "name": NAME,
-            "model": VERSION,
-            "manufacturer": NAME,
-            "suggested_area": self.auto_area.area_name,
-        }
+        return self.auto_area.device_info
 
     @cached_property
     def unique_id(self) -> str | None:

custom_components/auto_areas/manifest.json

@@ -23,5 +23,5 @@
   "documentation": "https://github.com/c-st/auto_areas",
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/c-st/auto_areas/issues",
-  "version": "2.1.0"
+  "version": "2.6.2"
 }

custom_components/auto_areas/switches/presence_lock.py

@@ -11,11 +11,8 @@
 
 from custom_components.auto_areas.auto_area import AutoArea
 from custom_components.auto_areas.const import (
-    DOMAIN,
     LOGGER,
-    NAME,
-    PRESENCE_LOCK_SWITCH_PREFIX,
-    VERSION
+    PRESENCE_LOCK_SWITCH_PREFIX
 )
 
 
@@ -47,13 +44,7 @@ def unique_id(self) -> str | None:
     @cached_property
     def device_info(self) -> DeviceInfo:
         """Information about this device."""
-        return {
-            "identifiers": {(DOMAIN, self.auto_area.config_entry.entry_id)},
-            "name": NAME,
-            "model": VERSION,
-            "manufacturer": NAME,
-            "suggested_area": self.auto_area.area_name,
-        }
+        return self.auto_area.device_info
 
     @cached_property
     def device_class(self) -> SwitchDeviceClass | None:

custom_components/auto_areas/switches/sleep_mode.py

@@ -11,11 +11,8 @@
 
 from custom_components.auto_areas.auto_area import AutoArea
 from custom_components.auto_areas.const import (
-    DOMAIN,
     LOGGER,
-    NAME,
-    SLEEP_MODE_SWITCH_PREFIX,
-    VERSION
+    SLEEP_MODE_SWITCH_PREFIX
 )
 
 
@@ -47,13 +44,7 @@ def unique_id(self) -> str | None:
     @cached_property
     def device_info(self) -> DeviceInfo:
         """Information about this device."""
-        return {
-            "identifiers": {(DOMAIN, self.auto_area.config_entry.entry_id)},
-            "name": NAME,
-            "model": VERSION,
-            "manufacturer": NAME,
-            "suggested_area": self.auto_area.area_name,
-        }
+        return self.auto_area.device_info
 
     @cached_property
     def device_class(self) -> SwitchDeviceClass | None:

requirements.txt

@@ -1,4 +1,4 @@
-# colorlog>=6.8
-homeassistant==2024.7.3
+colorlog>=6.8
+homeassistant==2024.7.4
 pip>=21.3.1,<24.1
 ruff==0.5.5