Bumps pyunifiprotect to 3.6.0 (#72188)

homeassistant/components/unifiprotect/button.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Final
 
-from pyunifiprotect.data.base import ProtectAdoptableDeviceModel
+from pyunifiprotect.data import ProtectAdoptableDeviceModel
 
 from homeassistant.components.button import (
     ButtonDeviceClass,

homeassistant/components/unifiprotect/camera.py

@@ -5,8 +5,7 @@ from collections.abc import Generator
 import logging
 
 from pyunifiprotect.api import ProtectApiClient
-from pyunifiprotect.data import Camera as UFPCamera, StateType
+from pyunifiprotect.data import Camera as UFPCamera, CameraChannel, StateType
-from pyunifiprotect.data.devices import CameraChannel
 
 from homeassistant.components.camera import Camera, CameraEntityFeature
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/unifiprotect/config_flow.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from aiohttp import CookieJar
 from pyunifiprotect import NotAuthorized, NvrError, ProtectApiClient
-from pyunifiprotect.data.nvr import NVR
+from pyunifiprotect.data import NVR
 import voluptuous as vol
 
 from homeassistant import config_entries

homeassistant/components/unifiprotect/const.py

@@ -1,6 +1,6 @@
 """Constant definitions for UniFi Protect Integration."""
 
-from pyunifiprotect.data.types import ModelType, Version
+from pyunifiprotect.data import ModelType, Version
 
 from homeassistant.const import Platform
 

homeassistant/components/unifiprotect/data.py

@@ -12,9 +12,10 @@ from pyunifiprotect.data import (
     Event,
     Liveview,
     ModelType,
+    ProtectAdoptableDeviceModel,
+    ProtectDeviceModel,
     WSSubscriptionMessage,
 )
-from pyunifiprotect.data.base import ProtectAdoptableDeviceModel, ProtectDeviceModel
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback

homeassistant/components/unifiprotect/entity.py

@@ -6,6 +6,7 @@ import logging
 from typing import Any
 
 from pyunifiprotect.data import (
+    NVR,
     Camera,
     Doorlock,
     Event,
@@ -16,7 +17,6 @@ from pyunifiprotect.data import (
     StateType,
     Viewer,
 )
-from pyunifiprotect.data.nvr import NVR
 
 from homeassistant.core import callback
 import homeassistant.helpers.device_registry as dr

homeassistant/components/unifiprotect/lock.py

@@ -4,8 +4,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from pyunifiprotect.data import Doorlock
+from pyunifiprotect.data import Doorlock, LockStatusType
-from pyunifiprotect.data.types import LockStatusType
 
 from homeassistant.components.lock import LockEntity, LockEntityDescription
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/unifiprotect/manifest.json

@@ -3,7 +3,7 @@
   "name": "UniFi Protect",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/unifiprotect",
-  "requirements": ["pyunifiprotect==3.5.1", "unifi-discovery==1.1.3"],
+  "requirements": ["pyunifiprotect==3.6.0", "unifi-discovery==1.1.3"],
   "dependencies": ["http"],
   "codeowners": ["@briis", "@AngellusMortis", "@bdraco"],
   "quality_scale": "platinum",

homeassistant/components/unifiprotect/number.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import timedelta
 
-from pyunifiprotect.data.devices import Camera, Doorlock, Light
+from pyunifiprotect.data import Camera, Doorlock, Light
 
 from homeassistant.components.number import NumberEntity, NumberEntityDescription
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/unifiprotect/select.py

@@ -11,17 +11,18 @@ from typing import Any, Final
 from pyunifiprotect.api import ProtectApiClient
 from pyunifiprotect.data import (
     Camera,
+    ChimeType,
     DoorbellMessageType,
     Doorlock,
     IRLEDMode,
     Light,
     LightModeEnableType,
     LightModeType,
+    MountType,
     RecordingMode,
     Sensor,
     Viewer,
 )
-from pyunifiprotect.data.types import ChimeType, MountType
 import voluptuous as vol
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription

homeassistant/components/unifiprotect/switch.py

@@ -5,8 +5,12 @@ from dataclasses import dataclass
 import logging
 from typing import Any
 
-from pyunifiprotect.data import Camera, RecordingMode, VideoMode
+from pyunifiprotect.data import (
-from pyunifiprotect.data.base import ProtectAdoptableDeviceModel
+    Camera,
+    ProtectAdoptableDeviceModel,
+    RecordingMode,
+    VideoMode,
+)
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry

requirements_all.txt

@@ -1984,7 +1984,7 @@ pytrafikverket==0.2.0.1
 pyudev==0.22.0
 
 # homeassistant.components.unifiprotect
-pyunifiprotect==3.5.1
+pyunifiprotect==3.6.0
 
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0

requirements_test_all.txt

@@ -1313,7 +1313,7 @@ pytrafikverket==0.2.0.1
 pyudev==0.22.0
 
 # homeassistant.components.unifiprotect
-pyunifiprotect==3.5.1
+pyunifiprotect==3.6.0
 
 # homeassistant.components.uptimerobot
 pyuptimerobot==22.2.0

tests/components/unifiprotect/conftest.py

@@ -17,11 +17,11 @@ from pyunifiprotect.data import (
     Doorlock,
     Light,
     Liveview,
+    ProtectAdoptableDeviceModel,
     Sensor,
     Viewer,
     WSSubscriptionMessage,
 )
-from pyunifiprotect.data.base import ProtectAdoptableDeviceModel
 
 from homeassistant.components.unifiprotect.const import DOMAIN
 from homeassistant.const import Platform

tests/components/unifiprotect/test_camera.py

@@ -6,9 +6,7 @@ from copy import copy
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-from pyunifiprotect.data import Camera as ProtectCamera
+from pyunifiprotect.data import Camera as ProtectCamera, CameraChannel, StateType
-from pyunifiprotect.data.devices import CameraChannel
-from pyunifiprotect.data.types import StateType
 from pyunifiprotect.exceptions import NvrError
 
 from homeassistant.components.camera import (

tests/components/unifiprotect/test_config_flow.py

@@ -7,7 +7,7 @@ from unittest.mock import patch
 
 import pytest
 from pyunifiprotect import NotAuthorized, NvrError
-from pyunifiprotect.data.nvr import NVR
+from pyunifiprotect.data import NVR
 
 from homeassistant import config_entries
 from homeassistant.components import dhcp, ssdp

tests/components/unifiprotect/test_lock.py

@@ -6,8 +6,7 @@ from copy import copy
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-from pyunifiprotect.data import Doorlock
+from pyunifiprotect.data import Doorlock, LockStatusType
-from pyunifiprotect.data.types import LockStatusType
 
 from homeassistant.components.unifiprotect.const import DEFAULT_ATTRIBUTION
 from homeassistant.const import (

tests/components/unifiprotect/test_select.py

@@ -7,16 +7,19 @@ from datetime import timedelta
 from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
-from pyunifiprotect.data import Camera, Light
+from pyunifiprotect.data import (
-from pyunifiprotect.data.devices import LCDMessage, Viewer
+    Camera,
-from pyunifiprotect.data.nvr import DoorbellMessage, Liveview
-from pyunifiprotect.data.types import (
     DoorbellMessageType,
     IRLEDMode,
+    LCDMessage,
+    Light,
     LightModeEnableType,
     LightModeType,
+    Liveview,
     RecordingMode,
+    Viewer,
 )
+from pyunifiprotect.data.nvr import DoorbellMessage
 
 from homeassistant.components.select.const import ATTR_OPTIONS
 from homeassistant.components.unifiprotect.const import (

tests/components/unifiprotect/test_sensor.py

@@ -7,10 +7,16 @@ from datetime import datetime, timedelta
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-from pyunifiprotect.data import NVR, Camera, Event, Sensor
+from pyunifiprotect.data import (
+    NVR,
+    Camera,
+    Event,
+    EventType,
+    Sensor,
+    SmartDetectObjectType,
+)
 from pyunifiprotect.data.base import WifiConnectionState, WiredConnectionState
 from pyunifiprotect.data.nvr import EventMetadata
-from pyunifiprotect.data.types import EventType, SmartDetectObjectType
 
 from homeassistant.components.unifiprotect.const import (
     ATTR_EVENT_SCORE,

tests/components/unifiprotect/test_switch.py

@@ -5,8 +5,13 @@ from __future__ import annotations
 from unittest.mock import AsyncMock, Mock
 
 import pytest
-from pyunifiprotect.data import Camera, Light
+from pyunifiprotect.data import (
-from pyunifiprotect.data.types import RecordingMode, SmartDetectObjectType, VideoMode
+    Camera,
+    Light,
+    RecordingMode,
+    SmartDetectObjectType,
+    VideoMode,
+)
 
 from homeassistant.components.unifiprotect.const import DEFAULT_ATTRIBUTION
 from homeassistant.components.unifiprotect.switch import (