diff --git a/homeassistant/components/lastfm/__init__.py b/homeassistant/components/lastfm/__init__.py index 8611d06eee1daf..b5a4612429eb10 100644 --- a/homeassistant/components/lastfm/__init__.py +++ b/homeassistant/components/lastfm/__init__.py @@ -2,19 +2,18 @@ from __future__ import annotations -from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant -from .const import DOMAIN, PLATFORMS -from .coordinator import LastFMDataUpdateCoordinator +from .const import PLATFORMS +from .coordinator import LastFMConfigEntry, LastFMDataUpdateCoordinator -async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_setup_entry(hass: HomeAssistant, entry: LastFMConfigEntry) -> bool: """Set up lastfm from a config entry.""" coordinator = LastFMDataUpdateCoordinator(hass, entry) await coordinator.async_config_entry_first_refresh() - hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator + entry.runtime_data = coordinator await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) entry.async_on_unload(entry.add_update_listener(update_listener)) @@ -22,12 +21,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: return True -async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: +async def async_unload_entry(hass: HomeAssistant, entry: LastFMConfigEntry) -> bool: """Unload lastfm config entry.""" - return await hass.config_entries.async_unload_platforms(entry, PLATFORMS) -async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None: +async def update_listener(hass: HomeAssistant, entry: LastFMConfigEntry) -> None: """Handle options update.""" await hass.config_entries.async_reload(entry.entry_id) diff --git a/homeassistant/components/lastfm/config_flow.py b/homeassistant/components/lastfm/config_flow.py index ca40aebd0d4785..422c50a5fb9774 100644 --- a/homeassistant/components/lastfm/config_flow.py +++ b/homeassistant/components/lastfm/config_flow.py @@ -8,12 +8,7 @@ from pylast import LastFMNetwork, PyLastError, User, WSError import voluptuous as vol -from homeassistant.config_entries import ( - ConfigEntry, - ConfigFlow, - ConfigFlowResult, - OptionsFlow, -) +from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow from homeassistant.const import CONF_API_KEY from homeassistant.core import callback from homeassistant.helpers.selector import ( @@ -23,6 +18,7 @@ ) from .const import CONF_MAIN_USER, CONF_USERS, DOMAIN +from .coordinator import LastFMConfigEntry PLACEHOLDERS = {"api_account_url": "https://www.last.fm/api/account/create"} @@ -81,7 +77,7 @@ class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN): @staticmethod @callback def async_get_options_flow( - config_entry: ConfigEntry, + config_entry: LastFMConfigEntry, ) -> LastFmOptionsFlowHandler: """Get the options flow for this handler.""" return LastFmOptionsFlowHandler() @@ -162,6 +158,8 @@ async def async_step_friends( class LastFmOptionsFlowHandler(OptionsFlow): """LastFm Options flow handler.""" + config_entry: LastFMConfigEntry + async def async_step_init( self, user_input: dict[str, Any] | None = None ) -> ConfigFlowResult: diff --git a/homeassistant/components/lastfm/coordinator.py b/homeassistant/components/lastfm/coordinator.py index ae89e103b80c98..ca3c7eda5087c9 100644 --- a/homeassistant/components/lastfm/coordinator.py +++ b/homeassistant/components/lastfm/coordinator.py @@ -14,6 +14,8 @@ from .const import CONF_USERS, DOMAIN, LOGGER +type LastFMConfigEntry = ConfigEntry[LastFMDataUpdateCoordinator] + def format_track(track: Track | None) -> str | None: """Format the track.""" diff --git a/homeassistant/components/lastfm/sensor.py b/homeassistant/components/lastfm/sensor.py index 89025583e92a16..0f4d22ba503dd0 100644 --- a/homeassistant/components/lastfm/sensor.py +++ b/homeassistant/components/lastfm/sensor.py @@ -6,7 +6,6 @@ from typing import Any from homeassistant.components.sensor import SensorEntity -from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback @@ -21,17 +20,17 @@ DOMAIN, STATE_NOT_SCROBBLING, ) -from .coordinator import LastFMDataUpdateCoordinator, LastFMUserData +from .coordinator import LastFMConfigEntry, LastFMDataUpdateCoordinator, LastFMUserData async def async_setup_entry( hass: HomeAssistant, - entry: ConfigEntry, + entry: LastFMConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback, ) -> None: """Initialize the entries.""" - coordinator: LastFMDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id] + coordinator = entry.runtime_data async_add_entities( ( LastFmSensor(coordinator, username, entry.entry_id) diff --git a/homeassistant/components/rachio/calendar.py b/homeassistant/components/rachio/calendar.py index 18b1b6a4d8fae7..a8b593e1138bcc 100644 --- a/homeassistant/components/rachio/calendar.py +++ b/homeassistant/components/rachio/calendar.py @@ -16,10 +16,8 @@ from homeassistant.util import dt as dt_util from .const import ( - KEY_ADDRESS, KEY_DURATION_SECONDS, KEY_ID, - KEY_LOCALITY, KEY_PROGRAM_ID, KEY_PROGRAM_NAME, KEY_RUN_SUMMARIES, @@ -65,7 +63,6 @@ def __init__( super().__init__(coordinator) self.base_station = base_station self._event: CalendarEvent | None = None - self._location = coordinator.base_station[KEY_ADDRESS][KEY_LOCALITY] self._attr_translation_placeholders = { "base": coordinator.base_station[KEY_SERIAL_NUMBER] } @@ -87,7 +84,6 @@ def event(self) -> CalendarEvent | None: end=dt_util.as_local(start_time) + timedelta(seconds=int(event[KEY_TOTAL_RUN_DURATION])), description=valves, - location=self._location, ) def _handle_upcoming_event(self) -> dict[str, Any] | None: @@ -155,7 +151,6 @@ async def async_get_events( start=event_start, end=event_end, description=valves, - location=self._location, uid=f"{run[KEY_PROGRAM_ID]}/{run[KEY_START_TIME]}", ) event_list.append(event) diff --git a/homeassistant/components/rachio/const.py b/homeassistant/components/rachio/const.py index 08a09f309f64de..64b26526f57aa2 100644 --- a/homeassistant/components/rachio/const.py +++ b/homeassistant/components/rachio/const.py @@ -75,8 +75,6 @@ KEY_PROGRAM_NAME = "programName" KEY_PROGRAM_RUN_SUMMARIES = "valveProgramRunSummaries" KEY_TOTAL_RUN_DURATION = "totalRunDurationSeconds" -KEY_ADDRESS = "address" -KEY_LOCALITY = "locality" KEY_SKIP = "skip" KEY_SKIPPABLE = "skippable" diff --git a/homeassistant/components/russound_rio/__init__.py b/homeassistant/components/russound_rio/__init__.py index 51ca9a9b1eafb1..ddaa83632df773 100644 --- a/homeassistant/components/russound_rio/__init__.py +++ b/homeassistant/components/russound_rio/__init__.py @@ -14,7 +14,7 @@ from .const import DOMAIN, RUSSOUND_RIO_EXCEPTIONS -PLATFORMS = [Platform.MEDIA_PLAYER, Platform.NUMBER] +PLATFORMS = [Platform.MEDIA_PLAYER, Platform.NUMBER, Platform.SWITCH] _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/russound_rio/icons.json b/homeassistant/components/russound_rio/icons.json new file mode 100644 index 00000000000000..7d4ddc4cf98d2a --- /dev/null +++ b/homeassistant/components/russound_rio/icons.json @@ -0,0 +1,12 @@ +{ + "entity": { + "switch": { + "loudness": { + "default": "mdi:volume-high", + "state": { + "off": "mdi:volume-low" + } + } + } + } +} diff --git a/homeassistant/components/russound_rio/strings.json b/homeassistant/components/russound_rio/strings.json index 37f78bfa75d1eb..aa9a1cbc65da0c 100644 --- a/homeassistant/components/russound_rio/strings.json +++ b/homeassistant/components/russound_rio/strings.json @@ -54,6 +54,11 @@ "turn_on_volume": { "name": "Turn-on volume" } + }, + "switch": { + "loudness": { + "name": "Loudness" + } } }, "exceptions": { diff --git a/homeassistant/components/russound_rio/switch.py b/homeassistant/components/russound_rio/switch.py new file mode 100644 index 00000000000000..20ee82ebb5bc63 --- /dev/null +++ b/homeassistant/components/russound_rio/switch.py @@ -0,0 +1,85 @@ +"""Support for Russound RIO switch entities.""" + +from collections.abc import Awaitable, Callable +from dataclasses import dataclass +from typing import Any + +from aiorussound.rio import Controller, ZoneControlSurface + +from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription +from homeassistant.const import EntityCategory +from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback + +from . import RussoundConfigEntry +from .entity import RussoundBaseEntity, command + +PARALLEL_UPDATES = 0 + + +@dataclass(frozen=True, kw_only=True) +class RussoundZoneSwitchEntityDescription(SwitchEntityDescription): + """Describes Russound RIO switch entity description.""" + + value_fn: Callable[[ZoneControlSurface], bool] + set_value_fn: Callable[[ZoneControlSurface, bool], Awaitable[None]] + + +CONTROL_ENTITIES: tuple[RussoundZoneSwitchEntityDescription, ...] = ( + RussoundZoneSwitchEntityDescription( + key="loudness", + translation_key="loudness", + entity_category=EntityCategory.CONFIG, + value_fn=lambda zone: zone.loudness, + set_value_fn=lambda zone, value: zone.set_loudness(value), + ), +) + + +async def async_setup_entry( + hass: HomeAssistant, + entry: RussoundConfigEntry, + async_add_entities: AddConfigEntryEntitiesCallback, +) -> None: + """Set up Russound RIO switch entities based on a config entry.""" + client = entry.runtime_data + async_add_entities( + RussoundSwitchEntity(controller, zone_id, description) + for controller in client.controllers.values() + for zone_id in controller.zones + for description in CONTROL_ENTITIES + ) + + +class RussoundSwitchEntity(RussoundBaseEntity, SwitchEntity): + """Defines a Russound RIO switch entity.""" + + entity_description: RussoundZoneSwitchEntityDescription + + def __init__( + self, + controller: Controller, + zone_id: int, + description: RussoundZoneSwitchEntityDescription, + ) -> None: + """Initialize Russound RIO switch.""" + super().__init__(controller, zone_id) + self.entity_description = description + self._attr_unique_id = ( + f"{self._primary_mac_address}-{self._zone.device_str}-{description.key}" + ) + + @property + def is_on(self) -> bool: + """Return the state of the switch.""" + return self.entity_description.value_fn(self._zone) + + @command + async def async_turn_on(self, **kwargs: Any) -> None: + """Turn the switch on.""" + await self.entity_description.set_value_fn(self._zone, True) + + @command + async def async_turn_off(self, **kwargs: Any) -> None: + """Turn the switch off.""" + await self.entity_description.set_value_fn(self._zone, False) diff --git a/homeassistant/components/unifi/button.py b/homeassistant/components/unifi/button.py index 3e5ef62f49e26c..470f0091fffd2d 100644 --- a/homeassistant/components/unifi/button.py +++ b/homeassistant/components/unifi/button.py @@ -11,11 +11,11 @@ from typing import TYPE_CHECKING, Any import aiounifi -from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.interfaces.api_handlers import APIHandler, ItemEvent from aiounifi.interfaces.devices import Devices from aiounifi.interfaces.ports import Ports from aiounifi.interfaces.wlans import Wlans -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.device import ( Device, DevicePowerCyclePortRequest, @@ -35,7 +35,6 @@ from . import UnifiConfigEntry from .entity import ( - HandlerT, UnifiEntity, UnifiEntityDescription, async_device_available_fn, @@ -81,7 +80,7 @@ async def async_regenerate_password_control_fn( @dataclass(frozen=True, kw_only=True) -class UnifiButtonEntityDescription( +class UnifiButtonEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( ButtonEntityDescription, UnifiEntityDescription[HandlerT, ApiItemT] ): """Class describing UniFi button entity.""" @@ -143,7 +142,9 @@ async def async_setup_entry( ) -class UnifiButtonEntity(UnifiEntity[HandlerT, ApiItemT], ButtonEntity): +class UnifiButtonEntity[HandlerT: APIHandler, ApiItemT: ApiItem]( + UnifiEntity[HandlerT, ApiItemT], ButtonEntity +): """Base representation of a UniFi button.""" entity_description: UnifiButtonEntityDescription[HandlerT, ApiItemT] diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py index 1084c29e75f11d..8d82c7334c6aad 100644 --- a/homeassistant/components/unifi/device_tracker.py +++ b/homeassistant/components/unifi/device_tracker.py @@ -9,10 +9,10 @@ from typing import Any import aiounifi -from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.interfaces.api_handlers import APIHandler, ItemEvent from aiounifi.interfaces.clients import Clients from aiounifi.interfaces.devices import Devices -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.client import Client from aiounifi.models.device import Device from aiounifi.models.event import Event, EventKey @@ -31,12 +31,7 @@ from . import UnifiConfigEntry from .const import DOMAIN -from .entity import ( - HandlerT, - UnifiEntity, - UnifiEntityDescription, - async_device_available_fn, -) +from .entity import UnifiEntity, UnifiEntityDescription, async_device_available_fn from .hub import UnifiHub LOGGER = logging.getLogger(__name__) @@ -142,7 +137,7 @@ def async_device_heartbeat_timedelta_fn(hub: UnifiHub, obj_id: str) -> timedelta @dataclass(frozen=True, kw_only=True) -class UnifiTrackerEntityDescription( +class UnifiTrackerEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( UnifiEntityDescription[HandlerT, ApiItemT], ScannerEntityDescription ): """Class describing UniFi device tracker entity.""" @@ -229,7 +224,9 @@ async def async_setup_entry( ) -class UnifiScannerEntity(UnifiEntity[HandlerT, ApiItemT], ScannerEntity): +class UnifiScannerEntity[HandlerT: APIHandler, ApiItemT: ApiItem]( + UnifiEntity[HandlerT, ApiItemT], ScannerEntity +): """Representation of a UniFi scanner.""" entity_description: UnifiTrackerEntityDescription diff --git a/homeassistant/components/unifi/entity.py b/homeassistant/components/unifi/entity.py index 1f9d5b304bcb4c..4b68287ce10f0f 100644 --- a/homeassistant/components/unifi/entity.py +++ b/homeassistant/components/unifi/entity.py @@ -5,7 +5,7 @@ from abc import abstractmethod from collections.abc import Callable from dataclasses import dataclass -from typing import TYPE_CHECKING, Generic, TypeVar +from typing import TYPE_CHECKING import aiounifi from aiounifi.interfaces.api_handlers import ( @@ -14,7 +14,7 @@ ItemEvent, UnsubscribeType, ) -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.event import Event, EventKey from homeassistant.core import callback @@ -32,8 +32,7 @@ if TYPE_CHECKING: from .hub import UnifiHub -HandlerT = TypeVar("HandlerT", bound=APIHandler) -SubscriptionT = Callable[[CallbackType, ItemEvent], UnsubscribeType] +type SubscriptionType = Callable[[CallbackType, ItemEvent], UnsubscribeType] @callback @@ -95,7 +94,9 @@ def async_client_device_info_fn(hub: UnifiHub, obj_id: str) -> DeviceInfo: @dataclass(frozen=True, kw_only=True) -class UnifiEntityDescription(EntityDescription, Generic[HandlerT, ApiItemT]): +class UnifiEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( + EntityDescription +): """UniFi Entity Description.""" api_handler_fn: Callable[[aiounifi.Controller], HandlerT] @@ -128,7 +129,7 @@ class UnifiEntityDescription(EntityDescription, Generic[HandlerT, ApiItemT]): """If entity needs to do regular checks on state.""" -class UnifiEntity(Entity, Generic[HandlerT, ApiItemT]): +class UnifiEntity[HandlerT: APIHandler, ApiItemT: ApiItem](Entity): """Representation of a UniFi entity.""" entity_description: UnifiEntityDescription[HandlerT, ApiItemT] diff --git a/homeassistant/components/unifi/image.py b/homeassistant/components/unifi/image.py index f3045d5fc1c350..842e9732b5e833 100644 --- a/homeassistant/components/unifi/image.py +++ b/homeassistant/components/unifi/image.py @@ -8,9 +8,9 @@ from collections.abc import Callable from dataclasses import dataclass -from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.interfaces.api_handlers import APIHandler, ItemEvent from aiounifi.interfaces.wlans import Wlans -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.wlan import Wlan from homeassistant.components.image import ImageEntity, ImageEntityDescription @@ -21,7 +21,6 @@ from . import UnifiConfigEntry from .entity import ( - HandlerT, UnifiEntity, UnifiEntityDescription, async_wlan_available_fn, @@ -37,7 +36,7 @@ def async_wlan_qr_code_image_fn(hub: UnifiHub, wlan: Wlan) -> bytes: @dataclass(frozen=True, kw_only=True) -class UnifiImageEntityDescription( +class UnifiImageEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( ImageEntityDescription, UnifiEntityDescription[HandlerT, ApiItemT] ): """Class describing UniFi image entity.""" @@ -75,7 +74,9 @@ async def async_setup_entry( ) -class UnifiImageEntity(UnifiEntity[HandlerT, ApiItemT], ImageEntity): +class UnifiImageEntity[HandlerT: APIHandler, ApiItemT: ApiItem]( + UnifiEntity[HandlerT, ApiItemT], ImageEntity +): """Base representation of a UniFi image.""" entity_description: UnifiImageEntityDescription[HandlerT, ApiItemT] diff --git a/homeassistant/components/unifi/sensor.py b/homeassistant/components/unifi/sensor.py index 47a2c2ba62e2b0..f91a8797d5e6ae 100644 --- a/homeassistant/components/unifi/sensor.py +++ b/homeassistant/components/unifi/sensor.py @@ -13,13 +13,13 @@ from functools import partial from typing import TYPE_CHECKING, Literal -from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.interfaces.api_handlers import APIHandler, ItemEvent from aiounifi.interfaces.clients import Clients from aiounifi.interfaces.devices import Devices from aiounifi.interfaces.outlets import Outlets from aiounifi.interfaces.ports import Ports from aiounifi.interfaces.wlans import Wlans -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.client import Client from aiounifi.models.device import ( Device, @@ -53,7 +53,6 @@ from . import UnifiConfigEntry from .const import DEVICE_STATES from .entity import ( - HandlerT, UnifiEntity, UnifiEntityDescription, async_client_device_info_fn, @@ -356,7 +355,7 @@ def make_device_temperature_entity_description( @dataclass(frozen=True, kw_only=True) -class UnifiSensorEntityDescription( +class UnifiSensorEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( SensorEntityDescription, UnifiEntityDescription[HandlerT, ApiItemT] ): """Class describing UniFi sensor entity.""" @@ -652,7 +651,9 @@ async def async_setup_entry( ) -class UnifiSensorEntity(UnifiEntity[HandlerT, ApiItemT], SensorEntity): +class UnifiSensorEntity[HandlerT: APIHandler, ApiItemT: ApiItem]( + UnifiEntity[HandlerT, ApiItemT], SensorEntity +): """Base representation of a UniFi sensor.""" entity_description: UnifiSensorEntityDescription[HandlerT, ApiItemT] diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py index 95c7736e0d7e9e..1ca409bec774b3 100644 --- a/homeassistant/components/unifi/switch.py +++ b/homeassistant/components/unifi/switch.py @@ -15,7 +15,7 @@ from typing import TYPE_CHECKING, Any import aiounifi -from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.interfaces.api_handlers import APIHandler, ItemEvent from aiounifi.interfaces.clients import Clients from aiounifi.interfaces.dpi_restriction_groups import DPIRestrictionGroups from aiounifi.interfaces.firewall_policies import FirewallPolicies @@ -25,7 +25,7 @@ from aiounifi.interfaces.traffic_routes import TrafficRoutes from aiounifi.interfaces.traffic_rules import TrafficRules from aiounifi.interfaces.wlans import Wlans -from aiounifi.models.api import ApiItemT +from aiounifi.models.api import ApiItem from aiounifi.models.client import Client, ClientBlockRequest from aiounifi.models.device import DeviceSetOutletRelayRequest from aiounifi.models.dpi_restriction_app import DPIRestrictionAppEnableRequest @@ -54,8 +54,7 @@ from . import UnifiConfigEntry from .const import ATTR_MANUFACTURER, DOMAIN from .entity import ( - HandlerT, - SubscriptionT, + SubscriptionType, UnifiEntity, UnifiEntityDescription, async_client_device_info_fn, @@ -209,7 +208,7 @@ async def async_wlan_control_fn(hub: UnifiHub, obj_id: str, target: bool) -> Non @dataclass(frozen=True, kw_only=True) -class UnifiSwitchEntityDescription( +class UnifiSwitchEntityDescription[HandlerT: APIHandler, ApiItemT: ApiItem]( SwitchEntityDescription, UnifiEntityDescription[HandlerT, ApiItemT] ): """Class describing UniFi switch entity.""" @@ -218,7 +217,7 @@ class UnifiSwitchEntityDescription( is_on_fn: Callable[[UnifiHub, ApiItemT], bool] # Optional - custom_subscribe: Callable[[aiounifi.Controller], SubscriptionT] | None = None + custom_subscribe: Callable[[aiounifi.Controller], SubscriptionType] | None = None """Callback for additional subscriptions to any UniFi handler.""" only_event_for_state_change: bool = False """Use only UniFi events to trigger state changes.""" @@ -397,7 +396,9 @@ async def async_setup_entry( ) -class UnifiSwitchEntity(UnifiEntity[HandlerT, ApiItemT], SwitchEntity): +class UnifiSwitchEntity[HandlerT: APIHandler, ApiItemT: ApiItem]( + UnifiEntity[HandlerT, ApiItemT], SwitchEntity +): """Base representation of a UniFi switch.""" entity_description: UnifiSwitchEntityDescription[HandlerT, ApiItemT] diff --git a/homeassistant/components/unifi/update.py b/homeassistant/components/unifi/update.py index 589b2ff1215e15..a53700ef969086 100644 --- a/homeassistant/components/unifi/update.py +++ b/homeassistant/components/unifi/update.py @@ -5,7 +5,7 @@ from collections.abc import Callable, Coroutine from dataclasses import dataclass import logging -from typing import Any, TypeVar +from typing import Any import aiounifi from aiounifi.interfaces.api_handlers import ItemEvent @@ -31,9 +31,6 @@ LOGGER = logging.getLogger(__name__) -_DataT = TypeVar("_DataT", bound=Device) -_HandlerT = TypeVar("_HandlerT", bound=Devices) - async def async_device_control_fn(api: aiounifi.Controller, obj_id: str) -> None: """Control upgrade of device.""" @@ -41,7 +38,7 @@ async def async_device_control_fn(api: aiounifi.Controller, obj_id: str) -> None @dataclass(frozen=True, kw_only=True) -class UnifiUpdateEntityDescription( +class UnifiUpdateEntityDescription[_HandlerT: Devices, _DataT: Device]( UpdateEntityDescription, UnifiEntityDescription[_HandlerT, _DataT] ): """Class describing UniFi update entity.""" @@ -78,7 +75,9 @@ async def async_setup_entry( ) -class UnifiDeviceUpdateEntity(UnifiEntity[_HandlerT, _DataT], UpdateEntity): +class UnifiDeviceUpdateEntity[_HandlerT: Devices, _DataT: Device]( + UnifiEntity[_HandlerT, _DataT], UpdateEntity +): """Representation of a UniFi device update entity.""" entity_description: UnifiUpdateEntityDescription[_HandlerT, _DataT] diff --git a/tests/components/russound_rio/conftest.py b/tests/components/russound_rio/conftest.py index 5e57c45193b8a0..81091e1d5a8a55 100644 --- a/tests/components/russound_rio/conftest.py +++ b/tests/components/russound_rio/conftest.py @@ -83,6 +83,7 @@ def mock_russound_client() -> Generator[AsyncMock]: zone.set_bass = AsyncMock() zone.set_treble = AsyncMock() zone.set_turn_on_volume = AsyncMock() + zone.set_loudness = AsyncMock() client.controllers = { 1: Controller( diff --git a/tests/components/russound_rio/snapshots/test_switch.ambr b/tests/components/russound_rio/snapshots/test_switch.ambr new file mode 100644 index 00000000000000..38273b8233bf5f --- /dev/null +++ b/tests/components/russound_rio/snapshots/test_switch.ambr @@ -0,0 +1,193 @@ +# serializer version: 1 +# name: test_all_entities[switch.backyard_loudness-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': None, + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'switch', + 'entity_category': , + 'entity_id': 'switch.backyard_loudness', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Loudness', + 'platform': 'russound_rio', + 'previous_unique_id': None, + 'suggested_object_id': None, + 'supported_features': 0, + 'translation_key': 'loudness', + 'unique_id': '00:11:22:33:44:55-C[1].Z[1]-loudness', + 'unit_of_measurement': None, + }) +# --- +# name: test_all_entities[switch.backyard_loudness-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'friendly_name': 'Backyard Loudness', + }), + 'context': , + 'entity_id': 'switch.backyard_loudness', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'off', + }) +# --- +# name: test_all_entities[switch.bedroom_loudness-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': None, + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'switch', + 'entity_category': , + 'entity_id': 'switch.bedroom_loudness', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Loudness', + 'platform': 'russound_rio', + 'previous_unique_id': None, + 'suggested_object_id': None, + 'supported_features': 0, + 'translation_key': 'loudness', + 'unique_id': '00:11:22:33:44:55-C[1].Z[3]-loudness', + 'unit_of_measurement': None, + }) +# --- +# name: test_all_entities[switch.bedroom_loudness-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'friendly_name': 'Bedroom Loudness', + }), + 'context': , + 'entity_id': 'switch.bedroom_loudness', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'off', + }) +# --- +# name: test_all_entities[switch.kitchen_loudness-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': None, + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'switch', + 'entity_category': , + 'entity_id': 'switch.kitchen_loudness', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Loudness', + 'platform': 'russound_rio', + 'previous_unique_id': None, + 'suggested_object_id': None, + 'supported_features': 0, + 'translation_key': 'loudness', + 'unique_id': '00:11:22:33:44:55-C[1].Z[2]-loudness', + 'unit_of_measurement': None, + }) +# --- +# name: test_all_entities[switch.kitchen_loudness-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'friendly_name': 'Kitchen Loudness', + }), + 'context': , + 'entity_id': 'switch.kitchen_loudness', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'off', + }) +# --- +# name: test_all_entities[switch.living_room_loudness-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': None, + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'switch', + 'entity_category': , + 'entity_id': 'switch.living_room_loudness', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Loudness', + 'platform': 'russound_rio', + 'previous_unique_id': None, + 'suggested_object_id': None, + 'supported_features': 0, + 'translation_key': 'loudness', + 'unique_id': '00:11:22:33:44:55-C[2].Z[9]-loudness', + 'unit_of_measurement': None, + }) +# --- +# name: test_all_entities[switch.living_room_loudness-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'friendly_name': 'Living Room Loudness', + }), + 'context': , + 'entity_id': 'switch.living_room_loudness', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'off', + }) +# --- diff --git a/tests/components/russound_rio/test_switch.py b/tests/components/russound_rio/test_switch.py new file mode 100644 index 00000000000000..dadaae1df33ea4 --- /dev/null +++ b/tests/components/russound_rio/test_switch.py @@ -0,0 +1,64 @@ +"""Tests for the Russound RIO switch platform.""" + +from unittest.mock import AsyncMock, patch + +import pytest +from syrupy.assertion import SnapshotAssertion + +from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SERVICE_TURN_ON +from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, Platform +from homeassistant.core import HomeAssistant +from homeassistant.helpers import entity_registry as er + +from . import setup_integration + +from tests.common import MockConfigEntry, snapshot_platform + + +@pytest.mark.usefixtures("entity_registry_enabled_by_default") +async def test_all_entities( + hass: HomeAssistant, + snapshot: SnapshotAssertion, + mock_russound_client: AsyncMock, + mock_config_entry: MockConfigEntry, + entity_registry: er.EntityRegistry, +) -> None: + """Test all entities.""" + with patch("homeassistant.components.russound_rio.PLATFORMS", [Platform.SWITCH]): + await setup_integration(hass, mock_config_entry) + + await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id) + + +async def test_setting_value( + hass: HomeAssistant, + mock_russound_client: AsyncMock, + mock_config_entry: MockConfigEntry, +) -> None: + """Test setting value.""" + await setup_integration(hass, mock_config_entry) + + await hass.services.async_call( + SWITCH_DOMAIN, + SERVICE_TURN_ON, + { + ATTR_ENTITY_ID: "switch.backyard_loudness", + }, + blocking=True, + ) + mock_russound_client.controllers[1].zones[1].set_loudness.assert_called_once_with( + True + ) + mock_russound_client.controllers[1].zones[1].set_loudness.reset_mock() + + await hass.services.async_call( + SWITCH_DOMAIN, + SERVICE_TURN_OFF, + { + ATTR_ENTITY_ID: "switch.backyard_loudness", + }, + blocking=True, + ) + mock_russound_client.controllers[1].zones[1].set_loudness.assert_called_once_with( + False + )