diff --git a/homeassistant/components/fjaraskupan/__init__.py b/homeassistant/components/fjaraskupan/__init__.py index 28032b3f997..75086c631a1 100644 --- a/homeassistant/components/fjaraskupan/__init__.py +++ b/homeassistant/components/fjaraskupan/__init__.py @@ -1,7 +1,8 @@ """The Fjäråskupan integration.""" from __future__ import annotations -from collections.abc import Callable +from collections.abc import AsyncIterator, Callable +from contextlib import asynccontextmanager from dataclasses import dataclass from datetime import timedelta import logging @@ -14,6 +15,7 @@ from homeassistant.components.bluetooth import ( BluetoothScanningMode, BluetoothServiceInfoBleak, async_address_present, + async_ble_device_from_address, async_rediscover_address, async_register_callback, ) @@ -84,9 +86,20 @@ class Coordinator(DataUpdateCoordinator[State]): def detection_callback(self, service_info: BluetoothServiceInfoBleak) -> None: """Handle a new announcement of data.""" + self.device.device = service_info.device self.device.detection_callback(service_info.device, service_info.advertisement) self.async_set_updated_data(self.device.state) + @asynccontextmanager + async def async_connect_and_update(self) -> AsyncIterator[Device]: + """Provide an up to date device for use during connections.""" + if ble_device := async_ble_device_from_address(self.hass, self.device.address): + self.device.device = ble_device + async with self.device: + yield self.device + + self.async_set_updated_data(self.device.state) + @dataclass class EntryState: diff --git a/homeassistant/components/fjaraskupan/fan.py b/homeassistant/components/fjaraskupan/fan.py index 3642438d5d6..e0c18158088 100644 --- a/homeassistant/components/fjaraskupan/fan.py +++ b/homeassistant/components/fjaraskupan/fan.py @@ -8,7 +8,6 @@ from fjaraskupan import ( COMMAND_AFTERCOOKINGTIMERMANUAL, COMMAND_AFTERCOOKINGTIMEROFF, COMMAND_STOP_FAN, - Device, State, ) @@ -58,7 +57,7 @@ async def async_setup_entry( """Set up sensors dynamically through discovery.""" def _constructor(coordinator: Coordinator): - return [Fan(coordinator, coordinator.device, coordinator.device_info)] + return [Fan(coordinator, coordinator.device_info)] async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor) @@ -72,14 +71,12 @@ class Fan(CoordinatorEntity[Coordinator], FanEntity): def __init__( self, coordinator: Coordinator, - device: Device, device_info: DeviceInfo, ) -> None: """Init fan entity.""" super().__init__(coordinator) - self._device = device self._default_on_speed = 25 - self._attr_unique_id = device.address + self._attr_unique_id = coordinator.device.address self._attr_device_info = device_info self._percentage = 0 self._preset_mode = PRESET_MODE_NORMAL @@ -90,8 +87,8 @@ class Fan(CoordinatorEntity[Coordinator], FanEntity): new_speed = percentage_to_ordered_list_item( ORDERED_NAMED_FAN_SPEEDS, percentage ) - await self._device.send_fan_speed(int(new_speed)) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + await device.send_fan_speed(int(new_speed)) async def async_turn_on( self, @@ -111,34 +108,32 @@ class Fan(CoordinatorEntity[Coordinator], FanEntity): ORDERED_NAMED_FAN_SPEEDS, percentage ) - async with self._device: + async with self.coordinator.async_connect_and_update() as device: if preset_mode != self._preset_mode: if command := PRESET_TO_COMMAND.get(preset_mode): - await self._device.send_command(command) + await device.send_command(command) else: raise UnsupportedPreset(f"The preset {preset_mode} is unsupported") if preset_mode == PRESET_MODE_NORMAL: - await self._device.send_fan_speed(int(new_speed)) + await device.send_fan_speed(int(new_speed)) elif preset_mode == PRESET_MODE_AFTER_COOKING_MANUAL: - await self._device.send_after_cooking(int(new_speed)) + await device.send_after_cooking(int(new_speed)) elif preset_mode == PRESET_MODE_AFTER_COOKING_AUTO: - await self._device.send_after_cooking(0) - - self.coordinator.async_set_updated_data(self._device.state) + await device.send_after_cooking(0) async def async_set_preset_mode(self, preset_mode: str) -> None: """Set new preset mode.""" if command := PRESET_TO_COMMAND.get(preset_mode): - await self._device.send_command(command) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + await device.send_command(command) else: raise UnsupportedPreset(f"The preset {preset_mode} is unsupported") async def async_turn_off(self, **kwargs: Any) -> None: """Turn the entity off.""" - await self._device.send_command(COMMAND_STOP_FAN) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + await device.send_command(COMMAND_STOP_FAN) @property def speed_count(self) -> int: diff --git a/homeassistant/components/fjaraskupan/light.py b/homeassistant/components/fjaraskupan/light.py index c42943710de..b6028e017d4 100644 --- a/homeassistant/components/fjaraskupan/light.py +++ b/homeassistant/components/fjaraskupan/light.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import Any -from fjaraskupan import COMMAND_LIGHT_ON_OFF, Device +from fjaraskupan import COMMAND_LIGHT_ON_OFF from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity from homeassistant.config_entries import ConfigEntry @@ -23,7 +23,7 @@ async def async_setup_entry( """Set up tuya sensors dynamically through tuya discovery.""" def _constructor(coordinator: Coordinator) -> list[Entity]: - return [Light(coordinator, coordinator.device, coordinator.device_info)] + return [Light(coordinator, coordinator.device_info)] async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor) @@ -36,31 +36,29 @@ class Light(CoordinatorEntity[Coordinator], LightEntity): def __init__( self, coordinator: Coordinator, - device: Device, device_info: DeviceInfo, ) -> None: """Init light entity.""" super().__init__(coordinator) - self._device = device self._attr_color_mode = ColorMode.BRIGHTNESS self._attr_supported_color_modes = {ColorMode.BRIGHTNESS} - self._attr_unique_id = device.address + self._attr_unique_id = coordinator.device.address self._attr_device_info = device_info async def async_turn_on(self, **kwargs: Any) -> None: """Turn the light on.""" - if ATTR_BRIGHTNESS in kwargs: - await self._device.send_dim(int(kwargs[ATTR_BRIGHTNESS] * (100.0 / 255.0))) - else: - if not self.is_on: - await self._device.send_command(COMMAND_LIGHT_ON_OFF) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + if ATTR_BRIGHTNESS in kwargs: + await device.send_dim(int(kwargs[ATTR_BRIGHTNESS] * (100.0 / 255.0))) + else: + if not self.is_on: + await device.send_command(COMMAND_LIGHT_ON_OFF) async def async_turn_off(self, **kwargs: Any) -> None: """Turn the entity off.""" if self.is_on: - await self._device.send_command(COMMAND_LIGHT_ON_OFF) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + await device.send_command(COMMAND_LIGHT_ON_OFF) @property def is_on(self) -> bool: diff --git a/homeassistant/components/fjaraskupan/number.py b/homeassistant/components/fjaraskupan/number.py index fb793d2328e..d70f9b6a423 100644 --- a/homeassistant/components/fjaraskupan/number.py +++ b/homeassistant/components/fjaraskupan/number.py @@ -1,8 +1,6 @@ """Support for sensors.""" from __future__ import annotations -from fjaraskupan import Device - from homeassistant.components.number import NumberEntity from homeassistant.config_entries import ConfigEntry from homeassistant.const import TIME_MINUTES @@ -23,9 +21,7 @@ async def async_setup_entry( def _constructor(coordinator: Coordinator) -> list[Entity]: return [ - PeriodicVentingTime( - coordinator, coordinator.device, coordinator.device_info - ), + PeriodicVentingTime(coordinator, coordinator.device_info), ] async_setup_entry_platform(hass, config_entry, async_add_entities, _constructor) @@ -45,13 +41,11 @@ class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity): def __init__( self, coordinator: Coordinator, - device: Device, device_info: DeviceInfo, ) -> None: """Init number entities.""" super().__init__(coordinator) - self._device = device - self._attr_unique_id = f"{device.address}-periodic-venting" + self._attr_unique_id = f"{coordinator.device.address}-periodic-venting" self._attr_device_info = device_info self._attr_name = "Periodic venting" @@ -64,5 +58,5 @@ class PeriodicVentingTime(CoordinatorEntity[Coordinator], NumberEntity): async def async_set_native_value(self, value: float) -> None: """Set new value.""" - await self._device.send_periodic_venting(int(value)) - self.coordinator.async_set_updated_data(self._device.state) + async with self.coordinator.async_connect_and_update() as device: + await device.send_periodic_venting(int(value))