Move deCONZ sensor imports to reflect changes in pydeconz (#70471)

homeassistant/components/deconz/alarm_control_panel.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from pydeconz.alarm_system import AlarmSystem
-from pydeconz.sensor import (
+from pydeconz.models.sensor.ancillary_control import (
     ANCILLARY_CONTROL_ARMED_AWAY,
     ANCILLARY_CONTROL_ARMED_NIGHT,
     ANCILLARY_CONTROL_ARMED_STAY,

homeassistant/components/deconz/binary_sensor.py

@@ -4,17 +4,15 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pydeconz.sensor import (
-    Alarm,
-    CarbonMonoxide,
-    Fire,
-    GenericFlag,
-    OpenClose,
-    Presence,
-    SensorResources,
-    Vibration,
-    Water,
-)
+from pydeconz.interfaces.sensors import SensorResources
+from pydeconz.models.sensor.alarm import Alarm
+from pydeconz.models.sensor.carbon_monoxide import CarbonMonoxide
+from pydeconz.models.sensor.fire import Fire
+from pydeconz.models.sensor.generic_flag import GenericFlag
+from pydeconz.models.sensor.open_close import OpenClose
+from pydeconz.models.sensor.presence import Presence
+from pydeconz.models.sensor.vibration import Vibration
+from pydeconz.models.sensor.water import Water
 
 from homeassistant.components.binary_sensor import (
     DOMAIN,

homeassistant/components/deconz/climate.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from pydeconz.sensor import (
+from pydeconz.models.sensor.thermostat import (
     THERMOSTAT_FAN_MODE_AUTO,
     THERMOSTAT_FAN_MODE_HIGH,
     THERMOSTAT_FAN_MODE_LOW,

homeassistant/components/deconz/deconz_device.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from pydeconz.group import Group as DeconzGroup, Scene as PydeconzScene
 from pydeconz.light import LightBase as DeconzLight
-from pydeconz.sensor import SensorBase as DeconzSensor
+from pydeconz.models.sensor import SensorBase as DeconzSensor
 
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE

homeassistant/components/deconz/deconz_event.py

@@ -5,14 +5,14 @@ from __future__ import annotations
 from typing import Any
 
 from pydeconz.models.event import EventType
-from pydeconz.sensor import (
+from pydeconz.models.sensor.ancillary_control import (
     ANCILLARY_CONTROL_EMERGENCY,
     ANCILLARY_CONTROL_FIRE,
     ANCILLARY_CONTROL_INVALID_CODE,
     ANCILLARY_CONTROL_PANIC,
     AncillaryControl,
-    Switch,
 )
+from pydeconz.models.sensor.switch import Switch
 
 from homeassistant.const import (
     CONF_DEVICE_ID,

homeassistant/components/deconz/gateway.py

@@ -7,11 +7,12 @@ from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, cast
 
 import async_timeout
-from pydeconz import DeconzSession, errors, group, light, sensor
+from pydeconz import DeconzSession, errors, group, light
 from pydeconz.alarm_system import AlarmSystem as DeconzAlarmSystem
 from pydeconz.group import Group as DeconzGroup
 from pydeconz.light import LightBase as DeconzLight
-from pydeconz.sensor import SensorBase as DeconzSensor
+from pydeconz.models import sensor
+from pydeconz.models.sensor import SensorBase as DeconzSensor
 
 from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT

homeassistant/components/deconz/lock.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from typing import Any
 
 from pydeconz.light import Lock
-from pydeconz.sensor import DoorLock
+from pydeconz.models.sensor.door_lock import DoorLock
 
 from homeassistant.components.lock import DOMAIN, LockEntity
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/deconz/number.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from pydeconz.sensor import PRESENCE_DELAY, Presence
+from pydeconz.models.sensor.presence import PRESENCE_DELAY, Presence
 
 from homeassistant.components.number import (
     DOMAIN,

homeassistant/components/deconz/sensor.py

@@ -5,20 +5,18 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
 
-from pydeconz.sensor import (
-    AirQuality,
-    Consumption,
-    Daylight,
-    GenericStatus,
-    Humidity,
-    LightLevel,
-    Power,
-    Pressure,
-    SensorResources,
-    Switch,
-    Temperature,
-    Time,
-)
+from pydeconz.interfaces.sensors import SensorResources
+from pydeconz.models.sensor.air_quality import AirQuality
+from pydeconz.models.sensor.consumption import Consumption
+from pydeconz.models.sensor.daylight import Daylight
+from pydeconz.models.sensor.generic_status import GenericStatus
+from pydeconz.models.sensor.humidity import Humidity
+from pydeconz.models.sensor.light_level import LightLevel
+from pydeconz.models.sensor.power import Power
+from pydeconz.models.sensor.pressure import Pressure
+from pydeconz.models.sensor.switch import Switch
+from pydeconz.models.sensor.temperature import Temperature
+from pydeconz.models.sensor.time import Time
 
 from homeassistant.components.sensor import (
     DOMAIN,

tests/components/deconz/test_alarm_control_panel.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import patch
 
-from pydeconz.sensor import (
+from pydeconz.models.sensor.ancillary_control import (
     ANCILLARY_CONTROL_ARMED_AWAY,
     ANCILLARY_CONTROL_ARMED_NIGHT,
     ANCILLARY_CONTROL_ARMED_STAY,

tests/components/deconz/test_deconz_event.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import patch
 
-from pydeconz.sensor import (
+from pydeconz.models.sensor.ancillary_control import (
     ANCILLARY_CONTROL_ARMED_AWAY,
     ANCILLARY_CONTROL_EMERGENCY,
     ANCILLARY_CONTROL_FIRE,