forked from home-assistant/core
Compare commits
50 Commits
2025.4.0b4
...
2025.4.0b9
| Author | SHA1 | Date | |
|---|---|---|---|
| 7766649304 | |||
| 07e9020dfa | |||
| f504a759e0 | |||
| 9927de4801 | |||
| 1244fc4682 | |||
| e77a1b12f7 | |||
| 5459daaa10 | |||
| 400131df78 | |||
| 28e1843ff9 | |||
| df777318d1 | |||
| 6ad5e9e89c | |||
| a0bd8deee9 | |||
| 405cbd6a00 | |||
| 3e0eb5ab2c | |||
| fad75a70b6 | |||
| d9720283df | |||
| 14eed1778b | |||
| 049aaa7e8b | |||
| 35717e8216 | |||
| 2a081abc18 | |||
| b7f29c7358 | |||
| 3bb6373df5 | |||
| e1b4edec50 | |||
| 147bee57e1 | |||
| fcdaea64da | |||
| d1512d46be | |||
| 0be7db6270 | |||
| 2af0282725 | |||
| ff458c8417 | |||
| cc93152ff0 | |||
| 9965f01609 | |||
| e9c76ce694 | |||
| 58ab7d350d | |||
| e4d6e20ebd | |||
| 45e273897a | |||
| d9ec7142d7 | |||
| e162499267 | |||
| 67f21429e3 | |||
| a0563f06c9 | |||
| e7c4fdc8bb | |||
| c490e350bc | |||
| e11409ef99 | |||
| 5c8e415a76 | |||
| e795fb9497 | |||
| d0afabb85c | |||
| 4f3e8e9b94 | |||
| 46c1cbbc9c | |||
| 8d9a4ea278 | |||
| 22c83e2393 | |||
| c83a75f6f9 |
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"domain": "bosch",
|
||||
"name": "Bosch",
|
||||
"integrations": ["bosch_alarm", "bosch_shc", "home_connect"]
|
||||
}
|
||||
@@ -8,7 +8,7 @@ from aiohttp import ClientSession
|
||||
from aiohttp.client_exceptions import ClientConnectorError
|
||||
from pyairnow import WebServiceAPI
|
||||
from pyairnow.conv import aqi_to_concentration
|
||||
from pyairnow.errors import AirNowError
|
||||
from pyairnow.errors import AirNowError, InvalidJsonError
|
||||
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.core import HomeAssistant
|
||||
@@ -79,7 +79,7 @@ class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
|
||||
distance=self.distance,
|
||||
)
|
||||
|
||||
except (AirNowError, ClientConnectorError) as error:
|
||||
except (AirNowError, ClientConnectorError, InvalidJsonError) as error:
|
||||
raise UpdateFailed(error) from error
|
||||
|
||||
if not obs:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"config": {
|
||||
"step": {
|
||||
"geography_by_coords": {
|
||||
"title": "Configure a Geography",
|
||||
"title": "Configure a geography",
|
||||
"description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
|
||||
"data": {
|
||||
"api_key": "[%key:common::config_flow::data::api_key%]",
|
||||
@@ -56,12 +56,12 @@
|
||||
"sensor": {
|
||||
"pollutant_label": {
|
||||
"state": {
|
||||
"co": "Carbon Monoxide",
|
||||
"n2": "Nitrogen Dioxide",
|
||||
"co": "Carbon monoxide",
|
||||
"n2": "Nitrogen dioxide",
|
||||
"o3": "Ozone",
|
||||
"p1": "PM10",
|
||||
"p2": "PM2.5",
|
||||
"s2": "Sulfur Dioxide"
|
||||
"s2": "Sulfur dioxide"
|
||||
}
|
||||
},
|
||||
"pollutant_level": {
|
||||
|
||||
@@ -8,6 +8,7 @@ announce:
|
||||
message:
|
||||
required: false
|
||||
example: "Time to wake up!"
|
||||
default: ""
|
||||
selector:
|
||||
text:
|
||||
media_id:
|
||||
@@ -28,6 +29,7 @@ start_conversation:
|
||||
start_message:
|
||||
required: false
|
||||
example: "You left the lights on in the living room. Turn them off?"
|
||||
default: ""
|
||||
selector:
|
||||
text:
|
||||
start_media_id:
|
||||
|
||||
@@ -198,7 +198,8 @@ async def websocket_test_connection(
|
||||
|
||||
hass.async_create_background_task(
|
||||
satellite.async_internal_announce(
|
||||
media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}"
|
||||
media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}",
|
||||
preannounce_media_id=None,
|
||||
),
|
||||
f"assist_satellite_connection_test_{msg['entity_id']}",
|
||||
)
|
||||
|
||||
@@ -8,7 +8,7 @@ from aiocomelit import ComelitSerialBridgeObject
|
||||
from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
|
||||
|
||||
from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverState
|
||||
from homeassistant.core import HomeAssistant, callback
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||
from homeassistant.helpers.restore_state import RestoreEntity
|
||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||
@@ -98,13 +98,20 @@ class ComelitCoverEntity(
|
||||
"""Return if the cover is opening."""
|
||||
return self._current_action("opening")
|
||||
|
||||
async def _cover_set_state(self, action: int, state: int) -> None:
|
||||
"""Set desired cover state."""
|
||||
self._last_state = self.state
|
||||
await self._api.set_device_status(COVER, self._device.index, action)
|
||||
self.coordinator.data[COVER][self._device.index].status = state
|
||||
self.async_write_ha_state()
|
||||
|
||||
async def async_close_cover(self, **kwargs: Any) -> None:
|
||||
"""Close cover."""
|
||||
await self._api.set_device_status(COVER, self._device.index, STATE_OFF)
|
||||
await self._cover_set_state(STATE_OFF, 2)
|
||||
|
||||
async def async_open_cover(self, **kwargs: Any) -> None:
|
||||
"""Open cover."""
|
||||
await self._api.set_device_status(COVER, self._device.index, STATE_ON)
|
||||
await self._cover_set_state(STATE_ON, 1)
|
||||
|
||||
async def async_stop_cover(self, **_kwargs: Any) -> None:
|
||||
"""Stop the cover."""
|
||||
@@ -112,13 +119,7 @@ class ComelitCoverEntity(
|
||||
return
|
||||
|
||||
action = STATE_ON if self.is_closing else STATE_OFF
|
||||
await self._api.set_device_status(COVER, self._device.index, action)
|
||||
|
||||
@callback
|
||||
def _handle_coordinator_update(self) -> None:
|
||||
"""Handle device update."""
|
||||
self._last_state = self.state
|
||||
self.async_write_ha_state()
|
||||
await self._cover_set_state(action, 0)
|
||||
|
||||
async def async_added_to_hass(self) -> None:
|
||||
"""Handle entity which will be added."""
|
||||
|
||||
@@ -59,7 +59,8 @@ class ComelitLightEntity(CoordinatorEntity[ComelitSerialBridge], LightEntity):
|
||||
async def _light_set_state(self, state: int) -> None:
|
||||
"""Set desired light state."""
|
||||
await self.coordinator.api.set_device_status(LIGHT, self._device.index, state)
|
||||
await self.coordinator.async_request_refresh()
|
||||
self.coordinator.data[LIGHT][self._device.index].status = state
|
||||
self.async_write_ha_state()
|
||||
|
||||
async def async_turn_on(self, **kwargs: Any) -> None:
|
||||
"""Turn the light on."""
|
||||
|
||||
@@ -67,7 +67,8 @@ class ComelitSwitchEntity(CoordinatorEntity[ComelitSerialBridge], SwitchEntity):
|
||||
await self.coordinator.api.set_device_status(
|
||||
self._device.type, self._device.index, state
|
||||
)
|
||||
await self.coordinator.async_request_refresh()
|
||||
self.coordinator.data[self._device.type][self._device.index].status = state
|
||||
self.async_write_ha_state()
|
||||
|
||||
async def async_turn_on(self, **kwargs: Any) -> None:
|
||||
"""Turn the switch on."""
|
||||
|
||||
@@ -650,7 +650,14 @@ class DefaultAgent(ConversationEntity):
|
||||
|
||||
if (
|
||||
(maybe_result is None) # first result
|
||||
or (num_matched_entities > best_num_matched_entities)
|
||||
or (
|
||||
# More literal text matched
|
||||
result.text_chunks_matched > maybe_result.text_chunks_matched
|
||||
)
|
||||
or (
|
||||
# More entities matched
|
||||
num_matched_entities > best_num_matched_entities
|
||||
)
|
||||
or (
|
||||
# Fewer unmatched entities
|
||||
(num_matched_entities == best_num_matched_entities)
|
||||
@@ -662,16 +669,6 @@ class DefaultAgent(ConversationEntity):
|
||||
and (num_unmatched_entities == best_num_unmatched_entities)
|
||||
and (num_unmatched_ranges > best_num_unmatched_ranges)
|
||||
)
|
||||
or (
|
||||
# More literal text matched
|
||||
(num_matched_entities == best_num_matched_entities)
|
||||
and (num_unmatched_entities == best_num_unmatched_entities)
|
||||
and (num_unmatched_ranges == best_num_unmatched_ranges)
|
||||
and (
|
||||
result.text_chunks_matched
|
||||
> maybe_result.text_chunks_matched
|
||||
)
|
||||
)
|
||||
or (
|
||||
# Prefer match failures with entities
|
||||
(result.text_chunks_matched == maybe_result.text_chunks_matched)
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
"documentation": "https://www.home-assistant.io/integrations/conversation",
|
||||
"integration_type": "system",
|
||||
"quality_scale": "internal",
|
||||
"requirements": ["hassil==2.2.3", "home-assistant-intents==2025.3.24"]
|
||||
"requirements": ["hassil==2.2.3", "home-assistant-intents==2025.3.28"]
|
||||
}
|
||||
|
||||
@@ -50,10 +50,10 @@ class DukeEnergyConfigFlow(ConfigFlow, domain=DOMAIN):
|
||||
_LOGGER.exception("Unexpected exception")
|
||||
errors["base"] = "unknown"
|
||||
else:
|
||||
username = auth["cdp_internal_user_id"].lower()
|
||||
username = auth["internalUserID"].lower()
|
||||
await self.async_set_unique_id(username)
|
||||
self._abort_if_unique_id_configured()
|
||||
email = auth["email"].lower()
|
||||
email = auth["loginEmailAddress"].lower()
|
||||
data = {
|
||||
CONF_EMAIL: email,
|
||||
CONF_USERNAME: username,
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
"dependencies": ["recorder"],
|
||||
"documentation": "https://www.home-assistant.io/integrations/duke_energy",
|
||||
"iot_class": "cloud_polling",
|
||||
"requirements": ["aiodukeenergy==0.2.2"]
|
||||
"requirements": ["aiodukeenergy==0.3.0"]
|
||||
}
|
||||
|
||||
@@ -282,15 +282,18 @@ class RuntimeEntryData:
|
||||
) -> None:
|
||||
"""Distribute an update of static infos to all platforms."""
|
||||
# First, load all platforms
|
||||
needed_platforms = set()
|
||||
if async_get_dashboard(hass):
|
||||
needed_platforms.add(Platform.UPDATE)
|
||||
needed_platforms: set[Platform] = set()
|
||||
|
||||
if self.device_info and self.device_info.voice_assistant_feature_flags_compat(
|
||||
self.api_version
|
||||
):
|
||||
needed_platforms.add(Platform.BINARY_SENSOR)
|
||||
needed_platforms.add(Platform.SELECT)
|
||||
if self.device_info:
|
||||
if async_get_dashboard(hass):
|
||||
# Only load the update platform if the device_info is set
|
||||
# When we restore the entry, the device_info may not be set yet
|
||||
# and we don't want to load the update platform since it needs
|
||||
# a complete device_info.
|
||||
needed_platforms.add(Platform.UPDATE)
|
||||
if self.device_info.voice_assistant_feature_flags_compat(self.api_version):
|
||||
needed_platforms.add(Platform.BINARY_SENSOR)
|
||||
needed_platforms.add(Platform.SELECT)
|
||||
|
||||
ent_reg = er.async_get(hass)
|
||||
registry_get_entity = ent_reg.async_get_entity_id
|
||||
@@ -312,18 +315,19 @@ class RuntimeEntryData:
|
||||
|
||||
# Make a dict of the EntityInfo by type and send
|
||||
# them to the listeners for each specific EntityInfo type
|
||||
infos_by_type: dict[type[EntityInfo], list[EntityInfo]] = {}
|
||||
infos_by_type: defaultdict[type[EntityInfo], list[EntityInfo]] = defaultdict(
|
||||
list
|
||||
)
|
||||
for info in infos:
|
||||
info_type = type(info)
|
||||
if info_type not in infos_by_type:
|
||||
infos_by_type[info_type] = []
|
||||
infos_by_type[info_type].append(info)
|
||||
infos_by_type[type(info)].append(info)
|
||||
|
||||
callbacks_by_type = self.entity_info_callbacks
|
||||
for type_, entity_infos in infos_by_type.items():
|
||||
if callbacks_ := callbacks_by_type.get(type_):
|
||||
for callback_ in callbacks_:
|
||||
callback_(entity_infos)
|
||||
for type_, callbacks in self.entity_info_callbacks.items():
|
||||
# If all entities for a type are removed, we
|
||||
# still need to call the callbacks with an empty list
|
||||
# to make sure the entities are removed.
|
||||
entity_infos = infos_by_type.get(type_, [])
|
||||
for callback_ in callbacks:
|
||||
callback_(entity_infos)
|
||||
|
||||
# Finally update static info subscriptions
|
||||
for callback_ in self.static_info_update_subscriptions:
|
||||
|
||||
@@ -33,6 +33,16 @@ class EsphomeEvent(EsphomeEntity[EventInfo, Event], EventEntity):
|
||||
self._trigger_event(self._state.event_type)
|
||||
self.async_write_ha_state()
|
||||
|
||||
@callback
|
||||
def _on_device_update(self) -> None:
|
||||
"""Call when device updates or entry data changes."""
|
||||
super()._on_device_update()
|
||||
if self._entry_data.available:
|
||||
# Event entities should go available directly
|
||||
# when the device comes online and not wait
|
||||
# for the next data push.
|
||||
self.async_write_ha_state()
|
||||
|
||||
|
||||
async_setup_entry = partial(
|
||||
platform_async_setup_entry,
|
||||
|
||||
@@ -20,5 +20,5 @@
|
||||
"documentation": "https://www.home-assistant.io/integrations/frontend",
|
||||
"integration_type": "system",
|
||||
"quality_scale": "internal",
|
||||
"requirements": ["home-assistant-frontend==20250327.0"]
|
||||
"requirements": ["home-assistant-frontend==20250328.0"]
|
||||
}
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
"name": "Panel light"
|
||||
},
|
||||
"quiet": {
|
||||
"name": "Quiet"
|
||||
"name": "Quiet mode"
|
||||
},
|
||||
"fresh_air": {
|
||||
"name": "Fresh air"
|
||||
},
|
||||
"xfan": {
|
||||
"name": "XFan"
|
||||
"name": "Xtra fan"
|
||||
},
|
||||
"health_mode": {
|
||||
"name": "Health mode"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"step": {
|
||||
"user": {
|
||||
"data": {
|
||||
"country": "Country"
|
||||
"country": "[%key:common::config_flow::data::country%]"
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
|
||||
@@ -64,7 +64,6 @@ set_program_and_options:
|
||||
- selected_program
|
||||
program:
|
||||
example: dishcare_dishwasher_program_auto2
|
||||
required: true
|
||||
selector:
|
||||
select:
|
||||
mode: dropdown
|
||||
|
||||
@@ -31,7 +31,6 @@ class FirmwareUpdateCoordinator(DataUpdateCoordinator[FirmwareManifest]):
|
||||
_LOGGER,
|
||||
name="firmware update coordinator",
|
||||
update_interval=FIRMWARE_REFRESH_INTERVAL,
|
||||
always_update=False,
|
||||
)
|
||||
self.hass = hass
|
||||
self.session = session
|
||||
|
||||
@@ -199,7 +199,7 @@ class BaseFirmwareUpdateEntity(
|
||||
# This entity is not currently associated with a device so we must manually
|
||||
# give it a name
|
||||
self._attr_name = f"{self._config_entry.title} Update"
|
||||
self._attr_title = self.entity_description.firmware_name or "unknown"
|
||||
self._attr_title = self.entity_description.firmware_name or "Unknown"
|
||||
|
||||
if (
|
||||
self._current_firmware_info is None
|
||||
|
||||
@@ -15,14 +15,13 @@ _LOGGER = logging.getLogger(__name__)
|
||||
|
||||
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""Set up a Home Assistant SkyConnect config entry."""
|
||||
|
||||
await hass.config_entries.async_forward_entry_setups(entry, ["update"])
|
||||
|
||||
return True
|
||||
|
||||
|
||||
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""Unload a config entry."""
|
||||
await hass.config_entries.async_unload_platforms(entry, ["update"])
|
||||
return True
|
||||
|
||||
|
||||
|
||||
@@ -21,11 +21,20 @@ from homeassistant.components.update import UpdateDeviceClass
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import EntityCategory
|
||||
from homeassistant.core import HomeAssistant, callback
|
||||
from homeassistant.helpers import entity_registry as er
|
||||
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
from homeassistant.helpers.device_registry import DeviceInfo
|
||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||
|
||||
from .const import FIRMWARE, FIRMWARE_VERSION, NABU_CASA_FIRMWARE_RELEASES_URL
|
||||
from .const import (
|
||||
DOMAIN,
|
||||
FIRMWARE,
|
||||
FIRMWARE_VERSION,
|
||||
NABU_CASA_FIRMWARE_RELEASES_URL,
|
||||
PRODUCT,
|
||||
SERIAL_NUMBER,
|
||||
HardwareVariant,
|
||||
)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
@@ -42,7 +51,7 @@ FIRMWARE_ENTITY_DESCRIPTIONS: dict[
|
||||
fw_type="skyconnect_zigbee_ncp",
|
||||
version_key="ezsp_version",
|
||||
expected_firmware_type=ApplicationType.EZSP,
|
||||
firmware_name="EmberZNet",
|
||||
firmware_name="EmberZNet Zigbee",
|
||||
),
|
||||
ApplicationType.SPINEL: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
@@ -55,6 +64,28 @@ FIRMWARE_ENTITY_DESCRIPTIONS: dict[
|
||||
expected_firmware_type=ApplicationType.SPINEL,
|
||||
firmware_name="OpenThread RCP",
|
||||
),
|
||||
ApplicationType.CPC: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
version_parser=lambda fw: fw,
|
||||
fw_type="skyconnect_multipan",
|
||||
version_key="cpc_version",
|
||||
expected_firmware_type=ApplicationType.CPC,
|
||||
firmware_name="Multiprotocol",
|
||||
),
|
||||
ApplicationType.GECKO_BOOTLOADER: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
version_parser=lambda fw: fw,
|
||||
fw_type=None, # We don't want to update the bootloader
|
||||
version_key="gecko_bootloader_version",
|
||||
expected_firmware_type=ApplicationType.GECKO_BOOTLOADER,
|
||||
firmware_name="Gecko Bootloader",
|
||||
),
|
||||
None: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
display_precision=0,
|
||||
@@ -77,9 +108,16 @@ def _async_create_update_entity(
|
||||
) -> FirmwareUpdateEntity:
|
||||
"""Create an update entity that handles firmware type changes."""
|
||||
firmware_type = config_entry.data[FIRMWARE]
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
|
||||
ApplicationType(firmware_type) if firmware_type is not None else None
|
||||
]
|
||||
|
||||
try:
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
|
||||
ApplicationType(firmware_type)
|
||||
]
|
||||
except (KeyError, ValueError):
|
||||
_LOGGER.debug(
|
||||
"Unknown firmware type %r, using default entity description", firmware_type
|
||||
)
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[None]
|
||||
|
||||
entity = FirmwareUpdateEntity(
|
||||
device=config_entry.data["device"],
|
||||
@@ -130,6 +168,7 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
"""SkyConnect firmware update entity."""
|
||||
|
||||
bootloader_reset_type = None
|
||||
_attr_has_entity_name = True
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
@@ -141,8 +180,18 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
"""Initialize the SkyConnect firmware update entity."""
|
||||
super().__init__(device, config_entry, update_coordinator, entity_description)
|
||||
|
||||
self._attr_unique_id = (
|
||||
f"{self._config_entry.data['serial_number']}_{self.entity_description.key}"
|
||||
variant = HardwareVariant.from_usb_product_name(
|
||||
self._config_entry.data[PRODUCT]
|
||||
)
|
||||
serial_number = self._config_entry.data[SERIAL_NUMBER]
|
||||
|
||||
self._attr_unique_id = f"{serial_number}_{self.entity_description.key}"
|
||||
self._attr_device_info = DeviceInfo(
|
||||
identifiers={(DOMAIN, serial_number)},
|
||||
name=f"{variant.full_name} ({serial_number[:8]})",
|
||||
model=variant.full_name,
|
||||
manufacturer="Nabu Casa",
|
||||
serial_number=serial_number,
|
||||
)
|
||||
|
||||
# Use the cached firmware info if it exists
|
||||
@@ -155,6 +204,17 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
source="homeassistant_sky_connect",
|
||||
)
|
||||
|
||||
def _update_attributes(self) -> None:
|
||||
"""Recompute the attributes of the entity."""
|
||||
super()._update_attributes()
|
||||
|
||||
assert self.device_entry is not None
|
||||
device_registry = dr.async_get(self.hass)
|
||||
device_registry.async_update_device(
|
||||
device_id=self.device_entry.id,
|
||||
sw_version=f"{self.entity_description.firmware_name} {self._attr_installed_version}",
|
||||
)
|
||||
|
||||
@callback
|
||||
def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
|
||||
"""Handle updated firmware info being pushed by an integration."""
|
||||
|
||||
@@ -62,6 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
|
||||
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""Unload a config entry."""
|
||||
await hass.config_entries.async_unload_platforms(entry, ["update"])
|
||||
return True
|
||||
|
||||
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
|
||||
DOMAIN = "homeassistant_yellow"
|
||||
|
||||
RADIO_MODEL = "Home Assistant Yellow"
|
||||
RADIO_MANUFACTURER = "Nabu Casa"
|
||||
MODEL = "Home Assistant Yellow"
|
||||
MANUFACTURER = "Nabu Casa"
|
||||
|
||||
RADIO_DEVICE = "/dev/ttyAMA1"
|
||||
|
||||
ZHA_HW_DISCOVERY_DATA = {
|
||||
|
||||
@@ -149,5 +149,12 @@
|
||||
"run_zigbee_flasher_addon": "[%key:component::homeassistant_hardware::firmware_picker::options::progress::run_zigbee_flasher_addon%]",
|
||||
"uninstall_zigbee_flasher_addon": "[%key:component::homeassistant_hardware::firmware_picker::options::progress::uninstall_zigbee_flasher_addon%]"
|
||||
}
|
||||
},
|
||||
"entity": {
|
||||
"update": {
|
||||
"firmware": {
|
||||
"name": "Radio firmware"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,13 +21,17 @@ from homeassistant.components.update import UpdateDeviceClass
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import EntityCategory
|
||||
from homeassistant.core import HomeAssistant, callback
|
||||
from homeassistant.helpers import entity_registry as er
|
||||
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
from homeassistant.helpers.device_registry import DeviceInfo
|
||||
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
|
||||
|
||||
from .const import (
|
||||
DOMAIN,
|
||||
FIRMWARE,
|
||||
FIRMWARE_VERSION,
|
||||
MANUFACTURER,
|
||||
MODEL,
|
||||
NABU_CASA_FIRMWARE_RELEASES_URL,
|
||||
RADIO_DEVICE,
|
||||
)
|
||||
@@ -39,7 +43,7 @@ FIRMWARE_ENTITY_DESCRIPTIONS: dict[
|
||||
ApplicationType | None, FirmwareUpdateEntityDescription
|
||||
] = {
|
||||
ApplicationType.EZSP: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
key="radio_firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
@@ -47,10 +51,10 @@ FIRMWARE_ENTITY_DESCRIPTIONS: dict[
|
||||
fw_type="yellow_zigbee_ncp",
|
||||
version_key="ezsp_version",
|
||||
expected_firmware_type=ApplicationType.EZSP,
|
||||
firmware_name="EmberZNet",
|
||||
firmware_name="EmberZNet Zigbee",
|
||||
),
|
||||
ApplicationType.SPINEL: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
key="radio_firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
@@ -60,12 +64,34 @@ FIRMWARE_ENTITY_DESCRIPTIONS: dict[
|
||||
expected_firmware_type=ApplicationType.SPINEL,
|
||||
firmware_name="OpenThread RCP",
|
||||
),
|
||||
None: FirmwareUpdateEntityDescription(
|
||||
ApplicationType.CPC: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
version_parser=lambda fw: fw,
|
||||
fw_type="yellow_multipan",
|
||||
version_key="cpc_version",
|
||||
expected_firmware_type=ApplicationType.CPC,
|
||||
firmware_name="Multiprotocol",
|
||||
),
|
||||
ApplicationType.GECKO_BOOTLOADER: FirmwareUpdateEntityDescription(
|
||||
key="firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
version_parser=lambda fw: fw,
|
||||
fw_type=None, # We don't want to update the bootloader
|
||||
version_key="gecko_bootloader_version",
|
||||
expected_firmware_type=ApplicationType.GECKO_BOOTLOADER,
|
||||
firmware_name="Gecko Bootloader",
|
||||
),
|
||||
None: FirmwareUpdateEntityDescription(
|
||||
key="radio_firmware",
|
||||
display_precision=0,
|
||||
device_class=UpdateDeviceClass.FIRMWARE,
|
||||
entity_category=EntityCategory.CONFIG,
|
||||
version_parser=lambda fw: fw,
|
||||
fw_type=None,
|
||||
version_key=None,
|
||||
expected_firmware_type=None,
|
||||
@@ -82,9 +108,16 @@ def _async_create_update_entity(
|
||||
) -> FirmwareUpdateEntity:
|
||||
"""Create an update entity that handles firmware type changes."""
|
||||
firmware_type = config_entry.data[FIRMWARE]
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
|
||||
ApplicationType(firmware_type) if firmware_type is not None else None
|
||||
]
|
||||
|
||||
try:
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[
|
||||
ApplicationType(firmware_type)
|
||||
]
|
||||
except (KeyError, ValueError):
|
||||
_LOGGER.debug(
|
||||
"Unknown firmware type %r, using default entity description", firmware_type
|
||||
)
|
||||
entity_description = FIRMWARE_ENTITY_DESCRIPTIONS[None]
|
||||
|
||||
entity = FirmwareUpdateEntity(
|
||||
device=RADIO_DEVICE,
|
||||
@@ -135,6 +168,7 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
"""Yellow firmware update entity."""
|
||||
|
||||
bootloader_reset_type = "yellow" # Triggers a GPIO reset
|
||||
_attr_has_entity_name = True
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
@@ -145,8 +179,13 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
) -> None:
|
||||
"""Initialize the Yellow firmware update entity."""
|
||||
super().__init__(device, config_entry, update_coordinator, entity_description)
|
||||
|
||||
self._attr_unique_id = self.entity_description.key
|
||||
self._attr_device_info = DeviceInfo(
|
||||
identifiers={(DOMAIN, "yellow")},
|
||||
name=MODEL,
|
||||
model=MODEL,
|
||||
manufacturer=MANUFACTURER,
|
||||
)
|
||||
|
||||
# Use the cached firmware info if it exists
|
||||
if self._config_entry.data[FIRMWARE] is not None:
|
||||
@@ -158,6 +197,17 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
|
||||
source="homeassistant_yellow",
|
||||
)
|
||||
|
||||
def _update_attributes(self) -> None:
|
||||
"""Recompute the attributes of the entity."""
|
||||
super()._update_attributes()
|
||||
|
||||
assert self.device_entry is not None
|
||||
device_registry = dr.async_get(self.hass)
|
||||
device_registry.async_update_device(
|
||||
device_id=self.device_entry.id,
|
||||
sw_version=f"{self.entity_description.firmware_name} {self._attr_installed_version}",
|
||||
)
|
||||
|
||||
@callback
|
||||
def _firmware_info_callback(self, firmware_info: FirmwareInfo) -> None:
|
||||
"""Handle updated firmware info being pushed by an integration."""
|
||||
|
||||
@@ -6,6 +6,7 @@ count_omer:
|
||||
selector:
|
||||
date:
|
||||
nusach:
|
||||
required: true
|
||||
example: "sfarad"
|
||||
default: "sfarad"
|
||||
selector:
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
{
|
||||
"entity_component": {
|
||||
"_": {
|
||||
"default": "mdi:lightbulb"
|
||||
"default": "mdi:lightbulb",
|
||||
"state_attributes": {
|
||||
"effect": {
|
||||
"default": "mdi:circle-medium",
|
||||
"state": {
|
||||
"off": "mdi:star-off"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"services": {
|
||||
|
||||
@@ -93,7 +93,10 @@
|
||||
"name": "Color temperature (Kelvin)"
|
||||
},
|
||||
"effect": {
|
||||
"name": "Effect"
|
||||
"name": "Effect",
|
||||
"state": {
|
||||
"off": "[%key:common::state::off%]"
|
||||
}
|
||||
},
|
||||
"effect_list": {
|
||||
"name": "Available effects"
|
||||
|
||||
@@ -69,7 +69,7 @@ class MatterEventEntity(MatterEntity, EventEntity):
|
||||
max_presses_supported = self.get_matter_attribute_value(
|
||||
clusters.Switch.Attributes.MultiPressMax
|
||||
)
|
||||
max_presses_supported = min(max_presses_supported or 1, 8)
|
||||
max_presses_supported = min(max_presses_supported or 2, 8)
|
||||
for i in range(max_presses_supported):
|
||||
event_types.append(f"multi_press_{i + 1}") # noqa: PERF401
|
||||
elif feature_map & SwitchFeature.kMomentarySwitch:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
"description": "[%key:component::bluetooth::config::step::user::description%]",
|
||||
"data": {
|
||||
"address": "[%key:common::config_flow::data::device%]",
|
||||
"medium_type": "Medium Type"
|
||||
"medium_type": "Medium type"
|
||||
}
|
||||
},
|
||||
"bluetooth_confirm": {
|
||||
|
||||
@@ -219,10 +219,10 @@
|
||||
"options": "Add option"
|
||||
},
|
||||
"data_description": {
|
||||
"device_class": "The device class of the {platform} entity. [Learn more.]({url}#device_class)",
|
||||
"state_class": "The [state_class](https://developers.home-assistant.io/docs/core/entity/sensor/#available-state-classes) of the sensor. [Learn more.]({url}#state_class)",
|
||||
"device_class": "The Device class of the {platform} entity. [Learn more.]({url}#device_class)",
|
||||
"state_class": "The [State class](https://developers.home-assistant.io/docs/core/entity/sensor/#available-state-classes) of the sensor. [Learn more.]({url}#state_class)",
|
||||
"unit_of_measurement": "Defines the unit of measurement of the sensor, if any.",
|
||||
"options": "Options for allowed sensor state values. The sensor’s device_class must be set to Enumeration. The options option cannot be used together with State Class or Unit of measurement."
|
||||
"options": "Options for allowed sensor state values. The sensor’s Device class must be set to Enumeration. The 'Options' setting cannot be used together with State class or Unit of measurement."
|
||||
},
|
||||
"sections": {
|
||||
"advanced_settings": {
|
||||
@@ -285,9 +285,9 @@
|
||||
"invalid_uom": "The unit of measurement \"{unit_of_measurement}\" is not supported by the selected device class, please either remove the device class, select a device class which supports \"{unit_of_measurement}\", or pick a supported unit of measurement from the list",
|
||||
"invalid_url": "Invalid URL",
|
||||
"options_not_allowed_with_state_class_or_uom": "The 'Options' setting is not allowed when state class or unit of measurement are used",
|
||||
"options_device_class_enum": "The 'Options' setting must be used with the Enumeration device class'. If you continue, the existing options will be reset",
|
||||
"options_device_class_enum": "The 'Options' setting must be used with the Enumeration device class. If you continue, the existing options will be reset",
|
||||
"options_with_enum_device_class": "Configure options for the enumeration sensor",
|
||||
"uom_required_for_device_class": "The selected device device class requires a unit"
|
||||
"uom_required_for_device_class": "The selected device class requires a unit"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -453,7 +453,7 @@
|
||||
"temperature": "[%key:component::sensor::entity_component::temperature::name%]",
|
||||
"timestamp": "[%key:component::sensor::entity_component::timestamp::name%]",
|
||||
"volatile_organic_compounds": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]",
|
||||
"volatile_organic_compounds_parts": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]",
|
||||
"volatile_organic_compounds_parts": "[%key:component::sensor::entity_component::volatile_organic_compounds_parts::name%]",
|
||||
"voltage": "[%key:component::sensor::entity_component::voltage::name%]",
|
||||
"volume": "[%key:component::sensor::entity_component::volume::name%]",
|
||||
"volume_flow_rate": "[%key:component::sensor::entity_component::volume_flow_rate::name%]",
|
||||
|
||||
@@ -7,6 +7,6 @@
|
||||
"documentation": "https://www.home-assistant.io/integrations/music_assistant",
|
||||
"iot_class": "local_push",
|
||||
"loggers": ["music_assistant"],
|
||||
"requirements": ["music-assistant-client==1.1.1"],
|
||||
"requirements": ["music-assistant-client==1.2.0"],
|
||||
"zeroconf": ["_mass._tcp.local."]
|
||||
}
|
||||
|
||||
@@ -94,6 +94,12 @@ SUPPORTED_FEATURES_BASE = (
|
||||
| MediaPlayerEntityFeature.MEDIA_ENQUEUE
|
||||
| MediaPlayerEntityFeature.MEDIA_ANNOUNCE
|
||||
| MediaPlayerEntityFeature.SEEK
|
||||
# we always add pause support,
|
||||
# regardless if the underlying player actually natively supports pause
|
||||
# because the MA behavior is to internally handle pause with stop
|
||||
# (and a resume position) and we'd like to keep the UX consistent
|
||||
# background info: https://github.com/home-assistant/core/issues/140118
|
||||
| MediaPlayerEntityFeature.PAUSE
|
||||
)
|
||||
|
||||
QUEUE_OPTION_MAP = {
|
||||
@@ -697,8 +703,6 @@ class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
|
||||
supported_features = SUPPORTED_FEATURES_BASE
|
||||
if PlayerFeature.SET_MEMBERS in self.player.supported_features:
|
||||
supported_features |= MediaPlayerEntityFeature.GROUPING
|
||||
if PlayerFeature.PAUSE in self.player.supported_features:
|
||||
supported_features |= MediaPlayerEntityFeature.PAUSE
|
||||
if self.player.mute_control != PLAYER_CONTROL_NONE:
|
||||
supported_features |= MediaPlayerEntityFeature.VOLUME_MUTE
|
||||
if self.player.volume_control != PLAYER_CONTROL_NONE:
|
||||
|
||||
@@ -360,7 +360,7 @@ class NMBSSensor(SensorEntity):
|
||||
attrs[ATTR_LONGITUDE] = self.station_coordinates[1]
|
||||
|
||||
if self.is_via_connection and not self._excl_vias:
|
||||
via = self._attrs.vias.via[0]
|
||||
via = self._attrs.vias[0]
|
||||
|
||||
attrs["via"] = via.station
|
||||
attrs["via_arrival_platform"] = via.arrival.platform
|
||||
|
||||
@@ -104,6 +104,15 @@ def _resize_image(image, opts):
|
||||
new_width = opts.max_width
|
||||
(old_width, old_height) = img.size
|
||||
old_size = len(image)
|
||||
|
||||
# If no max_width specified, only apply quality changes if requested
|
||||
if new_width is None:
|
||||
if opts.quality is None:
|
||||
return image
|
||||
imgbuf = io.BytesIO()
|
||||
img.save(imgbuf, "JPEG", optimize=True, quality=quality)
|
||||
return imgbuf.getvalue()
|
||||
|
||||
if old_width <= new_width:
|
||||
if opts.quality is None:
|
||||
_LOGGER.debug("Image is smaller-than/equal-to requested width")
|
||||
|
||||
@@ -27,19 +27,19 @@
|
||||
"entity": {
|
||||
"sensor": {
|
||||
"energy_consumption": {
|
||||
"name": "Energy consumed"
|
||||
"name": "Energy consumption"
|
||||
},
|
||||
"energy_generation": {
|
||||
"name": "Energy generated"
|
||||
"name": "Energy generation"
|
||||
},
|
||||
"efficiency": {
|
||||
"name": "Efficiency"
|
||||
},
|
||||
"power_consumption": {
|
||||
"name": "Power consumed"
|
||||
"name": "Power consumption"
|
||||
},
|
||||
"power_generation": {
|
||||
"name": "Power generated"
|
||||
"name": "Power generation"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,10 +278,10 @@
|
||||
"name": "Timestamp"
|
||||
},
|
||||
"volatile_organic_compounds": {
|
||||
"name": "VOCs"
|
||||
"name": "Volatile organic compounds"
|
||||
},
|
||||
"volatile_organic_compounds_parts": {
|
||||
"name": "[%key:component::sensor::entity_component::volatile_organic_compounds::name%]"
|
||||
"name": "Volatile organic compounds parts"
|
||||
},
|
||||
"voltage": {
|
||||
"name": "Voltage"
|
||||
|
||||
@@ -426,7 +426,7 @@ def create_devices(
|
||||
kwargs[ATTR_CONNECTIONS] = {
|
||||
(dr.CONNECTION_NETWORK_MAC, device.device.hub.mac_address)
|
||||
}
|
||||
if device.device.parent_device_id:
|
||||
if device.device.parent_device_id and device.device.parent_device_id in devices:
|
||||
kwargs[ATTR_VIA_DEVICE] = (DOMAIN, device.device.parent_device_id)
|
||||
if (ocf := device.device.ocf) is not None:
|
||||
kwargs.update(
|
||||
|
||||
@@ -58,5 +58,6 @@ class SmartThingsButtonEvent(SmartThingsEntity, EventEntity):
|
||||
)
|
||||
|
||||
def _update_handler(self, event: DeviceEvent) -> None:
|
||||
self._trigger_event(cast(str, event.value))
|
||||
self.async_write_ha_state()
|
||||
if event.attribute is Attribute.BUTTON:
|
||||
self._trigger_event(cast(str, event.value))
|
||||
super()._update_handler(event)
|
||||
|
||||
@@ -331,7 +331,6 @@ CAPABILITY_TO_SENSORS: dict[
|
||||
translation_key="dryer_machine_state",
|
||||
options=WASHER_OPTIONS,
|
||||
device_class=SensorDeviceClass.ENUM,
|
||||
deprecated=lambda _: "machine_state",
|
||||
)
|
||||
],
|
||||
Attribute.DRYER_JOB_STATE: [
|
||||
@@ -966,7 +965,6 @@ CAPABILITY_TO_SENSORS: dict[
|
||||
translation_key="washer_machine_state",
|
||||
options=WASHER_OPTIONS,
|
||||
device_class=SensorDeviceClass.ENUM,
|
||||
deprecated=lambda _: "machine_state",
|
||||
)
|
||||
],
|
||||
Attribute.WASHER_JOB_STATE: [
|
||||
|
||||
@@ -487,10 +487,6 @@
|
||||
"title": "Deprecated refrigerator door binary sensor detected in some automations or scripts",
|
||||
"description": "The refrigerator door binary sensor `{entity}` is deprecated and is used in the following automations or scripts:\n{items}\n\nSeparate entities for cooler and freezer door are available and should be used going forward. Please use them in the above automations or scripts to fix this issue."
|
||||
},
|
||||
"deprecated_machine_state": {
|
||||
"title": "Deprecated machine state sensor detected in some automations or scripts",
|
||||
"description": "The machine state sensor `{entity}` is deprecated and is used in the following automations or scripts:\n{items}\n\nA select entity is now available for the machine state and should be used going forward. Please use the new select entity in the above automations or scripts to fix this issue."
|
||||
},
|
||||
"deprecated_switch_appliance": {
|
||||
"title": "Deprecated switch detected in some automations or scripts",
|
||||
"description": "The switch `{entity}` is deprecated because the actions did not work, so it has been replaced with a binary sensor instead.\n\nThe switch was used in the following automations or scripts:\n{items}\n\nPlease use the new binary sensor in the above automations or scripts to fix this issue."
|
||||
|
||||
@@ -31,6 +31,7 @@ async def async_setup_entry(
|
||||
"power",
|
||||
"status_requested",
|
||||
"sticky_white_noise_updated",
|
||||
"config_change",
|
||||
],
|
||||
),
|
||||
)
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
"iot_class": "cloud_push",
|
||||
"loggers": ["snoo"],
|
||||
"quality_scale": "bronze",
|
||||
"requirements": ["python-snoo==0.6.4"]
|
||||
"requirements": ["python-snoo==0.6.5"]
|
||||
}
|
||||
|
||||
@@ -55,7 +55,8 @@
|
||||
"activity": "Activity press",
|
||||
"power": "Power button pressed",
|
||||
"status_requested": "Status requested",
|
||||
"sticky_white_noise_updated": "Sleepytime sounds updated"
|
||||
"sticky_white_noise_updated": "Sleepytime sounds updated",
|
||||
"config_change": "Config changed"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -477,11 +477,9 @@ class TadoClimate(TadoZoneEntity, ClimateEntity):
|
||||
@property
|
||||
def target_temperature(self) -> float | None:
|
||||
"""Return the temperature we try to reach."""
|
||||
# If the target temperature will be None
|
||||
# if the device is performing an action
|
||||
# that does not affect the temperature or
|
||||
# the device is switching states
|
||||
return self._tado_zone_data.target_temp or self._tado_zone_data.current_temp
|
||||
if self._current_tado_hvac_mode == CONST_MODE_OFF:
|
||||
return TADO_DEFAULT_MIN_TEMP
|
||||
return self._tado_zone_data.target_temp
|
||||
|
||||
async def set_timer(
|
||||
self,
|
||||
|
||||
@@ -41,7 +41,7 @@ ENTITIES: tuple[TedeeBinarySensorEntityDescription, ...] = (
|
||||
TedeeBinarySensorEntityDescription(
|
||||
key="semi_locked",
|
||||
translation_key="semi_locked",
|
||||
is_on_fn=lambda lock: lock.state == TedeeLockState.HALF_OPEN,
|
||||
is_on_fn=lambda lock: lock.state is TedeeLockState.HALF_OPEN,
|
||||
entity_category=EntityCategory.DIAGNOSTIC,
|
||||
),
|
||||
TedeeBinarySensorEntityDescription(
|
||||
@@ -53,7 +53,10 @@ ENTITIES: tuple[TedeeBinarySensorEntityDescription, ...] = (
|
||||
TedeeBinarySensorEntityDescription(
|
||||
key="uncalibrated",
|
||||
translation_key="uncalibrated",
|
||||
is_on_fn=lambda lock: lock.state == TedeeLockState.UNCALIBRATED,
|
||||
is_on_fn=(
|
||||
lambda lock: lock.state is TedeeLockState.UNCALIBRATED
|
||||
or lock.state is TedeeLockState.UNKNOWN
|
||||
),
|
||||
device_class=BinarySensorDeviceClass.PROBLEM,
|
||||
entity_category=EntityCategory.DIAGNOSTIC,
|
||||
entity_registry_enabled_default=False,
|
||||
|
||||
@@ -120,7 +120,7 @@ def rewrite_legacy_to_modern_conf(
|
||||
return switches
|
||||
|
||||
|
||||
def rewrite_options_to_moder_conf(option_config: dict[str, dict]) -> dict[str, dict]:
|
||||
def rewrite_options_to_modern_conf(option_config: dict[str, dict]) -> dict[str, dict]:
|
||||
"""Rewrite option configuration to modern configuration."""
|
||||
option_config = {**option_config}
|
||||
|
||||
@@ -189,7 +189,7 @@ async def async_setup_entry(
|
||||
"""Initialize config entry."""
|
||||
_options = dict(config_entry.options)
|
||||
_options.pop("template_type")
|
||||
_options = rewrite_options_to_moder_conf(_options)
|
||||
_options = rewrite_options_to_modern_conf(_options)
|
||||
validated_config = SWITCH_CONFIG_SCHEMA(_options)
|
||||
async_add_entities([SwitchTemplate(hass, validated_config, config_entry.entry_id)])
|
||||
|
||||
@@ -199,7 +199,8 @@ def async_create_preview_switch(
|
||||
hass: HomeAssistant, name: str, config: dict[str, Any]
|
||||
) -> SwitchTemplate:
|
||||
"""Create a preview switch."""
|
||||
validated_config = SWITCH_CONFIG_SCHEMA(config | {CONF_NAME: name})
|
||||
updated_config = rewrite_options_to_modern_conf(config)
|
||||
validated_config = SWITCH_CONFIG_SCHEMA(updated_config | {CONF_NAME: name})
|
||||
return SwitchTemplate(hass, validated_config, None)
|
||||
|
||||
|
||||
|
||||
@@ -454,6 +454,37 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
entity_registry_enabled_default=False,
|
||||
),
|
||||
TuyaSensorEntityDescription(
|
||||
key=DPCode.VA_TEMPERATURE,
|
||||
translation_key="temperature",
|
||||
device_class=SensorDeviceClass.TEMPERATURE,
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
),
|
||||
TuyaSensorEntityDescription(
|
||||
key=DPCode.TEMP_CURRENT,
|
||||
translation_key="temperature",
|
||||
device_class=SensorDeviceClass.TEMPERATURE,
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
),
|
||||
TuyaSensorEntityDescription(
|
||||
key=DPCode.VA_HUMIDITY,
|
||||
translation_key="humidity",
|
||||
device_class=SensorDeviceClass.HUMIDITY,
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
),
|
||||
TuyaSensorEntityDescription(
|
||||
key=DPCode.HUMIDITY_VALUE,
|
||||
translation_key="humidity",
|
||||
device_class=SensorDeviceClass.HUMIDITY,
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
),
|
||||
TuyaSensorEntityDescription(
|
||||
key=DPCode.BRIGHT_VALUE,
|
||||
translation_key="illuminance",
|
||||
device_class=SensorDeviceClass.ILLUMINANCE,
|
||||
state_class=SensorStateClass.MEASUREMENT,
|
||||
),
|
||||
*BATTERY_SENSORS,
|
||||
),
|
||||
# Luminance Sensor
|
||||
# https://developer.tuya.com/en/docs/iot/categoryldcg?id=Kaiuz3n7u69l8
|
||||
|
||||
@@ -8,5 +8,5 @@
|
||||
"iot_class": "cloud_polling",
|
||||
"loggers": ["aiowebdav2"],
|
||||
"quality_scale": "bronze",
|
||||
"requirements": ["aiowebdav2==0.4.2"]
|
||||
"requirements": ["aiowebdav2==0.4.4"]
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ type AsyncWebSocketCommandHandler = Callable[
|
||||
DOMAIN: Final = "websocket_api"
|
||||
URL: Final = "/api/websocket"
|
||||
PENDING_MSG_PEAK: Final = 1024
|
||||
PENDING_MSG_PEAK_TIME: Final = 5
|
||||
PENDING_MSG_PEAK_TIME: Final = 10
|
||||
# Maximum number of messages that can be pending at any given time.
|
||||
# This is effectively the upper limit of the number of entities
|
||||
# that can fire state changes within ~1 second.
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
"title": "Workday",
|
||||
"config": {
|
||||
"abort": {
|
||||
"already_configured": "Workday has already been setup with chosen configuration"
|
||||
"already_configured": "Workday has already been set up with chosen configuration"
|
||||
},
|
||||
"step": {
|
||||
"user": {
|
||||
"data": {
|
||||
"name": "[%key:common::config_flow::data::name%]",
|
||||
"country": "Country"
|
||||
"country": "[%key:common::config_flow::data::country%]"
|
||||
}
|
||||
},
|
||||
"options": {
|
||||
@@ -18,7 +18,7 @@
|
||||
"days_offset": "Offset",
|
||||
"workdays": "Days to include",
|
||||
"add_holidays": "Add holidays",
|
||||
"remove_holidays": "Remove Holidays",
|
||||
"remove_holidays": "Remove holidays",
|
||||
"province": "Subdivision of country",
|
||||
"language": "Language for named holidays",
|
||||
"category": "Additional category as holiday"
|
||||
@@ -116,14 +116,14 @@
|
||||
},
|
||||
"issues": {
|
||||
"bad_country": {
|
||||
"title": "Configured Country for {title} does not exist",
|
||||
"title": "Configured country for {title} does not exist",
|
||||
"fix_flow": {
|
||||
"step": {
|
||||
"country": {
|
||||
"title": "Select country for {title}",
|
||||
"description": "Select a country to use for your Workday sensor.",
|
||||
"data": {
|
||||
"country": "[%key:component::workday::config::step::user::data::country%]"
|
||||
"country": "[%key:common::config_flow::data::country%]"
|
||||
}
|
||||
},
|
||||
"province": {
|
||||
@@ -133,7 +133,7 @@
|
||||
"province": "[%key:component::workday::config::step::options::data::province%]"
|
||||
},
|
||||
"data_description": {
|
||||
"province": "State, Territory, Province, Region of Country"
|
||||
"province": "[%key:component::workday::config::step::options::data_description::province%]"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -150,7 +150,7 @@
|
||||
"province": "[%key:component::workday::config::step::options::data::province%]"
|
||||
},
|
||||
"data_description": {
|
||||
"province": "[%key:component::workday::issues::bad_country::fix_flow::step::province::data_description::province%]"
|
||||
"province": "[%key:component::workday::config::step::options::data_description::province%]"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -217,7 +217,7 @@
|
||||
"services": {
|
||||
"check_date": {
|
||||
"name": "Check date",
|
||||
"description": "Check if date is workday.",
|
||||
"description": "Checks if a given date is a workday.",
|
||||
"fields": {
|
||||
"check_date": {
|
||||
"name": "Date",
|
||||
|
||||
@@ -145,8 +145,6 @@ def _async_get_instance(hass: HomeAssistant) -> HaAsyncZeroconf:
|
||||
if DOMAIN in hass.data:
|
||||
return cast(HaAsyncZeroconf, hass.data[DOMAIN])
|
||||
|
||||
logging.getLogger("zeroconf").setLevel(logging.NOTSET)
|
||||
|
||||
zeroconf = HaZeroconf(**_async_get_zc_args(hass))
|
||||
aio_zc = HaAsyncZeroconf(zc=zeroconf)
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
|
||||
APPLICATION_NAME: Final = "HomeAssistant"
|
||||
MAJOR_VERSION: Final = 2025
|
||||
MINOR_VERSION: Final = 4
|
||||
PATCH_VERSION: Final = "0b4"
|
||||
PATCH_VERSION: Final = "0b9"
|
||||
__short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
|
||||
__version__: Final = f"{__short_version__}.{PATCH_VERSION}"
|
||||
REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 0)
|
||||
|
||||
@@ -759,17 +759,28 @@
|
||||
"config_flow": true,
|
||||
"iot_class": "local_push"
|
||||
},
|
||||
"bosch_alarm": {
|
||||
"name": "Bosch Alarm",
|
||||
"integration_type": "device",
|
||||
"config_flow": true,
|
||||
"iot_class": "local_push"
|
||||
},
|
||||
"bosch_shc": {
|
||||
"name": "Bosch SHC",
|
||||
"integration_type": "hub",
|
||||
"config_flow": true,
|
||||
"iot_class": "local_push"
|
||||
"bosch": {
|
||||
"name": "Bosch",
|
||||
"integrations": {
|
||||
"bosch_alarm": {
|
||||
"integration_type": "device",
|
||||
"config_flow": true,
|
||||
"iot_class": "local_push",
|
||||
"name": "Bosch Alarm"
|
||||
},
|
||||
"bosch_shc": {
|
||||
"integration_type": "hub",
|
||||
"config_flow": true,
|
||||
"iot_class": "local_push",
|
||||
"name": "Bosch SHC"
|
||||
},
|
||||
"home_connect": {
|
||||
"integration_type": "hub",
|
||||
"config_flow": true,
|
||||
"iot_class": "cloud_push",
|
||||
"name": "Home Connect"
|
||||
}
|
||||
}
|
||||
},
|
||||
"brandt": {
|
||||
"name": "Brandt Smart Control",
|
||||
@@ -2639,13 +2650,6 @@
|
||||
"config_flow": true,
|
||||
"iot_class": "local_polling"
|
||||
},
|
||||
"home_connect": {
|
||||
"name": "Home Connect",
|
||||
"integration_type": "hub",
|
||||
"config_flow": true,
|
||||
"iot_class": "cloud_push",
|
||||
"single_config_entry": true
|
||||
},
|
||||
"home_plus_control": {
|
||||
"name": "Legrand Home+ Control",
|
||||
"integration_type": "virtual",
|
||||
|
||||
@@ -1311,7 +1311,7 @@ class _QueuedScriptRun(_ScriptRun):
|
||||
|
||||
lock_acquired = False
|
||||
|
||||
async def async_run(self) -> None:
|
||||
async def async_run(self) -> ScriptRunResult | None:
|
||||
"""Run script."""
|
||||
# Wait for previous run, if any, to finish by attempting to acquire the script's
|
||||
# shared lock. At the same time monitor if we've been told to stop.
|
||||
@@ -1325,7 +1325,7 @@ class _QueuedScriptRun(_ScriptRun):
|
||||
|
||||
self.lock_acquired = True
|
||||
# We've acquired the lock so we can go ahead and start the run.
|
||||
await super().async_run()
|
||||
return await super().async_run()
|
||||
|
||||
def _finish(self) -> None:
|
||||
if self.lock_acquired:
|
||||
|
||||
@@ -38,8 +38,8 @@ habluetooth==3.37.0
|
||||
hass-nabucasa==0.94.0
|
||||
hassil==2.2.3
|
||||
home-assistant-bluetooth==1.13.1
|
||||
home-assistant-frontend==20250327.0
|
||||
home-assistant-intents==2025.3.24
|
||||
home-assistant-frontend==20250328.0
|
||||
home-assistant-intents==2025.3.28
|
||||
httpx==0.28.1
|
||||
ifaddr==0.2.0
|
||||
Jinja2==3.1.6
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
"access_token": "Access token",
|
||||
"api_key": "API key",
|
||||
"api_token": "API token",
|
||||
"country": "Country",
|
||||
"device": "Device",
|
||||
"elevation": "Elevation",
|
||||
"email": "Email",
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "homeassistant"
|
||||
version = "2025.4.0b4"
|
||||
version = "2025.4.0b9"
|
||||
license = "Apache-2.0"
|
||||
license-files = ["LICENSE*", "homeassistant/backports/LICENSE*"]
|
||||
description = "Open-source home automation platform running on Python 3."
|
||||
|
||||
Generated
+6
-6
@@ -225,7 +225,7 @@ aiodiscover==2.6.1
|
||||
aiodns==3.2.0
|
||||
|
||||
# homeassistant.components.duke_energy
|
||||
aiodukeenergy==0.2.2
|
||||
aiodukeenergy==0.3.0
|
||||
|
||||
# homeassistant.components.eafm
|
||||
aioeafm==0.1.2
|
||||
@@ -422,7 +422,7 @@ aiowaqi==3.1.0
|
||||
aiowatttime==0.1.1
|
||||
|
||||
# homeassistant.components.webdav
|
||||
aiowebdav2==0.4.2
|
||||
aiowebdav2==0.4.4
|
||||
|
||||
# homeassistant.components.webostv
|
||||
aiowebostv==0.7.3
|
||||
@@ -1157,10 +1157,10 @@ hole==0.8.0
|
||||
holidays==0.69
|
||||
|
||||
# homeassistant.components.frontend
|
||||
home-assistant-frontend==20250327.0
|
||||
home-assistant-frontend==20250328.0
|
||||
|
||||
# homeassistant.components.conversation
|
||||
home-assistant-intents==2025.3.24
|
||||
home-assistant-intents==2025.3.28
|
||||
|
||||
# homeassistant.components.homematicip_cloud
|
||||
homematicip==1.1.7
|
||||
@@ -1453,7 +1453,7 @@ mozart-api==4.1.1.116.4
|
||||
mullvad-api==1.0.0
|
||||
|
||||
# homeassistant.components.music_assistant
|
||||
music-assistant-client==1.1.1
|
||||
music-assistant-client==1.2.0
|
||||
|
||||
# homeassistant.components.tts
|
||||
mutagen==1.47.0
|
||||
@@ -2476,7 +2476,7 @@ python-roborock==2.16.1
|
||||
python-smarttub==0.0.39
|
||||
|
||||
# homeassistant.components.snoo
|
||||
python-snoo==0.6.4
|
||||
python-snoo==0.6.5
|
||||
|
||||
# homeassistant.components.songpal
|
||||
python-songpal==0.16.2
|
||||
|
||||
Generated
+6
-6
@@ -213,7 +213,7 @@ aiodiscover==2.6.1
|
||||
aiodns==3.2.0
|
||||
|
||||
# homeassistant.components.duke_energy
|
||||
aiodukeenergy==0.2.2
|
||||
aiodukeenergy==0.3.0
|
||||
|
||||
# homeassistant.components.eafm
|
||||
aioeafm==0.1.2
|
||||
@@ -404,7 +404,7 @@ aiowaqi==3.1.0
|
||||
aiowatttime==0.1.1
|
||||
|
||||
# homeassistant.components.webdav
|
||||
aiowebdav2==0.4.2
|
||||
aiowebdav2==0.4.4
|
||||
|
||||
# homeassistant.components.webostv
|
||||
aiowebostv==0.7.3
|
||||
@@ -984,10 +984,10 @@ hole==0.8.0
|
||||
holidays==0.69
|
||||
|
||||
# homeassistant.components.frontend
|
||||
home-assistant-frontend==20250327.0
|
||||
home-assistant-frontend==20250328.0
|
||||
|
||||
# homeassistant.components.conversation
|
||||
home-assistant-intents==2025.3.24
|
||||
home-assistant-intents==2025.3.28
|
||||
|
||||
# homeassistant.components.homematicip_cloud
|
||||
homematicip==1.1.7
|
||||
@@ -1223,7 +1223,7 @@ mozart-api==4.1.1.116.4
|
||||
mullvad-api==1.0.0
|
||||
|
||||
# homeassistant.components.music_assistant
|
||||
music-assistant-client==1.1.1
|
||||
music-assistant-client==1.2.0
|
||||
|
||||
# homeassistant.components.tts
|
||||
mutagen==1.47.0
|
||||
@@ -2007,7 +2007,7 @@ python-roborock==2.16.1
|
||||
python-smarttub==0.0.39
|
||||
|
||||
# homeassistant.components.snoo
|
||||
python-snoo==0.6.4
|
||||
python-snoo==0.6.5
|
||||
|
||||
# homeassistant.components.songpal
|
||||
python-songpal==0.16.2
|
||||
|
||||
Generated
+1
-1
@@ -25,7 +25,7 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.6.10,source=/uv,target=/bin/uv \
|
||||
-c /usr/src/homeassistant/homeassistant/package_constraints.txt \
|
||||
-r /usr/src/homeassistant/requirements.txt \
|
||||
stdlib-list==0.10.0 pipdeptree==2.25.1 tqdm==4.67.1 ruff==0.11.0 \
|
||||
PyTurboJPEG==1.7.5 go2rtc-client==0.1.2 ha-ffmpeg==3.2.2 hassil==2.2.3 home-assistant-intents==2025.3.24 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
|
||||
PyTurboJPEG==1.7.5 go2rtc-client==0.1.2 ha-ffmpeg==3.2.2 hassil==2.2.3 home-assistant-intents==2025.3.28 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
|
||||
|
||||
LABEL "name"="hassfest"
|
||||
LABEL "maintainer"="Home Assistant <hello@home-assistant.io>"
|
||||
|
||||
@@ -445,6 +445,7 @@ async def test_connection_test(
|
||||
|
||||
assert len(entity.announcements) == 1
|
||||
assert entity.announcements[0].message == ""
|
||||
assert entity.announcements[0].preannounce_media_id is None
|
||||
announcement_media_id = entity.announcements[0].media_id
|
||||
hass_url = "http://10.10.10.10:8123"
|
||||
assert announcement_media_id.startswith(
|
||||
|
||||
@@ -127,7 +127,7 @@ async def test_awair_gen1_sensors(
|
||||
assert_expected_properties(
|
||||
hass,
|
||||
entity_registry,
|
||||
"sensor.living_room_vocs",
|
||||
"sensor.living_room_volatile_organic_compounds_parts",
|
||||
f"{AWAIR_UUID}_{SENSOR_TYPES_MAP[API_VOC].unique_id_tag}",
|
||||
"366",
|
||||
{
|
||||
|
||||
@@ -61,8 +61,8 @@ def mock_api() -> Generator[AsyncMock]:
|
||||
):
|
||||
api = mock_api.return_value
|
||||
api.authenticate.return_value = {
|
||||
"email": "TEST@EXAMPLE.COM",
|
||||
"cdp_internal_user_id": "test-username",
|
||||
"loginEmailAddress": "TEST@EXAMPLE.COM",
|
||||
"internalUserID": "test-username",
|
||||
}
|
||||
api.get_meters.return_value = {}
|
||||
yield api
|
||||
|
||||
@@ -260,6 +260,76 @@ async def test_entities_removed_after_reload(
|
||||
assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 1
|
||||
|
||||
|
||||
async def test_entities_for_entire_platform_removed(
|
||||
hass: HomeAssistant,
|
||||
entity_registry: er.EntityRegistry,
|
||||
mock_client: APIClient,
|
||||
hass_storage: dict[str, Any],
|
||||
mock_esphome_device: Callable[
|
||||
[APIClient, list[EntityInfo], list[UserService], list[EntityState]],
|
||||
Awaitable[MockESPHomeDevice],
|
||||
],
|
||||
) -> None:
|
||||
"""Test removing all entities for a specific platform when static info changes."""
|
||||
entity_info = [
|
||||
BinarySensorInfo(
|
||||
object_id="mybinary_sensor_to_be_removed",
|
||||
key=1,
|
||||
name="my binary_sensor to be removed",
|
||||
unique_id="mybinary_sensor_to_be_removed",
|
||||
),
|
||||
]
|
||||
states = [
|
||||
BinarySensorState(key=1, state=True, missing_state=False),
|
||||
]
|
||||
user_service = []
|
||||
mock_device = await mock_esphome_device(
|
||||
mock_client=mock_client,
|
||||
entity_info=entity_info,
|
||||
user_service=user_service,
|
||||
states=states,
|
||||
)
|
||||
entry = mock_device.entry
|
||||
entry_id = entry.entry_id
|
||||
storage_key = f"esphome.{entry_id}"
|
||||
state = hass.states.get("binary_sensor.test_mybinary_sensor_to_be_removed")
|
||||
assert state is not None
|
||||
assert state.state == STATE_ON
|
||||
|
||||
await hass.config_entries.async_unload(entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 1
|
||||
|
||||
state = hass.states.get("binary_sensor.test_mybinary_sensor_to_be_removed")
|
||||
assert state is not None
|
||||
reg_entry = entity_registry.async_get(
|
||||
"binary_sensor.test_mybinary_sensor_to_be_removed"
|
||||
)
|
||||
assert reg_entry is not None
|
||||
assert state.attributes[ATTR_RESTORED] is True
|
||||
|
||||
entity_info = []
|
||||
states = []
|
||||
mock_device = await mock_esphome_device(
|
||||
mock_client=mock_client,
|
||||
entity_info=entity_info,
|
||||
user_service=user_service,
|
||||
states=states,
|
||||
entry=entry,
|
||||
)
|
||||
assert mock_device.entry.entry_id == entry_id
|
||||
state = hass.states.get("binary_sensor.test_mybinary_sensor_to_be_removed")
|
||||
assert state is None
|
||||
reg_entry = entity_registry.async_get(
|
||||
"binary_sensor.test_mybinary_sensor_to_be_removed"
|
||||
)
|
||||
assert reg_entry is None
|
||||
await hass.config_entries.async_unload(entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
assert len(hass_storage[storage_key]["data"]["binary_sensor"]) == 0
|
||||
|
||||
|
||||
async def test_entity_info_object_ids(
|
||||
hass: HomeAssistant,
|
||||
mock_client: APIClient,
|
||||
|
||||
@@ -4,6 +4,7 @@ from aioesphomeapi import APIClient, Event, EventInfo
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.event import EventDeviceClass
|
||||
from homeassistant.const import STATE_UNAVAILABLE
|
||||
from homeassistant.core import HomeAssistant
|
||||
|
||||
|
||||
@@ -11,9 +12,9 @@ from homeassistant.core import HomeAssistant
|
||||
async def test_generic_event_entity(
|
||||
hass: HomeAssistant,
|
||||
mock_client: APIClient,
|
||||
mock_generic_device_entry,
|
||||
mock_esphome_device,
|
||||
) -> None:
|
||||
"""Test a generic event entity."""
|
||||
"""Test a generic event entity and its availability behavior."""
|
||||
entity_info = [
|
||||
EventInfo(
|
||||
object_id="myevent",
|
||||
@@ -26,13 +27,31 @@ async def test_generic_event_entity(
|
||||
]
|
||||
states = [Event(key=1, event_type="type1")]
|
||||
user_service = []
|
||||
await mock_generic_device_entry(
|
||||
device = await mock_esphome_device(
|
||||
mock_client=mock_client,
|
||||
entity_info=entity_info,
|
||||
user_service=user_service,
|
||||
states=states,
|
||||
)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Test initial state
|
||||
state = hass.states.get("event.test_myevent")
|
||||
assert state is not None
|
||||
assert state.state == "2024-04-24T00:00:00.000+00:00"
|
||||
assert state.attributes["event_type"] == "type1"
|
||||
|
||||
# Test device becomes unavailable
|
||||
await device.mock_disconnect(True)
|
||||
await hass.async_block_till_done()
|
||||
state = hass.states.get("event.test_myevent")
|
||||
assert state.state == STATE_UNAVAILABLE
|
||||
|
||||
# Test device becomes available again
|
||||
await device.mock_connect()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
# Event entity should be available immediately without waiting for data
|
||||
state = hass.states.get("event.test_myevent")
|
||||
assert state.state == "2024-04-24T00:00:00.000+00:00"
|
||||
assert state.attributes["event_type"] == "type1"
|
||||
|
||||
@@ -86,26 +86,28 @@ def stub_reconnect():
|
||||
)
|
||||
async def test_update_entity(
|
||||
hass: HomeAssistant,
|
||||
stub_reconnect,
|
||||
mock_config_entry,
|
||||
mock_device_info,
|
||||
mock_dashboard: dict[str, Any],
|
||||
devices_payload,
|
||||
expected_state,
|
||||
expected_attributes,
|
||||
devices_payload: list[dict[str, Any]],
|
||||
expected_state: str,
|
||||
expected_attributes: dict[str, Any],
|
||||
mock_client: APIClient,
|
||||
mock_esphome_device: Callable[
|
||||
[APIClient, list[EntityInfo], list[UserService], list[EntityState]],
|
||||
Awaitable[MockESPHomeDevice],
|
||||
],
|
||||
) -> None:
|
||||
"""Test ESPHome update entity."""
|
||||
mock_dashboard["configured"] = devices_payload
|
||||
await async_get_dashboard(hass).async_refresh()
|
||||
|
||||
with patch(
|
||||
"homeassistant.components.esphome.update.DomainData.get_entry_data",
|
||||
return_value=Mock(available=True, device_info=mock_device_info, info={}),
|
||||
):
|
||||
assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
await mock_esphome_device(
|
||||
mock_client=mock_client,
|
||||
entity_info=[],
|
||||
user_service=[],
|
||||
states=[],
|
||||
)
|
||||
|
||||
state = hass.states.get("update.none_firmware")
|
||||
state = hass.states.get("update.test_firmware")
|
||||
assert state is not None
|
||||
assert state.state == expected_state
|
||||
for key, expected_value in expected_attributes.items():
|
||||
@@ -130,7 +132,7 @@ async def test_update_entity(
|
||||
await hass.services.async_call(
|
||||
"update",
|
||||
"install",
|
||||
{"entity_id": "update.none_firmware"},
|
||||
{"entity_id": "update.test_firmware"},
|
||||
blocking=True,
|
||||
)
|
||||
|
||||
@@ -155,7 +157,7 @@ async def test_update_entity(
|
||||
await hass.services.async_call(
|
||||
"update",
|
||||
"install",
|
||||
{"entity_id": "update.none_firmware"},
|
||||
{"entity_id": "update.test_firmware"},
|
||||
blocking=True,
|
||||
)
|
||||
|
||||
@@ -177,7 +179,7 @@ async def test_update_entity(
|
||||
await hass.services.async_call(
|
||||
"update",
|
||||
"install",
|
||||
{"entity_id": "update.none_firmware"},
|
||||
{"entity_id": "update.test_firmware"},
|
||||
blocking=True,
|
||||
)
|
||||
|
||||
@@ -274,28 +276,30 @@ async def test_update_device_state_for_availability(
|
||||
|
||||
async def test_update_entity_dashboard_not_available_startup(
|
||||
hass: HomeAssistant,
|
||||
stub_reconnect,
|
||||
mock_config_entry,
|
||||
mock_device_info,
|
||||
mock_client: APIClient,
|
||||
mock_esphome_device: Callable[
|
||||
[APIClient, list[EntityInfo], list[UserService], list[EntityState]],
|
||||
Awaitable[MockESPHomeDevice],
|
||||
],
|
||||
mock_dashboard: dict[str, Any],
|
||||
) -> None:
|
||||
"""Test ESPHome update entity when dashboard is not available at startup."""
|
||||
with (
|
||||
patch(
|
||||
"homeassistant.components.esphome.update.DomainData.get_entry_data",
|
||||
return_value=Mock(available=True, device_info=mock_device_info, info={}),
|
||||
),
|
||||
patch(
|
||||
"esphome_dashboard_api.ESPHomeDashboardAPI.get_devices",
|
||||
side_effect=TimeoutError,
|
||||
),
|
||||
):
|
||||
await async_get_dashboard(hass).async_refresh()
|
||||
assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
await mock_esphome_device(
|
||||
mock_client=mock_client,
|
||||
entity_info=[],
|
||||
user_service=[],
|
||||
states=[],
|
||||
)
|
||||
|
||||
# We have a dashboard but it is not available
|
||||
state = hass.states.get("update.none_firmware")
|
||||
state = hass.states.get("update.test_firmware")
|
||||
assert state is None
|
||||
|
||||
mock_dashboard["configured"] = [
|
||||
@@ -308,7 +312,7 @@ async def test_update_entity_dashboard_not_available_startup(
|
||||
await async_get_dashboard(hass).async_refresh()
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get("update.none_firmware")
|
||||
state = hass.states.get("update.test_firmware")
|
||||
assert state.state == STATE_ON
|
||||
expected_attributes = {
|
||||
"latest_version": "2023.2.0-dev",
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
StateSnapshot({
|
||||
'attributes': ReadOnlyDict({
|
||||
'device_class': 'switch',
|
||||
'friendly_name': 'fake-device-1 Quiet',
|
||||
'friendly_name': 'fake-device-1 Quiet mode',
|
||||
}),
|
||||
'context': <ANY>,
|
||||
'entity_id': 'switch.fake_device_1_quiet',
|
||||
'entity_id': 'switch.fake_device_1_quiet_mode',
|
||||
'last_changed': <ANY>,
|
||||
'last_reported': <ANY>,
|
||||
'last_updated': <ANY>,
|
||||
@@ -40,10 +40,10 @@
|
||||
StateSnapshot({
|
||||
'attributes': ReadOnlyDict({
|
||||
'device_class': 'switch',
|
||||
'friendly_name': 'fake-device-1 XFan',
|
||||
'friendly_name': 'fake-device-1 Xtra fan',
|
||||
}),
|
||||
'context': <ANY>,
|
||||
'entity_id': 'switch.fake_device_1_xfan',
|
||||
'entity_id': 'switch.fake_device_1_xtra_fan',
|
||||
'last_changed': <ANY>,
|
||||
'last_reported': <ANY>,
|
||||
'last_updated': <ANY>,
|
||||
@@ -109,7 +109,7 @@
|
||||
'disabled_by': None,
|
||||
'domain': 'switch',
|
||||
'entity_category': None,
|
||||
'entity_id': 'switch.fake_device_1_quiet',
|
||||
'entity_id': 'switch.fake_device_1_quiet_mode',
|
||||
'has_entity_name': True,
|
||||
'hidden_by': None,
|
||||
'icon': None,
|
||||
@@ -121,7 +121,7 @@
|
||||
}),
|
||||
'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
|
||||
'original_icon': None,
|
||||
'original_name': 'Quiet',
|
||||
'original_name': 'Quiet mode',
|
||||
'platform': 'gree',
|
||||
'previous_unique_id': None,
|
||||
'supported_features': 0,
|
||||
@@ -173,7 +173,7 @@
|
||||
'disabled_by': None,
|
||||
'domain': 'switch',
|
||||
'entity_category': None,
|
||||
'entity_id': 'switch.fake_device_1_xfan',
|
||||
'entity_id': 'switch.fake_device_1_xtra_fan',
|
||||
'has_entity_name': True,
|
||||
'hidden_by': None,
|
||||
'icon': None,
|
||||
@@ -185,7 +185,7 @@
|
||||
}),
|
||||
'original_device_class': <SwitchDeviceClass.SWITCH: 'switch'>,
|
||||
'original_icon': None,
|
||||
'original_name': 'XFan',
|
||||
'original_name': 'Xtra fan',
|
||||
'platform': 'gree',
|
||||
'previous_unique_id': None,
|
||||
'supported_features': 0,
|
||||
|
||||
@@ -22,11 +22,11 @@ from homeassistant.setup import async_setup_component
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
ENTITY_ID_LIGHT_PANEL = f"{SWITCH_DOMAIN}.fake_device_1_panel_light"
|
||||
ENTITY_ID_PANEL_LIGHT = f"{SWITCH_DOMAIN}.fake_device_1_panel_light"
|
||||
ENTITY_ID_HEALTH_MODE = f"{SWITCH_DOMAIN}.fake_device_1_health_mode"
|
||||
ENTITY_ID_QUIET = f"{SWITCH_DOMAIN}.fake_device_1_quiet"
|
||||
ENTITY_ID_QUIET_MODE = f"{SWITCH_DOMAIN}.fake_device_1_quiet_mode"
|
||||
ENTITY_ID_FRESH_AIR = f"{SWITCH_DOMAIN}.fake_device_1_fresh_air"
|
||||
ENTITY_ID_XFAN = f"{SWITCH_DOMAIN}.fake_device_1_xfan"
|
||||
ENTITY_ID_XTRA_FAN = f"{SWITCH_DOMAIN}.fake_device_1_xtra_fan"
|
||||
|
||||
|
||||
async def async_setup_gree(hass: HomeAssistant) -> MockConfigEntry:
|
||||
@@ -54,11 +54,11 @@ async def test_registry_settings(
|
||||
@pytest.mark.parametrize(
|
||||
"entity",
|
||||
[
|
||||
ENTITY_ID_LIGHT_PANEL,
|
||||
ENTITY_ID_PANEL_LIGHT,
|
||||
ENTITY_ID_HEALTH_MODE,
|
||||
ENTITY_ID_QUIET,
|
||||
ENTITY_ID_QUIET_MODE,
|
||||
ENTITY_ID_FRESH_AIR,
|
||||
ENTITY_ID_XFAN,
|
||||
ENTITY_ID_XTRA_FAN,
|
||||
],
|
||||
)
|
||||
@pytest.mark.usefixtures("entity_registry_enabled_by_default")
|
||||
@@ -81,11 +81,11 @@ async def test_send_switch_on(hass: HomeAssistant, entity: str) -> None:
|
||||
@pytest.mark.parametrize(
|
||||
"entity",
|
||||
[
|
||||
ENTITY_ID_LIGHT_PANEL,
|
||||
ENTITY_ID_PANEL_LIGHT,
|
||||
ENTITY_ID_HEALTH_MODE,
|
||||
ENTITY_ID_QUIET,
|
||||
ENTITY_ID_QUIET_MODE,
|
||||
ENTITY_ID_FRESH_AIR,
|
||||
ENTITY_ID_XFAN,
|
||||
ENTITY_ID_XTRA_FAN,
|
||||
],
|
||||
)
|
||||
@pytest.mark.usefixtures("entity_registry_enabled_by_default")
|
||||
@@ -112,11 +112,11 @@ async def test_send_switch_on_device_timeout(
|
||||
@pytest.mark.parametrize(
|
||||
"entity",
|
||||
[
|
||||
ENTITY_ID_LIGHT_PANEL,
|
||||
ENTITY_ID_PANEL_LIGHT,
|
||||
ENTITY_ID_HEALTH_MODE,
|
||||
ENTITY_ID_QUIET,
|
||||
ENTITY_ID_QUIET_MODE,
|
||||
ENTITY_ID_FRESH_AIR,
|
||||
ENTITY_ID_XFAN,
|
||||
ENTITY_ID_XTRA_FAN,
|
||||
],
|
||||
)
|
||||
@pytest.mark.usefixtures("entity_registry_enabled_by_default")
|
||||
@@ -139,11 +139,11 @@ async def test_send_switch_off(hass: HomeAssistant, entity: str) -> None:
|
||||
@pytest.mark.parametrize(
|
||||
"entity",
|
||||
[
|
||||
ENTITY_ID_LIGHT_PANEL,
|
||||
ENTITY_ID_PANEL_LIGHT,
|
||||
ENTITY_ID_HEALTH_MODE,
|
||||
ENTITY_ID_QUIET,
|
||||
ENTITY_ID_QUIET_MODE,
|
||||
ENTITY_ID_FRESH_AIR,
|
||||
ENTITY_ID_XFAN,
|
||||
ENTITY_ID_XTRA_FAN,
|
||||
],
|
||||
)
|
||||
@pytest.mark.usefixtures("entity_registry_enabled_by_default")
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
"""Test SkyConnect firmware update entity."""
|
||||
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.homeassistant_hardware.helpers import (
|
||||
async_notify_firmware_info,
|
||||
)
|
||||
@@ -14,9 +16,7 @@ from .common import USB_DATA_ZBT1
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
UPDATE_ENTITY_ID = (
|
||||
"update.homeassistant_sky_connect_9e2adbd75b8beb119fe564a0f320645d_firmware"
|
||||
)
|
||||
UPDATE_ENTITY_ID = "update.home_assistant_connect_zbt_1_9e2adbd7_firmware"
|
||||
|
||||
|
||||
async def test_zbt1_update_entity(hass: HomeAssistant) -> None:
|
||||
@@ -59,8 +59,9 @@ async def test_zbt1_update_entity(hass: HomeAssistant) -> None:
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state_ezsp = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state_ezsp is not None
|
||||
assert state_ezsp.state == "unknown"
|
||||
assert state_ezsp.attributes["title"] == "EmberZNet"
|
||||
assert state_ezsp.attributes["title"] == "EmberZNet Zigbee"
|
||||
assert state_ezsp.attributes["installed_version"] == "7.3.1.0"
|
||||
assert state_ezsp.attributes["latest_version"] is None
|
||||
|
||||
@@ -80,7 +81,52 @@ async def test_zbt1_update_entity(hass: HomeAssistant) -> None:
|
||||
|
||||
# After the firmware update, the entity has the new version and the correct state
|
||||
state_spinel = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state_spinel is not None
|
||||
assert state_spinel.state == "unknown"
|
||||
assert state_spinel.attributes["title"] == "OpenThread RCP"
|
||||
assert state_spinel.attributes["installed_version"] == "2.4.4.0"
|
||||
assert state_spinel.attributes["latest_version"] is None
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("firmware", "version", "expected"),
|
||||
[
|
||||
("ezsp", "7.3.1.0 build 0", "EmberZNet Zigbee 7.3.1.0"),
|
||||
("spinel", "SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4", "OpenThread RCP 2.4.4.0"),
|
||||
("bootloader", "2.4.2", "Gecko Bootloader 2.4.2"),
|
||||
("cpc", "4.3.2", "Multiprotocol 4.3.2"),
|
||||
("router", "1.2.3.4", "Unknown 1.2.3.4"), # Not supported but still shown
|
||||
],
|
||||
)
|
||||
async def test_zbt1_update_entity_state(
|
||||
hass: HomeAssistant, firmware: str, version: str, expected: str
|
||||
) -> None:
|
||||
"""Test the ZBT-1 firmware update entity with different firmware types."""
|
||||
await async_setup_component(hass, "homeassistant", {})
|
||||
|
||||
zbt1_config_entry = MockConfigEntry(
|
||||
domain="homeassistant_sky_connect",
|
||||
data={
|
||||
"firmware": firmware,
|
||||
"firmware_version": version,
|
||||
"device": USB_DATA_ZBT1.device,
|
||||
"manufacturer": USB_DATA_ZBT1.manufacturer,
|
||||
"pid": USB_DATA_ZBT1.pid,
|
||||
"product": USB_DATA_ZBT1.description,
|
||||
"serial_number": USB_DATA_ZBT1.serial_number,
|
||||
"vid": USB_DATA_ZBT1.vid,
|
||||
},
|
||||
version=1,
|
||||
minor_version=3,
|
||||
)
|
||||
zbt1_config_entry.add_to_hass(hass)
|
||||
|
||||
assert await hass.config_entries.async_setup(zbt1_config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state is not None
|
||||
assert (
|
||||
f"{state.attributes['title']} {state.attributes['installed_version']}"
|
||||
== expected
|
||||
)
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.homeassistant_hardware.helpers import (
|
||||
async_notify_firmware_info,
|
||||
)
|
||||
@@ -15,7 +17,7 @@ from homeassistant.setup import async_setup_component
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
UPDATE_ENTITY_ID = "update.homeassistant_yellow_firmware"
|
||||
UPDATE_ENTITY_ID = "update.home_assistant_yellow_firmware"
|
||||
|
||||
|
||||
async def test_yellow_update_entity(hass: HomeAssistant) -> None:
|
||||
@@ -24,6 +26,7 @@ async def test_yellow_update_entity(hass: HomeAssistant) -> None:
|
||||
|
||||
# Set up the Yellow integration
|
||||
yellow_config_entry = MockConfigEntry(
|
||||
title="Home Assistant Yellow",
|
||||
domain="homeassistant_yellow",
|
||||
data={
|
||||
"firmware": "ezsp",
|
||||
@@ -62,8 +65,9 @@ async def test_yellow_update_entity(hass: HomeAssistant) -> None:
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state_ezsp = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state_ezsp is not None
|
||||
assert state_ezsp.state == "unknown"
|
||||
assert state_ezsp.attributes["title"] == "EmberZNet"
|
||||
assert state_ezsp.attributes["title"] == "EmberZNet Zigbee"
|
||||
assert state_ezsp.attributes["installed_version"] == "7.3.1.0"
|
||||
assert state_ezsp.attributes["latest_version"] is None
|
||||
|
||||
@@ -83,7 +87,58 @@ async def test_yellow_update_entity(hass: HomeAssistant) -> None:
|
||||
|
||||
# After the firmware update, the entity has the new version and the correct state
|
||||
state_spinel = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state_spinel is not None
|
||||
assert state_spinel.state == "unknown"
|
||||
assert state_spinel.attributes["title"] == "OpenThread RCP"
|
||||
assert state_spinel.attributes["installed_version"] == "2.4.4.0"
|
||||
assert state_spinel.attributes["latest_version"] is None
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("firmware", "version", "expected"),
|
||||
[
|
||||
("ezsp", "7.3.1.0 build 0", "EmberZNet Zigbee 7.3.1.0"),
|
||||
("spinel", "SL-OPENTHREAD/2.4.4.0_GitHub-7074a43e4", "OpenThread RCP 2.4.4.0"),
|
||||
("bootloader", "2.4.2", "Gecko Bootloader 2.4.2"),
|
||||
("cpc", "4.3.2", "Multiprotocol 4.3.2"),
|
||||
("router", "1.2.3.4", "Unknown 1.2.3.4"), # Not supported but still shown
|
||||
],
|
||||
)
|
||||
async def test_yellow_update_entity_state(
|
||||
hass: HomeAssistant, firmware: str, version: str, expected: str
|
||||
) -> None:
|
||||
"""Test the Yellow firmware update entity with different firmware types."""
|
||||
await async_setup_component(hass, "homeassistant", {})
|
||||
|
||||
# Set up the Yellow integration
|
||||
yellow_config_entry = MockConfigEntry(
|
||||
title="Home Assistant Yellow",
|
||||
domain="homeassistant_yellow",
|
||||
data={
|
||||
"firmware": firmware,
|
||||
"firmware_version": version,
|
||||
"device": RADIO_DEVICE,
|
||||
},
|
||||
version=1,
|
||||
minor_version=3,
|
||||
)
|
||||
yellow_config_entry.add_to_hass(hass)
|
||||
|
||||
with (
|
||||
patch(
|
||||
"homeassistant.components.homeassistant_yellow.is_hassio", return_value=True
|
||||
),
|
||||
patch(
|
||||
"homeassistant.components.homeassistant_yellow.get_os_info",
|
||||
return_value={"board": "yellow"},
|
||||
),
|
||||
):
|
||||
assert await hass.config_entries.async_setup(yellow_config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
state = hass.states.get(UPDATE_ENTITY_ID)
|
||||
assert state is not None
|
||||
assert (
|
||||
f"{state.attributes['title']} {state.attributes['installed_version']}"
|
||||
== expected
|
||||
)
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
"1/59/0": 2,
|
||||
"1/59/65533": 1,
|
||||
"1/59/1": 0,
|
||||
"1/59/2": 2,
|
||||
"1/59/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
|
||||
"1/59/65532": 30,
|
||||
"1/59/65528": [],
|
||||
@@ -102,7 +101,7 @@
|
||||
"2/59/0": 2,
|
||||
"2/59/65533": 1,
|
||||
"2/59/1": 0,
|
||||
"2/59/2": 2,
|
||||
"2/59/2": 4,
|
||||
"2/59/65531": [0, 1, 65528, 65529, 65531, 65532, 65533],
|
||||
"2/59/65532": 30,
|
||||
"2/59/65528": [],
|
||||
|
||||
@@ -132,6 +132,8 @@
|
||||
'event_types': list([
|
||||
'multi_press_1',
|
||||
'multi_press_2',
|
||||
'multi_press_3',
|
||||
'multi_press_4',
|
||||
'long_press',
|
||||
'long_release',
|
||||
]),
|
||||
@@ -172,6 +174,8 @@
|
||||
'event_types': list([
|
||||
'multi_press_1',
|
||||
'multi_press_2',
|
||||
'multi_press_3',
|
||||
'multi_press_4',
|
||||
'long_press',
|
||||
'long_release',
|
||||
]),
|
||||
|
||||
@@ -686,7 +686,7 @@
|
||||
'state': '20.0',
|
||||
})
|
||||
# ---
|
||||
# name: test_sensors[air_purifier][sensor.air_purifier_vocs-entry]
|
||||
# name: test_sensors[air_purifier][sensor.air_purifier_volatile_organic_compounds_parts-entry]
|
||||
EntityRegistryEntrySnapshot({
|
||||
'aliases': set({
|
||||
}),
|
||||
@@ -701,7 +701,7 @@
|
||||
'disabled_by': None,
|
||||
'domain': 'sensor',
|
||||
'entity_category': None,
|
||||
'entity_id': 'sensor.air_purifier_vocs',
|
||||
'entity_id': 'sensor.air_purifier_volatile_organic_compounds_parts',
|
||||
'has_entity_name': True,
|
||||
'hidden_by': None,
|
||||
'icon': None,
|
||||
@@ -713,7 +713,7 @@
|
||||
}),
|
||||
'original_device_class': <SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS: 'volatile_organic_compounds_parts'>,
|
||||
'original_icon': None,
|
||||
'original_name': 'VOCs',
|
||||
'original_name': 'Volatile organic compounds parts',
|
||||
'platform': 'matter',
|
||||
'previous_unique_id': None,
|
||||
'supported_features': 0,
|
||||
@@ -722,16 +722,16 @@
|
||||
'unit_of_measurement': 'ppm',
|
||||
})
|
||||
# ---
|
||||
# name: test_sensors[air_purifier][sensor.air_purifier_vocs-state]
|
||||
# name: test_sensors[air_purifier][sensor.air_purifier_volatile_organic_compounds_parts-state]
|
||||
StateSnapshot({
|
||||
'attributes': ReadOnlyDict({
|
||||
'device_class': 'volatile_organic_compounds_parts',
|
||||
'friendly_name': 'Air Purifier VOCs',
|
||||
'friendly_name': 'Air Purifier Volatile organic compounds parts',
|
||||
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
|
||||
'unit_of_measurement': 'ppm',
|
||||
}),
|
||||
'context': <ANY>,
|
||||
'entity_id': 'sensor.air_purifier_vocs',
|
||||
'entity_id': 'sensor.air_purifier_volatile_organic_compounds_parts',
|
||||
'last_changed': <ANY>,
|
||||
'last_reported': <ANY>,
|
||||
'last_updated': <ANY>,
|
||||
@@ -1167,7 +1167,7 @@
|
||||
'state': '20.08',
|
||||
})
|
||||
# ---
|
||||
# name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_vocs-entry]
|
||||
# name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts-entry]
|
||||
EntityRegistryEntrySnapshot({
|
||||
'aliases': set({
|
||||
}),
|
||||
@@ -1182,7 +1182,7 @@
|
||||
'disabled_by': None,
|
||||
'domain': 'sensor',
|
||||
'entity_category': None,
|
||||
'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_vocs',
|
||||
'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts',
|
||||
'has_entity_name': True,
|
||||
'hidden_by': None,
|
||||
'icon': None,
|
||||
@@ -1194,7 +1194,7 @@
|
||||
}),
|
||||
'original_device_class': <SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS: 'volatile_organic_compounds_parts'>,
|
||||
'original_icon': None,
|
||||
'original_name': 'VOCs',
|
||||
'original_name': 'Volatile organic compounds parts',
|
||||
'platform': 'matter',
|
||||
'previous_unique_id': None,
|
||||
'supported_features': 0,
|
||||
@@ -1203,16 +1203,16 @@
|
||||
'unit_of_measurement': 'ppm',
|
||||
})
|
||||
# ---
|
||||
# name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_vocs-state]
|
||||
# name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts-state]
|
||||
StateSnapshot({
|
||||
'attributes': ReadOnlyDict({
|
||||
'device_class': 'volatile_organic_compounds_parts',
|
||||
'friendly_name': 'lightfi-aq1-air-quality-sensor VOCs',
|
||||
'friendly_name': 'lightfi-aq1-air-quality-sensor Volatile organic compounds parts',
|
||||
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
|
||||
'unit_of_measurement': 'ppm',
|
||||
}),
|
||||
'context': <ANY>,
|
||||
'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_vocs',
|
||||
'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts',
|
||||
'last_changed': <ANY>,
|
||||
'last_reported': <ANY>,
|
||||
'last_updated': <ANY>,
|
||||
|
||||
@@ -36,7 +36,7 @@ async def test_generic_switch_node(
|
||||
assert state
|
||||
assert state.state == "unknown"
|
||||
assert state.name == "Mock Generic Switch Button"
|
||||
# check event_types from featuremap 30
|
||||
# check event_types from featuremap 14 (0b1110)
|
||||
assert state.attributes[ATTR_EVENT_TYPES] == [
|
||||
"initial_press",
|
||||
"short_release",
|
||||
@@ -76,7 +76,7 @@ async def test_generic_switch_multi_node(
|
||||
assert state_button_1.state == "unknown"
|
||||
# name should be 'DeviceName Button (1)' due to the label set to just '1'
|
||||
assert state_button_1.name == "Mock Generic Switch Button (1)"
|
||||
# check event_types from featuremap 14
|
||||
# check event_types from featuremap 30 (0b11110) and MultiPressMax unset (default 2)
|
||||
assert state_button_1.attributes[ATTR_EVENT_TYPES] == [
|
||||
"multi_press_1",
|
||||
"multi_press_2",
|
||||
@@ -84,11 +84,20 @@ async def test_generic_switch_multi_node(
|
||||
"long_release",
|
||||
]
|
||||
# check button 2
|
||||
state_button_1 = hass.states.get("event.mock_generic_switch_fancy_button")
|
||||
assert state_button_1
|
||||
assert state_button_1.state == "unknown"
|
||||
state_button_2 = hass.states.get("event.mock_generic_switch_fancy_button")
|
||||
assert state_button_2
|
||||
assert state_button_2.state == "unknown"
|
||||
# name should be 'DeviceName Fancy Button' due to the label set to 'Fancy Button'
|
||||
assert state_button_1.name == "Mock Generic Switch Fancy Button"
|
||||
assert state_button_2.name == "Mock Generic Switch Fancy Button"
|
||||
# check event_types from featuremap 30 (0b11110) and MultiPressMax 4
|
||||
assert state_button_2.attributes[ATTR_EVENT_TYPES] == [
|
||||
"multi_press_1",
|
||||
"multi_press_2",
|
||||
"multi_press_3",
|
||||
"multi_press_4",
|
||||
"long_press",
|
||||
"long_release",
|
||||
]
|
||||
|
||||
# trigger firing a multi press event
|
||||
await trigger_subscription_callback(
|
||||
|
||||
@@ -34,12 +34,16 @@
|
||||
"needs_poll": false,
|
||||
"poll_interval": 30,
|
||||
"enabled": true,
|
||||
"hidden": false,
|
||||
"icon": "mdi-speaker",
|
||||
"group_volume": 20,
|
||||
"display_name": "Test Player 1",
|
||||
"extra_data": {},
|
||||
"announcement_in_progress": false
|
||||
"power_control": "native",
|
||||
"volume_control": "native",
|
||||
"mute_control": "native",
|
||||
"hide_player_in_ui": ["when_unavailable"],
|
||||
"expose_to_ha": true,
|
||||
"can_group_with": ["00:00:00:00:00:02"],
|
||||
"source_list": []
|
||||
},
|
||||
{
|
||||
"player_id": "00:00:00:00:00:02",
|
||||
@@ -83,15 +87,27 @@
|
||||
},
|
||||
"synced_to": null,
|
||||
"enabled_by_default": true,
|
||||
"needs_poll": false,
|
||||
"poll_interval": 30,
|
||||
"enabled": true,
|
||||
"hidden": false,
|
||||
"icon": "mdi-speaker",
|
||||
"group_volume": 20,
|
||||
"display_name": "My Super Test Player 2",
|
||||
"extra_data": {},
|
||||
"announcement_in_progress": false
|
||||
"power_control": "native",
|
||||
"volume_control": "native",
|
||||
"mute_control": "native",
|
||||
"hide_player_in_ui": ["when_unavailable"],
|
||||
"expose_to_ha": true,
|
||||
"can_group_with": ["00:00:00:00:00:01"],
|
||||
"source_list": [
|
||||
{
|
||||
"id": "spotify",
|
||||
"name": "Spotify Connect",
|
||||
"passive": true,
|
||||
"can_play_pause": false,
|
||||
"can_seek": false,
|
||||
"can_next_previous": false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"player_id": "test_group_player_1",
|
||||
@@ -135,15 +151,17 @@
|
||||
},
|
||||
"synced_to": null,
|
||||
"enabled_by_default": true,
|
||||
"needs_poll": true,
|
||||
"poll_interval": 30,
|
||||
"enabled": true,
|
||||
"hidden": false,
|
||||
"icon": "mdi-speaker-multiple",
|
||||
"group_volume": 6,
|
||||
"display_name": "Test Group Player 1",
|
||||
"extra_data": {},
|
||||
"announcement_in_progress": false
|
||||
"power_control": "native",
|
||||
"volume_control": "native",
|
||||
"mute_control": "native",
|
||||
"hide_player_in_ui": ["when_unavailable"],
|
||||
"expose_to_ha": true,
|
||||
"can_group_with": [],
|
||||
"source_list": []
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -694,19 +694,6 @@ async def test_media_player_supported_features(
|
||||
assert state
|
||||
assert state.attributes["supported_features"] == expected_features
|
||||
|
||||
# remove pause capability from player, trigger subscription callback
|
||||
# and check if the supported features got updated
|
||||
music_assistant_client.players._players[mass_player_id].supported_features.remove(
|
||||
PlayerFeature.PAUSE
|
||||
)
|
||||
await trigger_subscription_callback(
|
||||
hass, music_assistant_client, EventType.PLAYER_CONFIG_UPDATED, mass_player_id
|
||||
)
|
||||
expected_features &= ~MediaPlayerEntityFeature.PAUSE
|
||||
state = hass.states.get(entity_id)
|
||||
assert state
|
||||
assert state.attributes["supported_features"] == expected_features
|
||||
|
||||
# remove grouping capability from player, trigger subscription callback
|
||||
# and check if the supported features got updated
|
||||
music_assistant_client.players._players[mass_player_id].supported_features.remove(
|
||||
|
||||
@@ -30,8 +30,8 @@ async def test_sensors(
|
||||
) -> None:
|
||||
"""Test the PVOutput sensors."""
|
||||
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_energy_consumed")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_energy_consumed")
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_energy_consumption")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_energy_consumption")
|
||||
assert entry
|
||||
assert state
|
||||
assert entry.unique_id == "12345_energy_consumption"
|
||||
@@ -40,14 +40,14 @@ async def test_sensors(
|
||||
assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
|
||||
assert (
|
||||
state.attributes.get(ATTR_FRIENDLY_NAME)
|
||||
== "Frenck's Solar Farm Energy consumed"
|
||||
== "Frenck's Solar Farm Energy consumption"
|
||||
)
|
||||
assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.TOTAL_INCREASING
|
||||
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.WATT_HOUR
|
||||
assert ATTR_ICON not in state.attributes
|
||||
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_energy_generated")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_energy_generated")
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_energy_generation")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_energy_generation")
|
||||
assert entry
|
||||
assert state
|
||||
assert entry.unique_id == "12345_energy_generation"
|
||||
@@ -56,7 +56,7 @@ async def test_sensors(
|
||||
assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY
|
||||
assert (
|
||||
state.attributes.get(ATTR_FRIENDLY_NAME)
|
||||
== "Frenck's Solar Farm Energy generated"
|
||||
== "Frenck's Solar Farm Energy generation"
|
||||
)
|
||||
assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.TOTAL_INCREASING
|
||||
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.WATT_HOUR
|
||||
@@ -78,8 +78,8 @@ async def test_sensors(
|
||||
assert ATTR_DEVICE_CLASS not in state.attributes
|
||||
assert ATTR_ICON not in state.attributes
|
||||
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_power_consumed")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_power_consumed")
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_power_consumption")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_power_consumption")
|
||||
assert entry
|
||||
assert state
|
||||
assert entry.unique_id == "12345_power_consumption"
|
||||
@@ -87,14 +87,15 @@ async def test_sensors(
|
||||
assert state.state == "2500.0"
|
||||
assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
|
||||
assert (
|
||||
state.attributes.get(ATTR_FRIENDLY_NAME) == "Frenck's Solar Farm Power consumed"
|
||||
state.attributes.get(ATTR_FRIENDLY_NAME)
|
||||
== "Frenck's Solar Farm Power consumption"
|
||||
)
|
||||
assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
|
||||
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
|
||||
assert ATTR_ICON not in state.attributes
|
||||
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_power_generated")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_power_generated")
|
||||
state = hass.states.get("sensor.frenck_s_solar_farm_power_generation")
|
||||
entry = entity_registry.async_get("sensor.frenck_s_solar_farm_power_generation")
|
||||
assert entry
|
||||
assert state
|
||||
assert entry.unique_id == "12345_power_generation"
|
||||
@@ -103,7 +104,7 @@ async def test_sensors(
|
||||
assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER
|
||||
assert (
|
||||
state.attributes.get(ATTR_FRIENDLY_NAME)
|
||||
== "Frenck's Solar Farm Power generated"
|
||||
== "Frenck's Solar Farm Power generation"
|
||||
)
|
||||
assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT
|
||||
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT
|
||||
|
||||
@@ -7,6 +7,7 @@ from pysmartthings import Attribute, Capability
|
||||
import pytest
|
||||
from syrupy import SnapshotAssertion
|
||||
|
||||
from homeassistant.components.event import ATTR_EVENT_TYPES
|
||||
from homeassistant.const import STATE_UNKNOWN, Platform
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.helpers import entity_registry as er
|
||||
@@ -59,3 +60,40 @@ async def test_state_update(
|
||||
hass.states.get("event.livingroom_smart_switch_button1").state
|
||||
== "2023-10-21T00:00:00.000+00:00"
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("device_fixture", ["heatit_zpushwall"])
|
||||
async def test_supported_button_values_update(
|
||||
hass: HomeAssistant,
|
||||
devices: AsyncMock,
|
||||
mock_config_entry: MockConfigEntry,
|
||||
freezer: FrozenDateTimeFactory,
|
||||
) -> None:
|
||||
"""Test supported button values update."""
|
||||
await setup_integration(hass, mock_config_entry)
|
||||
|
||||
freezer.move_to("2023-10-21")
|
||||
|
||||
assert (
|
||||
hass.states.get("event.livingroom_smart_switch_button1").state == STATE_UNKNOWN
|
||||
)
|
||||
assert hass.states.get("event.livingroom_smart_switch_button1").attributes[
|
||||
ATTR_EVENT_TYPES
|
||||
] == ["pushed", "held", "down_hold"]
|
||||
|
||||
await trigger_update(
|
||||
hass,
|
||||
devices,
|
||||
"5e5b97f3-3094-44e6-abc0-f61283412d6a",
|
||||
Capability.BUTTON,
|
||||
Attribute.SUPPORTED_BUTTON_VALUES,
|
||||
["pushed", "held", "down_hold", "pushed_2x"],
|
||||
component="button1",
|
||||
)
|
||||
|
||||
assert (
|
||||
hass.states.get("event.livingroom_smart_switch_button1").state == STATE_UNKNOWN
|
||||
)
|
||||
assert hass.states.get("event.livingroom_smart_switch_button1").attributes[
|
||||
ATTR_EVENT_TYPES
|
||||
] == ["pushed", "held", "down_hold", "pushed_2x"]
|
||||
|
||||
@@ -60,8 +60,6 @@ async def test_state_update(
|
||||
@pytest.mark.parametrize(
|
||||
("device_fixture", "entity_id", "translation_key"),
|
||||
[
|
||||
("da_wm_wm_000001", "sensor.washer_machine_state", "machine_state"),
|
||||
("da_wm_wd_000001", "sensor.dryer_machine_state", "machine_state"),
|
||||
("hw_q80r_soundbar", "sensor.soundbar_volume", "media_player"),
|
||||
("hw_q80r_soundbar", "sensor.soundbar_media_playback_status", "media_player"),
|
||||
("hw_q80r_soundbar", "sensor.soundbar_media_input_source", "media_player"),
|
||||
|
||||
@@ -8,6 +8,7 @@ from syrupy.assertion import SnapshotAssertion
|
||||
from homeassistant.components import switch, template
|
||||
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
|
||||
from homeassistant.components.template.switch import rewrite_legacy_to_modern_conf
|
||||
from homeassistant.config_entries import SOURCE_USER
|
||||
from homeassistant.const import (
|
||||
ATTR_ENTITY_ID,
|
||||
SERVICE_TURN_OFF,
|
||||
@@ -17,6 +18,7 @@ from homeassistant.const import (
|
||||
STATE_UNAVAILABLE,
|
||||
)
|
||||
from homeassistant.core import CoreState, HomeAssistant, ServiceCall, State
|
||||
from homeassistant.data_entry_flow import FlowResultType
|
||||
from homeassistant.helpers import device_registry as dr, entity_registry as er
|
||||
from homeassistant.helpers.template import Template
|
||||
from homeassistant.setup import async_setup_component
|
||||
@@ -29,6 +31,7 @@ from tests.common import (
|
||||
mock_component,
|
||||
mock_restore_cache,
|
||||
)
|
||||
from tests.typing import WebSocketGenerator
|
||||
|
||||
TEST_OBJECT_ID = "test_template_switch"
|
||||
TEST_ENTITY_ID = f"switch.{TEST_OBJECT_ID}"
|
||||
@@ -279,6 +282,46 @@ async def test_setup_config_entry(
|
||||
assert state == snapshot
|
||||
|
||||
|
||||
@pytest.mark.parametrize("state_key", ["value_template", "state"])
|
||||
async def test_flow_preview(
|
||||
hass: HomeAssistant,
|
||||
state_key: str,
|
||||
hass_ws_client: WebSocketGenerator,
|
||||
) -> None:
|
||||
"""Test the config flow preview."""
|
||||
client = await hass_ws_client(hass)
|
||||
|
||||
result = await hass.config_entries.flow.async_init(
|
||||
template.DOMAIN, context={"source": SOURCE_USER}
|
||||
)
|
||||
assert result["type"] is FlowResultType.MENU
|
||||
|
||||
result = await hass.config_entries.flow.async_configure(
|
||||
result["flow_id"],
|
||||
{"next_step_id": SWITCH_DOMAIN},
|
||||
)
|
||||
await hass.async_block_till_done()
|
||||
assert result["type"] is FlowResultType.FORM
|
||||
assert result["step_id"] == SWITCH_DOMAIN
|
||||
assert result["errors"] is None
|
||||
assert result["preview"] == "template"
|
||||
|
||||
await client.send_json_auto_id(
|
||||
{
|
||||
"type": "template/start_preview",
|
||||
"flow_id": result["flow_id"],
|
||||
"flow_type": "config_flow",
|
||||
"user_input": {"name": "My template", state_key: "{{ 'on' }}"},
|
||||
}
|
||||
)
|
||||
msg = await client.receive_json()
|
||||
assert msg["success"]
|
||||
assert msg["result"] is None
|
||||
|
||||
msg = await client.receive_json()
|
||||
assert msg["event"]["state"] == "on"
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("count", "state_template"), [(1, "{{ states.switch.test_state.state }}")]
|
||||
)
|
||||
|
||||
@@ -241,7 +241,7 @@ async def test_pending_msg_peak(
|
||||
instance: http.WebSocketHandler = cast(http.WebSocketHandler, setup_instance)
|
||||
|
||||
# Fill the queue past the allowed peak
|
||||
for _ in range(10):
|
||||
for _ in range(20):
|
||||
instance._send_message({"overload": "message"})
|
||||
|
||||
async_fire_time_changed(
|
||||
@@ -251,7 +251,7 @@ async def test_pending_msg_peak(
|
||||
msg = await websocket_client.receive()
|
||||
assert msg.type is WSMsgType.CLOSE
|
||||
assert "Client unable to keep up with pending messages" in caplog.text
|
||||
assert "Stayed over 5 for 5 seconds" in caplog.text
|
||||
assert "Stayed over 5 for 10 seconds" in caplog.text
|
||||
assert "overload" in caplog.text
|
||||
|
||||
|
||||
|
||||
@@ -5853,14 +5853,16 @@ async def test_stop_action_subscript(
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(("var", "response"), [(1, "If: Then"), (2, "Testing 123")])
|
||||
@pytest.mark.parametrize(
|
||||
("var", "response"),
|
||||
[(1, "If: Then"), (2, "Testing 123")],
|
||||
("script_mode", "max_runs"), [("single", 1), ("parallel", 2), ("queued", 2)]
|
||||
)
|
||||
async def test_stop_action_response_variables(
|
||||
hass: HomeAssistant,
|
||||
var: int,
|
||||
response: str,
|
||||
script_mode,
|
||||
max_runs,
|
||||
) -> None:
|
||||
"""Test setting stop response_variable in a subscript."""
|
||||
sequence = cv.SCRIPT_SCHEMA(
|
||||
@@ -5879,7 +5881,14 @@ async def test_stop_action_response_variables(
|
||||
{"stop": "In the name of love", "response_variable": "output"},
|
||||
]
|
||||
)
|
||||
script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
|
||||
script_obj = script.Script(
|
||||
hass,
|
||||
sequence,
|
||||
"Test Name",
|
||||
"test_domain",
|
||||
script_mode=script_mode,
|
||||
max_runs=max_runs,
|
||||
)
|
||||
|
||||
run_vars = MappingProxyType({"var": var})
|
||||
result = await script_obj.async_run(run_vars, context=Context())
|
||||
|
||||
Reference in New Issue
Block a user