diff --git a/homeassistant/components/deconz/button.py b/homeassistant/components/deconz/button.py index cbc64abd5a4..d5e6351b599 100644 --- a/homeassistant/components/deconz/button.py +++ b/homeassistant/components/deconz/button.py @@ -4,7 +4,7 @@ from __future__ import annotations from dataclasses import dataclass -from pydeconz.group import Scene as PydeconzScene +from pydeconz.models.scene import Scene as PydeconzScene from homeassistant.components.button import ( DOMAIN, diff --git a/homeassistant/components/deconz/deconz_device.py b/homeassistant/components/deconz/deconz_device.py index b3773d49267..854ac7adbe6 100644 --- a/homeassistant/components/deconz/deconz_device.py +++ b/homeassistant/components/deconz/deconz_device.py @@ -2,8 +2,9 @@ from __future__ import annotations -from pydeconz.group import Group as DeconzGroup, Scene as PydeconzScene from pydeconz.light import LightBase as DeconzLight +from pydeconz.models.group import Group as DeconzGroup +from pydeconz.models.scene import Scene as PydeconzScene from pydeconz.models.sensor import SensorBase as DeconzSensor from homeassistant.core import callback diff --git a/homeassistant/components/deconz/gateway.py b/homeassistant/components/deconz/gateway.py index dec887b9ca8..6d2b53dc9fa 100644 --- a/homeassistant/components/deconz/gateway.py +++ b/homeassistant/components/deconz/gateway.py @@ -7,11 +7,11 @@ from types import MappingProxyType from typing import TYPE_CHECKING, Any, cast import async_timeout -from pydeconz import DeconzSession, errors, group, light +from pydeconz import DeconzSession, errors from pydeconz.alarm_system import AlarmSystem as DeconzAlarmSystem -from pydeconz.group import Group as DeconzGroup from pydeconz.light import LightBase as DeconzLight -from pydeconz.models import sensor +from pydeconz.models import ResourceGroup +from pydeconz.models.group import Group as DeconzGroup from pydeconz.models.sensor import SensorBase as DeconzSensor from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry @@ -69,10 +69,10 @@ class DeconzGateway: self.signal_new_sensor = f"deconz_new_sensor_{config_entry.entry_id}" self.deconz_resource_type_to_signal_new_device = { - group.RESOURCE_TYPE: self.signal_new_group, - light.RESOURCE_TYPE: self.signal_new_light, - group.RESOURCE_TYPE_SCENE: self.signal_new_scene, - sensor.RESOURCE_TYPE: self.signal_new_sensor, + ResourceGroup.GROUP.value: self.signal_new_group, + ResourceGroup.LIGHT.value: self.signal_new_light, + ResourceGroup.SCENE.value: self.signal_new_scene, + ResourceGroup.SENSOR.value: self.signal_new_sensor, } self.deconz_ids: dict[str, str] = {} @@ -210,7 +210,7 @@ class DeconzGateway: deconz_ids = [] if self.option_allow_clip_sensor: - self.async_add_device_callback(sensor.RESOURCE_TYPE) + self.async_add_device_callback(ResourceGroup.SENSOR.value) else: deconz_ids += [ @@ -220,7 +220,7 @@ class DeconzGateway: ] if self.option_allow_deconz_groups: - self.async_add_device_callback(group.RESOURCE_TYPE) + self.async_add_device_callback(ResourceGroup.GROUP.value) else: deconz_ids += [group.deconz_id for group in self.api.groups.values()] diff --git a/homeassistant/components/deconz/light.py b/homeassistant/components/deconz/light.py index a175d1e4e70..45d317e5e0b 100644 --- a/homeassistant/components/deconz/light.py +++ b/homeassistant/components/deconz/light.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import Any, Generic, TypedDict, TypeVar -from pydeconz.group import Group from pydeconz.light import ( ALERT_LONG, ALERT_SHORT, @@ -12,6 +11,7 @@ from pydeconz.light import ( Light, LightResources, ) +from pydeconz.models.group import Group from homeassistant.components.light import ( ATTR_BRIGHTNESS, diff --git a/homeassistant/components/deconz/scene.py b/homeassistant/components/deconz/scene.py index 2ad579cef7d..721a06f82b6 100644 --- a/homeassistant/components/deconz/scene.py +++ b/homeassistant/components/deconz/scene.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import Any -from pydeconz.group import Scene as PydeconzScene +from pydeconz.models.scene import Scene as PydeconzScene from homeassistant.components.scene import DOMAIN, Scene from homeassistant.config_entries import ConfigEntry