diff --git a/homeassistant/components/alexa_devices/binary_sensor.py b/homeassistant/components/alexa_devices/binary_sensor.py index dd8be49f521..0e44416aff7 100644 --- a/homeassistant/components/alexa_devices/binary_sensor.py +++ b/homeassistant/components/alexa_devices/binary_sensor.py @@ -6,8 +6,8 @@ from collections.abc import Callable from dataclasses import dataclass from typing import Final -from aioamazondevices.api import AmazonDevice -from aioamazondevices.const import SENSOR_STATE_OFF +from aioamazondevices.const.metadata import SENSOR_STATE_OFF +from aioamazondevices.structures import AmazonDevice from homeassistant.components.binary_sensor import ( DOMAIN as BINARY_SENSOR_DOMAIN, diff --git a/homeassistant/components/alexa_devices/coordinator.py b/homeassistant/components/alexa_devices/coordinator.py index 6ce21aa2216..a6b3831c4c1 100644 --- a/homeassistant/components/alexa_devices/coordinator.py +++ b/homeassistant/components/alexa_devices/coordinator.py @@ -2,12 +2,13 @@ from datetime import timedelta -from aioamazondevices.api import AmazonDevice, AmazonEchoApi +from aioamazondevices.api import AmazonEchoApi from aioamazondevices.exceptions import ( CannotAuthenticate, CannotConnect, CannotRetrieveData, ) +from aioamazondevices.structures import AmazonDevice from aiohttp import ClientSession from homeassistant.config_entries import ConfigEntry diff --git a/homeassistant/components/alexa_devices/diagnostics.py b/homeassistant/components/alexa_devices/diagnostics.py index 938a20fb218..8d868edecc2 100644 --- a/homeassistant/components/alexa_devices/diagnostics.py +++ b/homeassistant/components/alexa_devices/diagnostics.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import Any -from aioamazondevices.api import AmazonDevice +from aioamazondevices.structures import AmazonDevice from homeassistant.components.diagnostics import async_redact_data from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME diff --git a/homeassistant/components/alexa_devices/entity.py b/homeassistant/components/alexa_devices/entity.py index f539079602f..bb3ae900b09 100644 --- a/homeassistant/components/alexa_devices/entity.py +++ b/homeassistant/components/alexa_devices/entity.py @@ -1,7 +1,7 @@ """Defines a base Alexa Devices entity.""" -from aioamazondevices.api import AmazonDevice -from aioamazondevices.const import SPEAKER_GROUP_MODEL +from aioamazondevices.const.devices import SPEAKER_GROUP_MODEL +from aioamazondevices.structures import AmazonDevice from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.entity import EntityDescription diff --git a/homeassistant/components/alexa_devices/manifest.json b/homeassistant/components/alexa_devices/manifest.json index 2d97093d2d7..155acf5b81a 100644 --- a/homeassistant/components/alexa_devices/manifest.json +++ b/homeassistant/components/alexa_devices/manifest.json @@ -8,5 +8,5 @@ "iot_class": "cloud_polling", "loggers": ["aioamazondevices"], "quality_scale": "platinum", - "requirements": ["aioamazondevices==6.5.6"] + "requirements": ["aioamazondevices==8.0.1"] } diff --git a/homeassistant/components/alexa_devices/notify.py b/homeassistant/components/alexa_devices/notify.py index d046b580cb7..99a0a12d4f5 100644 --- a/homeassistant/components/alexa_devices/notify.py +++ b/homeassistant/components/alexa_devices/notify.py @@ -6,8 +6,9 @@ from collections.abc import Awaitable, Callable from dataclasses import dataclass from typing import Any, Final -from aioamazondevices.api import AmazonDevice, AmazonEchoApi -from aioamazondevices.const import SPEAKER_GROUP_FAMILY +from aioamazondevices.api import AmazonEchoApi +from aioamazondevices.const.devices import SPEAKER_GROUP_FAMILY +from aioamazondevices.structures import AmazonDevice from homeassistant.components.notify import NotifyEntity, NotifyEntityDescription from homeassistant.core import HomeAssistant diff --git a/homeassistant/components/alexa_devices/sensor.py b/homeassistant/components/alexa_devices/sensor.py index 015b29b3067..383763f0614 100644 --- a/homeassistant/components/alexa_devices/sensor.py +++ b/homeassistant/components/alexa_devices/sensor.py @@ -7,12 +7,12 @@ from dataclasses import dataclass from datetime import datetime from typing import Final -from aioamazondevices.api import AmazonDevice -from aioamazondevices.const import ( +from aioamazondevices.const.schedules import ( NOTIFICATION_ALARM, NOTIFICATION_REMINDER, NOTIFICATION_TIMER, ) +from aioamazondevices.structures import AmazonDevice from homeassistant.components.sensor import ( SensorDeviceClass, diff --git a/homeassistant/components/alexa_devices/services.py b/homeassistant/components/alexa_devices/services.py index 9d225a7beac..f49a4c1d5a7 100644 --- a/homeassistant/components/alexa_devices/services.py +++ b/homeassistant/components/alexa_devices/services.py @@ -1,6 +1,6 @@ """Support for services.""" -from aioamazondevices.sounds import SOUNDS_LIST +from aioamazondevices.const.sounds import SOUNDS_LIST import voluptuous as vol from homeassistant.config_entries import ConfigEntryState diff --git a/homeassistant/components/alexa_devices/switch.py b/homeassistant/components/alexa_devices/switch.py index 5acaa8c2dd0..28b356f11fd 100644 --- a/homeassistant/components/alexa_devices/switch.py +++ b/homeassistant/components/alexa_devices/switch.py @@ -6,7 +6,7 @@ from collections.abc import Callable from dataclasses import dataclass from typing import TYPE_CHECKING, Any, Final -from aioamazondevices.api import AmazonDevice +from aioamazondevices.structures import AmazonDevice from homeassistant.components.switch import ( DOMAIN as SWITCH_DOMAIN, diff --git a/homeassistant/components/alexa_devices/utils.py b/homeassistant/components/alexa_devices/utils.py index 3fbba539a6a..d86f1c9e760 100644 --- a/homeassistant/components/alexa_devices/utils.py +++ b/homeassistant/components/alexa_devices/utils.py @@ -4,7 +4,7 @@ from collections.abc import Awaitable, Callable, Coroutine from functools import wraps from typing import Any, Concatenate -from aioamazondevices.const import SPEAKER_GROUP_FAMILY +from aioamazondevices.const.devices import SPEAKER_GROUP_FAMILY from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN diff --git a/requirements_all.txt b/requirements_all.txt index e86d55682cb..b8c6cffdb09 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -190,7 +190,7 @@ aioairzone-cloud==0.7.2 aioairzone==1.0.2 # homeassistant.components.alexa_devices -aioamazondevices==6.5.6 +aioamazondevices==8.0.1 # homeassistant.components.ambient_network # homeassistant.components.ambient_station diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 1c41ec9dc51..3754f7c5c78 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -178,7 +178,7 @@ aioairzone-cloud==0.7.2 aioairzone==1.0.2 # homeassistant.components.alexa_devices -aioamazondevices==6.5.6 +aioamazondevices==8.0.1 # homeassistant.components.ambient_network # homeassistant.components.ambient_station diff --git a/tests/components/alexa_devices/conftest.py b/tests/components/alexa_devices/conftest.py index bed7abc3e33..99b9654e24b 100644 --- a/tests/components/alexa_devices/conftest.py +++ b/tests/components/alexa_devices/conftest.py @@ -4,7 +4,7 @@ from collections.abc import Generator from copy import deepcopy from unittest.mock import AsyncMock, patch -from aioamazondevices.const import DEVICE_TYPE_TO_MODEL +from aioamazondevices.const.devices import DEVICE_TYPE_TO_MODEL import pytest from homeassistant.components.alexa_devices.const import ( diff --git a/tests/components/alexa_devices/const.py b/tests/components/alexa_devices/const.py index 11cb9b0d085..a36136bdead 100644 --- a/tests/components/alexa_devices/const.py +++ b/tests/components/alexa_devices/const.py @@ -2,12 +2,12 @@ from datetime import UTC, datetime -from aioamazondevices.api import AmazonDevice, AmazonDeviceSensor, AmazonSchedule -from aioamazondevices.const import ( +from aioamazondevices.const.schedules import ( NOTIFICATION_ALARM, NOTIFICATION_REMINDER, NOTIFICATION_TIMER, ) +from aioamazondevices.structures import AmazonDevice, AmazonDeviceSensor, AmazonSchedule TEST_CODE = "023123" TEST_PASSWORD = "fake_password" diff --git a/tests/components/alexa_devices/snapshots/test_diagnostics.ambr b/tests/components/alexa_devices/snapshots/test_diagnostics.ambr index 3a879360d47..581037a4007 100644 --- a/tests/components/alexa_devices/snapshots/test_diagnostics.ambr +++ b/tests/components/alexa_devices/snapshots/test_diagnostics.ambr @@ -14,11 +14,11 @@ 'online': True, 'sensors': dict({ 'dnd': dict({ - '__type': "", + '__type': "", 'repr': "AmazonDeviceSensor(name='dnd', value=False, error=False, error_type=None, error_msg=None, scale=None)", }), 'temperature': dict({ - '__type': "", + '__type': "", 'repr': "AmazonDeviceSensor(name='temperature', value='22.5', error=False, error_type=None, error_msg=None, scale='CELSIUS')", }), }), @@ -44,11 +44,11 @@ 'online': True, 'sensors': dict({ 'dnd': dict({ - '__type': "", + '__type': "", 'repr': "AmazonDeviceSensor(name='dnd', value=False, error=False, error_type=None, error_msg=None, scale=None)", }), 'temperature': dict({ - '__type': "", + '__type': "", 'repr': "AmazonDeviceSensor(name='temperature', value='22.5', error=False, error_type=None, error_msg=None, scale='CELSIUS')", }), }), diff --git a/tests/components/alexa_devices/test_utils.py b/tests/components/alexa_devices/test_utils.py index 3424227673c..38c6d340a3f 100644 --- a/tests/components/alexa_devices/test_utils.py +++ b/tests/components/alexa_devices/test_utils.py @@ -2,7 +2,7 @@ from unittest.mock import AsyncMock -from aioamazondevices.const import SPEAKER_GROUP_FAMILY, SPEAKER_GROUP_MODEL +from aioamazondevices.const.devices import SPEAKER_GROUP_FAMILY, SPEAKER_GROUP_MODEL from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData import pytest