diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 805e3ac4dbd..a059710d3d7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
- id: ruff-format
files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
- repo: https://github.com/codespell-project/codespell
- rev: v2.3.0
+ rev: v2.4.1
hooks:
- id: codespell
args:
diff --git a/CODEOWNERS b/CODEOWNERS
index 635f53d346f..e510eec6dfa 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -731,6 +731,8 @@ build.json @home-assistant/supervisor
/homeassistant/components/intent/ @home-assistant/core @synesthesiam
/tests/components/intent/ @home-assistant/core @synesthesiam
/homeassistant/components/intesishome/ @jnimmo
+/homeassistant/components/iometer/ @MaestroOnICe
+/tests/components/iometer/ @MaestroOnICe
/homeassistant/components/ios/ @robbiet480
/tests/components/ios/ @robbiet480
/homeassistant/components/iotawatt/ @gtdiehl @jyavenard
@@ -765,8 +767,8 @@ build.json @home-assistant/supervisor
/tests/components/ituran/ @shmuelzon
/homeassistant/components/izone/ @Swamp-Ig
/tests/components/izone/ @Swamp-Ig
-/homeassistant/components/jellyfin/ @j-stienstra @ctalkington
-/tests/components/jellyfin/ @j-stienstra @ctalkington
+/homeassistant/components/jellyfin/ @RunC0deRun @ctalkington
+/tests/components/jellyfin/ @RunC0deRun @ctalkington
/homeassistant/components/jewish_calendar/ @tsvi
/tests/components/jewish_calendar/ @tsvi
/homeassistant/components/juicenet/ @jesserockz
diff --git a/Dockerfile b/Dockerfile
index 171d08731a9..19b2c97b181 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV \
ARG QEMU_CPU
# Install uv
-RUN pip3 install uv==0.5.21
+RUN pip3 install uv==0.5.27
WORKDIR /usr/src
diff --git a/homeassistant/components/airthings_ble/config_flow.py b/homeassistant/components/airthings_ble/config_flow.py
index 48c7219cbaf..3e7b659bff1 100644
--- a/homeassistant/components/airthings_ble/config_flow.py
+++ b/homeassistant/components/airthings_ble/config_flow.py
@@ -144,7 +144,7 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_create_entry(title=discovery.name, data={})
- current_addresses = self._async_current_ids()
+ current_addresses = self._async_current_ids(include_ignore=False)
for discovery_info in async_discovered_service_info(self.hass):
address = discovery_info.address
if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/analytics_insights/manifest.json b/homeassistant/components/analytics_insights/manifest.json
index bf99d89e073..ab3c2e2fe24 100644
--- a/homeassistant/components/analytics_insights/manifest.json
+++ b/homeassistant/components/analytics_insights/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["python_homeassistant_analytics"],
- "requirements": ["python-homeassistant-analytics==0.8.1"],
+ "requirements": ["python-homeassistant-analytics==0.9.0"],
"single_config_entry": true
}
diff --git a/homeassistant/components/anthropic/conversation.py b/homeassistant/components/anthropic/conversation.py
index e45e849adf6..259d1295809 100644
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -272,6 +272,7 @@ class AnthropicConversationEntity(
continue
tool_input = llm.ToolInput(
+ id=tool_call.id,
tool_name=tool_call.name,
tool_args=cast(dict[str, Any], tool_call.input),
)
diff --git a/homeassistant/components/apple_tv/config_flow.py b/homeassistant/components/apple_tv/config_flow.py
index 5c317755d05..76c4681a30d 100644
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -134,7 +134,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
unique_id for said entry. When a new (zeroconf) service or device is
discovered, the identifier is first used to look up if it belongs to an
existing config entry. If that's the case, the unique_id from that entry is
- re-used, otherwise the newly discovered identifier is used instead.
+ reused, otherwise the newly discovered identifier is used instead.
"""
assert self.atv
all_identifiers = set(self.atv.all_identifiers)
diff --git a/homeassistant/components/aranet/config_flow.py b/homeassistant/components/aranet/config_flow.py
index db89124c54d..876b175126e 100644
--- a/homeassistant/components/aranet/config_flow.py
+++ b/homeassistant/components/aranet/config_flow.py
@@ -92,7 +92,7 @@ class AranetConfigFlow(ConfigFlow, domain=DOMAIN):
title=self._discovered_devices[address][0], data={}
)
- current_addresses = self._async_current_ids()
+ current_addresses = self._async_current_ids(include_ignore=False)
for discovery_info in async_discovered_service_info(self.hass, False):
address = discovery_info.address
if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/aranet/manifest.json b/homeassistant/components/aranet/manifest.json
index ac45e352bb6..3131b00cda6 100644
--- a/homeassistant/components/aranet/manifest.json
+++ b/homeassistant/components/aranet/manifest.json
@@ -19,5 +19,5 @@
"documentation": "https://www.home-assistant.io/integrations/aranet",
"integration_type": "device",
"iot_class": "local_push",
- "requirements": ["aranet4==2.5.0"]
+ "requirements": ["aranet4==2.5.1"]
}
diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py
index cc7ecc1c426..9a32821e3a0 100644
--- a/homeassistant/components/assist_pipeline/__init__.py
+++ b/homeassistant/components/assist_pipeline/__init__.py
@@ -9,6 +9,7 @@ import voluptuous as vol
from homeassistant.components import stt
from homeassistant.core import Context, HomeAssistant
+from homeassistant.helpers import chat_session
from homeassistant.helpers.typing import ConfigType
from .const import (
@@ -114,24 +115,25 @@ async def async_pipeline_from_audio_stream(
Raises PipelineNotFound if no pipeline is found.
"""
- pipeline_input = PipelineInput(
- conversation_id=conversation_id,
- device_id=device_id,
- stt_metadata=stt_metadata,
- stt_stream=stt_stream,
- wake_word_phrase=wake_word_phrase,
- conversation_extra_system_prompt=conversation_extra_system_prompt,
- run=PipelineRun(
- hass,
- context=context,
- pipeline=async_get_pipeline(hass, pipeline_id=pipeline_id),
- start_stage=start_stage,
- end_stage=end_stage,
- event_callback=event_callback,
- tts_audio_output=tts_audio_output,
- wake_word_settings=wake_word_settings,
- audio_settings=audio_settings or AudioSettings(),
- ),
- )
- await pipeline_input.validate()
- await pipeline_input.execute()
+ with chat_session.async_get_chat_session(hass, conversation_id) as session:
+ pipeline_input = PipelineInput(
+ conversation_id=session.conversation_id,
+ device_id=device_id,
+ stt_metadata=stt_metadata,
+ stt_stream=stt_stream,
+ wake_word_phrase=wake_word_phrase,
+ conversation_extra_system_prompt=conversation_extra_system_prompt,
+ run=PipelineRun(
+ hass,
+ context=context,
+ pipeline=async_get_pipeline(hass, pipeline_id=pipeline_id),
+ start_stage=start_stage,
+ end_stage=end_stage,
+ event_callback=event_callback,
+ tts_audio_output=tts_audio_output,
+ wake_word_settings=wake_word_settings,
+ audio_settings=audio_settings or AudioSettings(),
+ ),
+ )
+ await pipeline_input.validate()
+ await pipeline_input.execute()
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index 1d320d79bf2..94e2b04d7ae 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -33,7 +33,7 @@ from homeassistant.components.tts import (
from homeassistant.const import MATCH_ALL
from homeassistant.core import Context, HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import intent
+from homeassistant.helpers import chat_session, intent
from homeassistant.helpers.collection import (
CHANGE_UPDATED,
CollectionError,
@@ -624,7 +624,7 @@ class PipelineRun:
return
pipeline_data.pipeline_debug[self.pipeline.id][self.id].events.append(event)
- def start(self, device_id: str | None) -> None:
+ def start(self, conversation_id: str, device_id: str | None) -> None:
"""Emit run start event."""
self._device_id = device_id
self._start_debug_recording_thread()
@@ -632,6 +632,7 @@ class PipelineRun:
data = {
"pipeline": self.pipeline.id,
"language": self.language,
+ "conversation_id": conversation_id,
}
if self.runner_data is not None:
data["runner_data"] = self.runner_data
@@ -1015,7 +1016,7 @@ class PipelineRun:
async def recognize_intent(
self,
intent_input: str,
- conversation_id: str | None,
+ conversation_id: str,
device_id: str | None,
conversation_extra_system_prompt: str | None,
) -> str:
@@ -1063,11 +1064,11 @@ class PipelineRun:
agent_id=self.intent_agent,
extra_system_prompt=conversation_extra_system_prompt,
)
- processed_locally = self.intent_agent == conversation.HOME_ASSISTANT_AGENT
- agent_id = user_input.agent_id
+ agent_id = self.intent_agent
+ processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
intent_response: intent.IntentResponse | None = None
- if user_input.agent_id != conversation.HOME_ASSISTANT_AGENT:
+ if not processed_locally:
# Sentence triggers override conversation agent
if (
trigger_response_text
@@ -1094,22 +1095,26 @@ class PipelineRun:
# It was already handled, create response and add to chat history
if intent_response is not None:
- async with conversation.async_get_chat_session(
- self.hass, user_input
- ) as chat_session:
+ with (
+ chat_session.async_get_chat_session(
+ self.hass, user_input.conversation_id
+ ) as session,
+ conversation.async_get_chat_log(
+ self.hass, session, user_input
+ ) as chat_log,
+ ):
speech: str = intent_response.speech.get("plain", {}).get(
"speech", ""
)
- chat_session.async_add_message(
- conversation.Content(
- role="assistant",
+ chat_log.async_add_assistant_content_without_tools(
+ conversation.AssistantContent(
agent_id=agent_id,
content=speech,
)
)
conversation_result = conversation.ConversationResult(
response=intent_response,
- conversation_id=chat_session.conversation_id,
+ conversation_id=session.conversation_id,
)
else:
@@ -1404,12 +1409,15 @@ def _pipeline_debug_recording_thread_proc(
wav_writer.close()
-@dataclass
+@dataclass(kw_only=True)
class PipelineInput:
"""Input to a pipeline run."""
run: PipelineRun
+ conversation_id: str
+ """Identifier for the conversation."""
+
stt_metadata: stt.SpeechMetadata | None = None
"""Metadata of stt input audio. Required when start_stage = stt."""
@@ -1425,9 +1433,6 @@ class PipelineInput:
tts_input: str | None = None
"""Input for text-to-speech. Required when start_stage = tts."""
- conversation_id: str | None = None
- """Identifier for the conversation."""
-
conversation_extra_system_prompt: str | None = None
"""Extra prompt information for the conversation agent."""
@@ -1436,7 +1441,7 @@ class PipelineInput:
async def execute(self) -> None:
"""Run pipeline."""
- self.run.start(device_id=self.device_id)
+ self.run.start(conversation_id=self.conversation_id, device_id=self.device_id)
current_stage: PipelineStage | None = self.run.start_stage
stt_audio_buffer: list[EnhancedAudioChunk] = []
stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py
index 69f917fcf83..d2d54a1b7c3 100644
--- a/homeassistant/components/assist_pipeline/websocket_api.py
+++ b/homeassistant/components/assist_pipeline/websocket_api.py
@@ -14,7 +14,11 @@ import voluptuous as vol
from homeassistant.components import conversation, stt, tts, websocket_api
from homeassistant.const import ATTR_DEVICE_ID, ATTR_SECONDS, MATCH_ALL
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers import (
+ chat_session,
+ config_validation as cv,
+ entity_registry as er,
+)
from homeassistant.util import language as language_util
from .const import (
@@ -145,7 +149,6 @@ async def websocket_run(
# Arguments to PipelineInput
input_args: dict[str, Any] = {
- "conversation_id": msg.get("conversation_id"),
"device_id": msg.get("device_id"),
}
@@ -233,38 +236,42 @@ async def websocket_run(
audio_settings=audio_settings or AudioSettings(),
)
- pipeline_input = PipelineInput(**input_args)
+ with chat_session.async_get_chat_session(
+ hass, msg.get("conversation_id")
+ ) as session:
+ input_args["conversation_id"] = session.conversation_id
+ pipeline_input = PipelineInput(**input_args)
- try:
- await pipeline_input.validate()
- except PipelineError as error:
- # Report more specific error when possible
- connection.send_error(msg["id"], error.code, error.message)
- return
+ try:
+ await pipeline_input.validate()
+ except PipelineError as error:
+ # Report more specific error when possible
+ connection.send_error(msg["id"], error.code, error.message)
+ return
- # Confirm subscription
- connection.send_result(msg["id"])
+ # Confirm subscription
+ connection.send_result(msg["id"])
- run_task = hass.async_create_task(pipeline_input.execute())
+ run_task = hass.async_create_task(pipeline_input.execute())
- # Cancel pipeline if user unsubscribes
- connection.subscriptions[msg["id"]] = run_task.cancel
+ # Cancel pipeline if user unsubscribes
+ connection.subscriptions[msg["id"]] = run_task.cancel
- try:
- # Task contains a timeout
- async with asyncio.timeout(timeout):
- await run_task
- except TimeoutError:
- pipeline_input.run.process_event(
- PipelineEvent(
- PipelineEventType.ERROR,
- {"code": "timeout", "message": "Timeout running pipeline"},
+ try:
+ # Task contains a timeout
+ async with asyncio.timeout(timeout):
+ await run_task
+ except TimeoutError:
+ pipeline_input.run.process_event(
+ PipelineEvent(
+ PipelineEventType.ERROR,
+ {"code": "timeout", "message": "Timeout running pipeline"},
+ )
)
- )
- finally:
- if unregister_handler is not None:
- # Unregister binary handler
- unregister_handler()
+ finally:
+ if unregister_handler is not None:
+ # Unregister binary handler
+ unregister_handler()
@callback
diff --git a/homeassistant/components/assist_satellite/entity.py b/homeassistant/components/assist_satellite/entity.py
index 0229e0358b1..e43abb4539c 100644
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -8,7 +8,7 @@ from dataclasses import dataclass
from enum import StrEnum
import logging
import time
-from typing import Any, Final, Literal, final
+from typing import Any, Literal, final
from homeassistant.components import conversation, media_source, stt, tts
from homeassistant.components.assist_pipeline import (
@@ -28,14 +28,12 @@ from homeassistant.components.tts import (
)
from homeassistant.core import Context, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity
+from homeassistant.helpers import chat_session, entity
from homeassistant.helpers.entity import EntityDescription
from .const import AssistSatelliteEntityFeature
from .errors import AssistSatelliteError, SatelliteBusyError
-_CONVERSATION_TIMEOUT_SEC: Final = 5 * 60 # 5 minutes
-
_LOGGER = logging.getLogger(__name__)
@@ -114,7 +112,6 @@ class AssistSatelliteEntity(entity.Entity):
_attr_vad_sensitivity_entity_id: str | None = None
_conversation_id: str | None = None
- _conversation_id_time: float | None = None
_run_has_tts: bool = False
_is_announcing = False
@@ -260,8 +257,27 @@ class AssistSatelliteEntity(entity.Entity):
else:
self._extra_system_prompt = start_message or None
+ with (
+ # Not passing in a conversation ID will force a new one to be created
+ chat_session.async_get_chat_session(self.hass) as session,
+ conversation.async_get_chat_log(self.hass, session) as chat_log,
+ ):
+ self._conversation_id = session.conversation_id
+
+ if start_message:
+ chat_log.async_add_assistant_content_without_tools(
+ conversation.AssistantContent(
+ agent_id=self.entity_id, content=start_message
+ )
+ )
+
try:
await self.async_start_conversation(announcement)
+ except Exception:
+ # Clear prompt on error
+ self._conversation_id = None
+ self._extra_system_prompt = None
+ raise
finally:
self._is_announcing = False
@@ -325,51 +341,52 @@ class AssistSatelliteEntity(entity.Entity):
assert self._context is not None
- # Reset conversation id if necessary
- if self._conversation_id_time and (
- (time.monotonic() - self._conversation_id_time) > _CONVERSATION_TIMEOUT_SEC
- ):
- self._conversation_id = None
- self._conversation_id_time = None
-
# Set entity state based on pipeline events
self._run_has_tts = False
assert self.platform.config_entry is not None
- self._pipeline_task = self.platform.config_entry.async_create_background_task(
- self.hass,
- async_pipeline_from_audio_stream(
- self.hass,
- context=self._context,
- event_callback=self._internal_on_pipeline_event,
- stt_metadata=stt.SpeechMetadata(
- language="", # set in async_pipeline_from_audio_stream
- format=stt.AudioFormats.WAV,
- codec=stt.AudioCodecs.PCM,
- bit_rate=stt.AudioBitRates.BITRATE_16,
- sample_rate=stt.AudioSampleRates.SAMPLERATE_16000,
- channel=stt.AudioChannels.CHANNEL_MONO,
- ),
- stt_stream=audio_stream,
- pipeline_id=self._resolve_pipeline(),
- conversation_id=self._conversation_id,
- device_id=device_id,
- tts_audio_output=self.tts_options,
- wake_word_phrase=wake_word_phrase,
- audio_settings=AudioSettings(
- silence_seconds=self._resolve_vad_sensitivity()
- ),
- start_stage=start_stage,
- end_stage=end_stage,
- conversation_extra_system_prompt=extra_system_prompt,
- ),
- f"{self.entity_id}_pipeline",
- )
- try:
- await self._pipeline_task
- finally:
- self._pipeline_task = None
+ with chat_session.async_get_chat_session(
+ self.hass, self._conversation_id
+ ) as session:
+ # Store the conversation ID. If it is no longer valid, get_chat_session will reset it
+ self._conversation_id = session.conversation_id
+ self._pipeline_task = (
+ self.platform.config_entry.async_create_background_task(
+ self.hass,
+ async_pipeline_from_audio_stream(
+ self.hass,
+ context=self._context,
+ event_callback=self._internal_on_pipeline_event,
+ stt_metadata=stt.SpeechMetadata(
+ language="", # set in async_pipeline_from_audio_stream
+ format=stt.AudioFormats.WAV,
+ codec=stt.AudioCodecs.PCM,
+ bit_rate=stt.AudioBitRates.BITRATE_16,
+ sample_rate=stt.AudioSampleRates.SAMPLERATE_16000,
+ channel=stt.AudioChannels.CHANNEL_MONO,
+ ),
+ stt_stream=audio_stream,
+ pipeline_id=self._resolve_pipeline(),
+ conversation_id=session.conversation_id,
+ device_id=device_id,
+ tts_audio_output=self.tts_options,
+ wake_word_phrase=wake_word_phrase,
+ audio_settings=AudioSettings(
+ silence_seconds=self._resolve_vad_sensitivity()
+ ),
+ start_stage=start_stage,
+ end_stage=end_stage,
+ conversation_extra_system_prompt=extra_system_prompt,
+ ),
+ f"{self.entity_id}_pipeline",
+ )
+ )
+
+ try:
+ await self._pipeline_task
+ finally:
+ self._pipeline_task = None
async def _cancel_running_pipeline(self) -> None:
"""Cancel the current pipeline if it's running."""
@@ -393,11 +410,6 @@ class AssistSatelliteEntity(entity.Entity):
self._set_state(AssistSatelliteState.LISTENING)
elif event.type is PipelineEventType.INTENT_START:
self._set_state(AssistSatelliteState.PROCESSING)
- elif event.type is PipelineEventType.INTENT_END:
- assert event.data is not None
- # Update timeout
- self._conversation_id_time = time.monotonic()
- self._conversation_id = event.data["intent_output"]["conversation_id"]
elif event.type is PipelineEventType.TTS_START:
# Wait until tts_response_finished is called to return to waiting state
self._run_has_tts = True
diff --git a/homeassistant/components/august/manifest.json b/homeassistant/components/august/manifest.json
index 652f1a7b966..5e16a22af76 100644
--- a/homeassistant/components/august/manifest.json
+++ b/homeassistant/components/august/manifest.json
@@ -28,5 +28,5 @@
"documentation": "https://www.home-assistant.io/integrations/august",
"iot_class": "cloud_push",
"loggers": ["pubnub", "yalexs"],
- "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.6"]
+ "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.7"]
}
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 86e5b95d196..71a4f5ea41a 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -26,15 +26,18 @@ from .manager import (
BackupReaderWriterError,
CoreBackupReaderWriter,
CreateBackupEvent,
+ CreateBackupStage,
+ CreateBackupState,
IdleEvent,
IncorrectPasswordError,
ManagerBackup,
NewBackup,
RestoreBackupEvent,
+ RestoreBackupStage,
RestoreBackupState,
WrittenBackup,
)
-from .models import AddonInfo, AgentBackup, Folder
+from .models import AddonInfo, AgentBackup, BackupNotFound, Folder
from .util import suggested_filename, suggested_filename_from_name_date
from .websocket import async_register_websocket_handlers
@@ -45,10 +48,13 @@ __all__ = [
"BackupAgentError",
"BackupAgentPlatformProtocol",
"BackupManagerError",
+ "BackupNotFound",
"BackupPlatformProtocol",
"BackupReaderWriter",
"BackupReaderWriterError",
"CreateBackupEvent",
+ "CreateBackupStage",
+ "CreateBackupState",
"Folder",
"IdleEvent",
"IncorrectPasswordError",
@@ -56,6 +62,7 @@ __all__ = [
"ManagerBackup",
"NewBackup",
"RestoreBackupEvent",
+ "RestoreBackupStage",
"RestoreBackupState",
"WrittenBackup",
"async_get_manager",
diff --git a/homeassistant/components/backup/agent.py b/homeassistant/components/backup/agent.py
index 297ccd6f685..9530f386c7b 100644
--- a/homeassistant/components/backup/agent.py
+++ b/homeassistant/components/backup/agent.py
@@ -11,13 +11,7 @@ from propcache.api import cached_property
from homeassistant.core import HomeAssistant, callback
-from .models import AgentBackup, BackupError
-
-
-class BackupAgentError(BackupError):
- """Base class for backup agent errors."""
-
- error_code = "backup_agent_error"
+from .models import AgentBackup, BackupAgentError
class BackupAgentUnreachableError(BackupAgentError):
@@ -27,12 +21,6 @@ class BackupAgentUnreachableError(BackupAgentError):
_message = "The backup agent is unreachable."
-class BackupNotFound(BackupAgentError):
- """Raised when a backup is not found."""
-
- error_code = "backup_not_found"
-
-
class BackupAgent(abc.ABC):
"""Backup agent interface."""
diff --git a/homeassistant/components/backup/backup.py b/homeassistant/components/backup/backup.py
index b6282186c06..c3a46a6ab1f 100644
--- a/homeassistant/components/backup/backup.py
+++ b/homeassistant/components/backup/backup.py
@@ -11,9 +11,9 @@ from typing import Any
from homeassistant.core import HomeAssistant
from homeassistant.helpers.hassio import is_hassio
-from .agent import BackupAgent, BackupNotFound, LocalBackupAgent
+from .agent import BackupAgent, LocalBackupAgent
from .const import DOMAIN, LOGGER
-from .models import AgentBackup
+from .models import AgentBackup, BackupNotFound
from .util import read_backup, suggested_filename
diff --git a/homeassistant/components/backup/http.py b/homeassistant/components/backup/http.py
index 6b06db4601d..58f44d4a449 100644
--- a/homeassistant/components/backup/http.py
+++ b/homeassistant/components/backup/http.py
@@ -21,6 +21,7 @@ from . import util
from .agent import BackupAgent
from .const import DATA_MANAGER
from .manager import BackupManager
+from .models import BackupNotFound
@callback
@@ -69,13 +70,16 @@ class DownloadBackupView(HomeAssistantView):
CONTENT_DISPOSITION: f"attachment; filename={slugify(backup.name)}.tar"
}
- if not password or not backup.protected:
- return await self._send_backup_no_password(
- request, headers, backup_id, agent_id, agent, manager
+ try:
+ if not password or not backup.protected:
+ return await self._send_backup_no_password(
+ request, headers, backup_id, agent_id, agent, manager
+ )
+ return await self._send_backup_with_password(
+ hass, request, headers, backup_id, agent_id, password, agent, manager
)
- return await self._send_backup_with_password(
- hass, request, headers, backup_id, agent_id, password, agent, manager
- )
+ except BackupNotFound:
+ return Response(status=HTTPStatus.NOT_FOUND)
async def _send_backup_no_password(
self,
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index 42b5f522ecd..fa9ca956c22 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -50,7 +50,14 @@ from .const import (
EXCLUDE_FROM_BACKUP,
LOGGER,
)
-from .models import AgentBackup, BackupError, BackupManagerError, BaseBackup, Folder
+from .models import (
+ AgentBackup,
+ BackupError,
+ BackupManagerError,
+ BackupReaderWriterError,
+ BaseBackup,
+ Folder,
+)
from .store import BackupStore
from .util import (
AsyncIteratorReader,
@@ -274,12 +281,6 @@ class BackupReaderWriter(abc.ABC):
"""Get restore events after core restart."""
-class BackupReaderWriterError(BackupError):
- """Backup reader/writer error."""
-
- error_code = "backup_reader_writer_error"
-
-
class IncorrectPasswordError(BackupReaderWriterError):
"""Raised when the password is incorrect."""
diff --git a/homeassistant/components/backup/models.py b/homeassistant/components/backup/models.py
index 1543d577964..95c5ef9809d 100644
--- a/homeassistant/components/backup/models.py
+++ b/homeassistant/components/backup/models.py
@@ -41,12 +41,6 @@ class BaseBackup:
homeassistant_version: str | None # None if homeassistant_included is False
name: str
- def as_frontend_json(self) -> dict:
- """Return a dict representation of this backup for sending to frontend."""
- return {
- key: val for key, val in asdict(self).items() if key != "extra_metadata"
- }
-
@dataclass(frozen=True, kw_only=True)
class AgentBackup(BaseBackup):
@@ -83,7 +77,25 @@ class BackupError(HomeAssistantError):
error_code = "unknown"
+class BackupAgentError(BackupError):
+ """Base class for backup agent errors."""
+
+ error_code = "backup_agent_error"
+
+
class BackupManagerError(BackupError):
"""Backup manager error."""
error_code = "backup_manager_error"
+
+
+class BackupReaderWriterError(BackupError):
+ """Backup reader/writer error."""
+
+ error_code = "backup_reader_writer_error"
+
+
+class BackupNotFound(BackupAgentError, BackupManagerError):
+ """Raised when a backup is not found."""
+
+ error_code = "backup_not_found"
diff --git a/homeassistant/components/backup/util.py b/homeassistant/components/backup/util.py
index fbb13b4721a..b920c66a9b8 100644
--- a/homeassistant/components/backup/util.py
+++ b/homeassistant/components/backup/util.py
@@ -4,6 +4,7 @@ from __future__ import annotations
import asyncio
from collections.abc import AsyncIterator, Callable, Coroutine
+from concurrent.futures import CancelledError, Future
import copy
from dataclasses import dataclass, replace
from io import BytesIO
@@ -12,6 +13,7 @@ import os
from pathlib import Path, PurePath
from queue import SimpleQueue
import tarfile
+import threading
from typing import IO, Any, Self, cast
import aiohttp
@@ -22,7 +24,6 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.util import dt as dt_util
from homeassistant.util.json import JsonObjectType, json_loads_object
-from homeassistant.util.thread import ThreadWithException
from .const import BUF_SIZE, LOGGER
from .models import AddonInfo, AgentBackup, Folder
@@ -167,23 +168,38 @@ class AsyncIteratorReader:
def __init__(self, hass: HomeAssistant, stream: AsyncIterator[bytes]) -> None:
"""Initialize the wrapper."""
+ self._aborted = False
self._hass = hass
self._stream = stream
self._buffer: bytes | None = None
+ self._next_future: Future[bytes | None] | None = None
self._pos: int = 0
async def _next(self) -> bytes | None:
"""Get the next chunk from the iterator."""
return await anext(self._stream, None)
+ def abort(self) -> None:
+ """Abort the reader."""
+ self._aborted = True
+ if self._next_future is not None:
+ self._next_future.cancel()
+
def read(self, n: int = -1, /) -> bytes:
"""Read data from the iterator."""
result = bytearray()
while n < 0 or len(result) < n:
if not self._buffer:
- self._buffer = asyncio.run_coroutine_threadsafe(
+ self._next_future = asyncio.run_coroutine_threadsafe(
self._next(), self._hass.loop
- ).result()
+ )
+ if self._aborted:
+ self._next_future.cancel()
+ raise AbortCipher
+ try:
+ self._buffer = self._next_future.result()
+ except CancelledError as err:
+ raise AbortCipher from err
self._pos = 0
if not self._buffer:
# The stream is exhausted
@@ -205,9 +221,11 @@ class AsyncIteratorWriter:
def __init__(self, hass: HomeAssistant) -> None:
"""Initialize the wrapper."""
+ self._aborted = False
self._hass = hass
self._pos: int = 0
self._queue: asyncio.Queue[bytes | None] = asyncio.Queue(maxsize=1)
+ self._write_future: Future[bytes | None] | None = None
def __aiter__(self) -> Self:
"""Return the iterator."""
@@ -219,13 +237,28 @@ class AsyncIteratorWriter:
return data
raise StopAsyncIteration
+ def abort(self) -> None:
+ """Abort the writer."""
+ self._aborted = True
+ if self._write_future is not None:
+ self._write_future.cancel()
+
def tell(self) -> int:
"""Return the current position in the iterator."""
return self._pos
def write(self, s: bytes, /) -> int:
"""Write data to the iterator."""
- asyncio.run_coroutine_threadsafe(self._queue.put(s), self._hass.loop).result()
+ self._write_future = asyncio.run_coroutine_threadsafe(
+ self._queue.put(s), self._hass.loop
+ )
+ if self._aborted:
+ self._write_future.cancel()
+ raise AbortCipher
+ try:
+ self._write_future.result()
+ except CancelledError as err:
+ raise AbortCipher from err
self._pos += len(s)
return len(s)
@@ -415,7 +448,9 @@ def _encrypt_backup(
class _CipherWorkerStatus:
done: asyncio.Event
error: Exception | None = None
- thread: ThreadWithException
+ reader: AsyncIteratorReader
+ thread: threading.Thread
+ writer: AsyncIteratorWriter
class _CipherBackupStreamer:
@@ -468,11 +503,13 @@ class _CipherBackupStreamer:
stream = await self._open_stream()
reader = AsyncIteratorReader(self._hass, stream)
writer = AsyncIteratorWriter(self._hass)
- worker = ThreadWithException(
+ worker = threading.Thread(
target=self._cipher_func,
args=[reader, writer, self._password, on_done, self.size(), self._nonces],
)
- worker_status = _CipherWorkerStatus(done=asyncio.Event(), thread=worker)
+ worker_status = _CipherWorkerStatus(
+ done=asyncio.Event(), reader=reader, thread=worker, writer=writer
+ )
self._workers.append(worker_status)
worker.start()
return writer
@@ -480,9 +517,8 @@ class _CipherBackupStreamer:
async def wait(self) -> None:
"""Wait for the worker threads to finish."""
for worker in self._workers:
- if not worker.thread.is_alive():
- continue
- worker.thread.raise_exc(AbortCipher)
+ worker.reader.abort()
+ worker.writer.abort()
await asyncio.gather(*(worker.done.wait() for worker in self._workers))
diff --git a/homeassistant/components/backup/websocket.py b/homeassistant/components/backup/websocket.py
index 93dd81c3c14..b6d092e1913 100644
--- a/homeassistant/components/backup/websocket.py
+++ b/homeassistant/components/backup/websocket.py
@@ -15,7 +15,7 @@ from .manager import (
IncorrectPasswordError,
ManagerStateEvent,
)
-from .models import Folder
+from .models import BackupNotFound, Folder
@callback
@@ -57,7 +57,7 @@ async def handle_info(
"agent_errors": {
agent_id: str(err) for agent_id, err in agent_errors.items()
},
- "backups": [backup.as_frontend_json() for backup in backups.values()],
+ "backups": list(backups.values()),
"last_attempted_automatic_backup": manager.config.data.last_attempted_automatic_backup,
"last_completed_automatic_backup": manager.config.data.last_completed_automatic_backup,
"last_non_idle_event": manager.last_non_idle_event,
@@ -91,7 +91,7 @@ async def handle_details(
"agent_errors": {
agent_id: str(err) for agent_id, err in agent_errors.items()
},
- "backup": backup.as_frontend_json() if backup else None,
+ "backup": backup,
},
)
@@ -151,6 +151,8 @@ async def handle_restore(
restore_folders=msg.get("restore_folders"),
restore_homeassistant=msg["restore_homeassistant"],
)
+ except BackupNotFound:
+ connection.send_error(msg["id"], "backup_not_found", "Backup not found")
except IncorrectPasswordError:
connection.send_error(msg["id"], "password_incorrect", "Incorrect password")
else:
@@ -179,6 +181,8 @@ async def handle_can_decrypt_on_download(
agent_id=msg["agent_id"],
password=msg.get("password"),
)
+ except BackupNotFound:
+ connection.send_error(msg["id"], "backup_not_found", "Backup not found")
except IncorrectPasswordError:
connection.send_error(msg["id"], "password_incorrect", "Incorrect password")
except DecryptOnDowloadNotSupported:
diff --git a/homeassistant/components/bang_olufsen/event.py b/homeassistant/components/bang_olufsen/event.py
index 80ad4060c5e..99e5c8bb6fd 100644
--- a/homeassistant/components/bang_olufsen/event.py
+++ b/homeassistant/components/bang_olufsen/event.py
@@ -19,6 +19,8 @@ from .const import (
)
from .entity import BangOlufsenEntity
+PARALLEL_UPDATES = 0
+
async def async_setup_entry(
hass: HomeAssistant,
diff --git a/homeassistant/components/bluesound/strings.json b/homeassistant/components/bluesound/strings.json
index c85014fedc3..b50c01a11bf 100644
--- a/homeassistant/components/bluesound/strings.json
+++ b/homeassistant/components/bluesound/strings.json
@@ -28,7 +28,7 @@
"services": {
"join": {
"name": "Join",
- "description": "Group player together.",
+ "description": "Groups players together under a single master speaker.",
"fields": {
"master": {
"name": "Master",
@@ -36,23 +36,23 @@
},
"entity_id": {
"name": "Entity",
- "description": "Name of entity that will coordinate the grouping. Platform dependent."
+ "description": "Name of entity that will group to master speaker. Platform dependent."
}
}
},
"unjoin": {
"name": "Unjoin",
- "description": "Unjoin the player from a group.",
+ "description": "Separates a player from a group.",
"fields": {
"entity_id": {
"name": "Entity",
- "description": "Name of entity that will be unjoined from their group. Platform dependent."
+ "description": "Name of entity that will be separated from their group. Platform dependent."
}
}
},
"set_sleep_timer": {
"name": "Set sleep timer",
- "description": "Set a Bluesound timer. It will increase timer in steps: 15, 30, 45, 60, 90, 0.",
+ "description": "Sets a Bluesound timer that will turn off the speaker. It will increase in steps: 15, 30, 45, 60, 90, 0.",
"fields": {
"entity_id": {
"name": "Entity",
@@ -62,7 +62,7 @@
},
"clear_sleep_timer": {
"name": "Clear sleep timer",
- "description": "Clear a Bluesound timer.",
+ "description": "Clears a Bluesound timer.",
"fields": {
"entity_id": {
"name": "Entity",
diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index 5edec1ccc23..c46ef22803e 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -5,7 +5,7 @@ from __future__ import annotations
import datetime
import logging
import platform
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
from bleak_retry_connector import BleakSlotManager
from bluetooth_adapters import (
@@ -80,6 +80,7 @@ from .const import (
CONF_DETAILS,
CONF_PASSIVE,
CONF_SOURCE_CONFIG_ENTRY_ID,
+ CONF_SOURCE_DEVICE_ID,
CONF_SOURCE_DOMAIN,
CONF_SOURCE_MODEL,
DOMAIN,
@@ -297,7 +298,11 @@ async def async_discover_adapters(
async def async_update_device(
- hass: HomeAssistant, entry: ConfigEntry, adapter: str, details: AdapterDetails
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ adapter: str,
+ details: AdapterDetails,
+ via_device_id: str | None = None,
) -> None:
"""Update device registry entry.
@@ -306,7 +311,8 @@ async def async_update_device(
update the device with the new location so they can
figure out where the adapter is.
"""
- dr.async_get(hass).async_get_or_create(
+ device_registry = dr.async_get(hass)
+ device_entry = device_registry.async_get_or_create(
config_entry_id=entry.entry_id,
name=adapter_human_name(adapter, details[ADAPTER_ADDRESS]),
connections={(dr.CONNECTION_BLUETOOTH, details[ADAPTER_ADDRESS])},
@@ -315,6 +321,11 @@ async def async_update_device(
sw_version=details.get(ADAPTER_SW_VERSION),
hw_version=details.get(ADAPTER_HW_VERSION),
)
+ if via_device_id and (via_device_entry := device_registry.async_get(via_device_id)):
+ kwargs: dict[str, Any] = {"via_device_id": via_device_id}
+ if not device_entry.area_id and via_device_entry.area_id:
+ kwargs["area_id"] = via_device_entry.area_id
+ device_registry.async_update_device(device_entry.id, **kwargs)
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -349,6 +360,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry,
source_entry.title,
details,
+ entry.data.get(CONF_SOURCE_DEVICE_ID),
)
return True
manager = _get_manager(hass)
diff --git a/homeassistant/components/bluetooth/api.py b/homeassistant/components/bluetooth/api.py
index 9db570c4cba..00e585fa266 100644
--- a/homeassistant/components/bluetooth/api.py
+++ b/homeassistant/components/bluetooth/api.py
@@ -181,10 +181,16 @@ def async_register_scanner(
source_domain: str | None = None,
source_model: str | None = None,
source_config_entry_id: str | None = None,
+ source_device_id: str | None = None,
) -> CALLBACK_TYPE:
"""Register a BleakScanner."""
return _get_manager(hass).async_register_hass_scanner(
- scanner, connection_slots, source_domain, source_model, source_config_entry_id
+ scanner,
+ connection_slots,
+ source_domain,
+ source_model,
+ source_config_entry_id,
+ source_device_id,
)
diff --git a/homeassistant/components/bluetooth/config_flow.py b/homeassistant/components/bluetooth/config_flow.py
index 6425aabe12f..e76277306f5 100644
--- a/homeassistant/components/bluetooth/config_flow.py
+++ b/homeassistant/components/bluetooth/config_flow.py
@@ -37,6 +37,7 @@ from .const import (
CONF_PASSIVE,
CONF_SOURCE,
CONF_SOURCE_CONFIG_ENTRY_ID,
+ CONF_SOURCE_DEVICE_ID,
CONF_SOURCE_DOMAIN,
CONF_SOURCE_MODEL,
DOMAIN,
@@ -139,7 +140,7 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
title=adapter_title(adapter, details), data={}
)
- configured_addresses = self._async_current_ids()
+ configured_addresses = self._async_current_ids(include_ignore=False)
bluetooth_adapters = get_adapters()
await bluetooth_adapters.refresh()
self._adapters = bluetooth_adapters.adapters
@@ -154,12 +155,8 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
and not (system == "Linux" and details[ADAPTER_ADDRESS] == DEFAULT_ADDRESS)
]
if not unconfigured_adapters:
- ignored_adapters = len(
- self._async_current_entries(include_ignore=True)
- ) - len(self._async_current_entries(include_ignore=False))
return self.async_abort(
reason="no_adapters",
- description_placeholders={"ignored_adapters": str(ignored_adapters)},
)
if len(unconfigured_adapters) == 1:
self._adapter = list(self._adapters)[0]
@@ -194,6 +191,7 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
CONF_SOURCE_MODEL: user_input[CONF_SOURCE_MODEL],
CONF_SOURCE_DOMAIN: user_input[CONF_SOURCE_DOMAIN],
CONF_SOURCE_CONFIG_ENTRY_ID: user_input[CONF_SOURCE_CONFIG_ENTRY_ID],
+ CONF_SOURCE_DEVICE_ID: user_input[CONF_SOURCE_DEVICE_ID],
}
self._abort_if_unique_id_configured(updates=data)
manager = get_manager()
diff --git a/homeassistant/components/bluetooth/const.py b/homeassistant/components/bluetooth/const.py
index d4b187d4605..22c885b4f8b 100644
--- a/homeassistant/components/bluetooth/const.py
+++ b/homeassistant/components/bluetooth/const.py
@@ -22,7 +22,7 @@ CONF_SOURCE: Final = "source"
CONF_SOURCE_DOMAIN: Final = "source_domain"
CONF_SOURCE_MODEL: Final = "source_model"
CONF_SOURCE_CONFIG_ENTRY_ID: Final = "source_config_entry_id"
-
+CONF_SOURCE_DEVICE_ID: Final = "source_device_id"
SOURCE_LOCAL: Final = "local"
diff --git a/homeassistant/components/bluetooth/manager.py b/homeassistant/components/bluetooth/manager.py
index 09be8f960e9..46c5425c730 100644
--- a/homeassistant/components/bluetooth/manager.py
+++ b/homeassistant/components/bluetooth/manager.py
@@ -25,6 +25,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from .const import (
CONF_SOURCE,
CONF_SOURCE_CONFIG_ENTRY_ID,
+ CONF_SOURCE_DEVICE_ID,
CONF_SOURCE_DOMAIN,
CONF_SOURCE_MODEL,
DOMAIN,
@@ -254,6 +255,7 @@ class HomeAssistantBluetoothManager(BluetoothManager):
source_domain: str | None = None,
source_model: str | None = None,
source_config_entry_id: str | None = None,
+ source_device_id: str | None = None,
) -> CALLBACK_TYPE:
"""Register a scanner."""
cancel = self.async_register_scanner(scanner, connection_slots)
@@ -261,9 +263,6 @@ class HomeAssistantBluetoothManager(BluetoothManager):
isinstance(scanner, BaseHaRemoteScanner)
and source_domain
and source_config_entry_id
- and not self.hass.config_entries.async_entry_for_domain_unique_id(
- DOMAIN, scanner.source
- )
):
self.hass.async_create_task(
self.hass.config_entries.flow.async_init(
@@ -274,6 +273,7 @@ class HomeAssistantBluetoothManager(BluetoothManager):
CONF_SOURCE_DOMAIN: source_domain,
CONF_SOURCE_MODEL: source_model,
CONF_SOURCE_CONFIG_ENTRY_ID: source_config_entry_id,
+ CONF_SOURCE_DEVICE_ID: source_device_id,
},
)
)
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index f43940821a1..a0405eb5ef5 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -16,11 +16,11 @@
"quality_scale": "internal",
"requirements": [
"bleak==0.22.3",
- "bleak-retry-connector==3.8.0",
- "bluetooth-adapters==0.21.1",
+ "bleak-retry-connector==3.8.1",
+ "bluetooth-adapters==0.21.4",
"bluetooth-auto-recovery==1.4.2",
- "bluetooth-data-tools==1.22.0",
- "dbus-fast==2.30.2",
- "habluetooth==3.20.1"
+ "bluetooth-data-tools==1.23.4",
+ "dbus-fast==2.32.0",
+ "habluetooth==3.21.1"
]
}
diff --git a/homeassistant/components/bluetooth/strings.json b/homeassistant/components/bluetooth/strings.json
index 5f9a380d631..866b76c0985 100644
--- a/homeassistant/components/bluetooth/strings.json
+++ b/homeassistant/components/bluetooth/strings.json
@@ -23,7 +23,7 @@
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
- "no_adapters": "No unconfigured Bluetooth adapters found. There are {ignored_adapters} ignored adapters."
+ "no_adapters": "No unconfigured Bluetooth adapters found."
}
},
"options": {
diff --git a/homeassistant/components/bthome/config_flow.py b/homeassistant/components/bthome/config_flow.py
index 24fdddf2cc7..524365c1183 100644
--- a/homeassistant/components/bthome/config_flow.py
+++ b/homeassistant/components/bthome/config_flow.py
@@ -132,7 +132,7 @@ class BTHomeConfigFlow(ConfigFlow, domain=DOMAIN):
return self._async_get_or_create_entry()
- current_addresses = self._async_current_ids()
+ current_addresses = self._async_current_ids(include_ignore=False)
for discovery_info in async_discovered_service_info(self.hass, False):
address = discovery_info.address
if address in current_addresses or address in self._discovered_devices:
diff --git a/homeassistant/components/bthome/manifest.json b/homeassistant/components/bthome/manifest.json
index c8577113804..4130606ff5c 100644
--- a/homeassistant/components/bthome/manifest.json
+++ b/homeassistant/components/bthome/manifest.json
@@ -20,5 +20,5 @@
"dependencies": ["bluetooth_adapters"],
"documentation": "https://www.home-assistant.io/integrations/bthome",
"iot_class": "local_push",
- "requirements": ["bthome-ble==3.12.3"]
+ "requirements": ["bthome-ble==3.12.4"]
}
diff --git a/homeassistant/components/bthome/sensor.py b/homeassistant/components/bthome/sensor.py
index e46cbbea700..23a058b0b0c 100644
--- a/homeassistant/components/bthome/sensor.py
+++ b/homeassistant/components/bthome/sensor.py
@@ -67,6 +67,11 @@ SENSOR_DESCRIPTIONS = {
state_class=SensorStateClass.MEASUREMENT,
entity_category=EntityCategory.DIAGNOSTIC,
),
+ # Channel (-)
+ (BTHomeExtendedSensorDeviceClass.CHANNEL, None): SensorEntityDescription(
+ key=str(BTHomeExtendedSensorDeviceClass.CHANNEL),
+ state_class=SensorStateClass.MEASUREMENT,
+ ),
# Conductivity (µS/cm)
(
BTHomeSensorDeviceClass.CONDUCTIVITY,
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 473f553593a..b1a845ef8b0 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -29,6 +29,7 @@ from homeassistant.components.google_assistant import helpers as google_helpers
from homeassistant.components.homeassistant import exposed_entities
from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
from homeassistant.components.http.data_validator import RequestDataValidator
+from homeassistant.components.system_health import get_info as get_system_health_info
from homeassistant.const import CLOUD_NEVER_EXPOSED_ENTITIES
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
@@ -107,6 +108,7 @@ def async_setup(hass: HomeAssistant) -> None:
hass.http.register_view(CloudRegisterView)
hass.http.register_view(CloudResendConfirmView)
hass.http.register_view(CloudForgotPasswordView)
+ hass.http.register_view(DownloadSupportPackageView)
_CLOUD_ERRORS.update(
{
@@ -389,6 +391,59 @@ class CloudForgotPasswordView(HomeAssistantView):
return self.json_message("ok")
+class DownloadSupportPackageView(HomeAssistantView):
+ """Download support package view."""
+
+ url = "/api/cloud/support_package"
+ name = "api:cloud:support_package"
+
+ def _generate_markdown(
+ self, hass_info: dict[str, Any], domains_info: dict[str, dict[str, str]]
+ ) -> str:
+ def get_domain_table_markdown(domain_info: dict[str, Any]) -> str:
+ if len(domain_info) == 0:
+ return "No information available\n"
+
+ markdown = ""
+ first = True
+ for key, value in domain_info.items():
+ markdown += f"{key} | {value}\n"
+ if first:
+ markdown += "--- | ---\n"
+ first = False
+ return markdown + "\n"
+
+ markdown = "## System Information\n\n"
+ markdown += get_domain_table_markdown(hass_info)
+
+ for domain, domain_info in domains_info.items():
+ domain_info_md = get_domain_table_markdown(domain_info)
+ markdown += (
+ f"{domain}
\n\n"
+ f"{domain_info_md}"
+ "mock_no_info_integration
+
+ No information available
+ cloud
+
+ logged_in | True
+ --- | ---
+ subscription_expiration | 2025-01-17T11:19:31+00:00
+ relayer_connected | True
+ relayer_region | xx-earth-616
+ remote_enabled | True
+ remote_connected | False
+ alexa_enabled | True
+ google_enabled | False
+ cloud_ice_servers_enabled | True
+ remote_server | us-west-1
+ certificate_status | CertificateStatus.READY
+ instance_id | 12345678901234567890
+ can_reach_cert_server | Exception: Unexpected exception
+ can_reach_cloud_auth | Failed: unreachable
+ can_reach_cloud | ok
+
+
- +20dB TRANSMIT POWER SUPPORT;
- SDK 7.41 based (latest);
",
- "rev": "20240716",
+ "rev": "20250201",
"link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/znp-SLZB-06P10-20240716.bin",
- "ver": "20240716",
+ "ver": "20250201",
"dev": false,
"prod": true,
"baud": 115200
},
- {
- "mode": "ZB",
- "type": 1,
- "notes": "SMLIGHT latest ROUTER release for CC2674P10 chips [16-Jul-2024]:
- SDK 7.41 based (latest);
Terms of use",
- "rev": "20240716",
- "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/zr-ZR_SLZB-06P10-20240716.bin",
- "ver": "20240716",
- "dev": false,
- "prod": true,
- "baud": 0
- },
{
"mode": "ZB",
"type": 0,
diff --git a/tests/components/smlight/fixtures/zb_firmware_router.json b/tests/components/smlight/fixtures/zb_firmware_router.json
new file mode 100644
index 00000000000..320fef89347
--- /dev/null
+++ b/tests/components/smlight/fixtures/zb_firmware_router.json
@@ -0,0 +1,13 @@
+[
+ {
+ "mode": "ZB",
+ "type": 1,
+ "notes": "SMLIGHT latest ROUTER release for CC2652P7 chips [16-Jul-2024]:
- SDK 7.41 based (latest);
Terms of use - by downloading and installing this firmware, you agree to the aforementioned terms.",
+ "rev": "20240716",
+ "link": "https://smlight.tech/flasher/firmware/bin/slzb06x/zigbee/slzb06p10/znp-SLZB-06P10-20240716.bin",
+ "ver": "20240716",
+ "dev": false,
+ "prod": true,
+ "baud": 115200
+ }
+]
diff --git a/tests/components/smlight/snapshots/test_init.ambr b/tests/components/smlight/snapshots/test_init.ambr
index 598166e537b..457a529065c 100644
--- a/tests/components/smlight/snapshots/test_init.ambr
+++ b/tests/components/smlight/snapshots/test_init.ambr
@@ -3,7 +3,7 @@
DeviceRegistryEntrySnapshot({
'area_id': None,
'config_entries': ,
- 'configuration_url': 'http://slzb-06.local',
+ 'configuration_url': 'http://192.168.1.161',
'connections': set({
tuple(
'mac',
diff --git a/tests/components/smlight/snapshots/test_update.ambr b/tests/components/smlight/snapshots/test_update.ambr
index ed0085dcdc8..8c6757d5b91 100644
--- a/tests/components/smlight/snapshots/test_update.ambr
+++ b/tests/components/smlight/snapshots/test_update.ambr
@@ -42,7 +42,7 @@
'friendly_name': 'Mock Title Core firmware',
'in_progress': False,
'installed_version': 'v2.3.6',
- 'latest_version': 'v2.5.2',
+ 'latest_version': 'v2.7.5',
'release_summary': None,
'release_url': None,
'skipped_version': None,
@@ -101,7 +101,7 @@
'friendly_name': 'Mock Title Zigbee firmware',
'in_progress': False,
'installed_version': '20240314',
- 'latest_version': '20240716',
+ 'latest_version': '20250201',
'release_summary': None,
'release_url': None,
'skipped_version': None,
diff --git a/tests/components/smlight/test_config_flow.py b/tests/components/smlight/test_config_flow.py
index c4aea195aa7..a1c9c9d6945 100644
--- a/tests/components/smlight/test_config_flow.py
+++ b/tests/components/smlight/test_config_flow.py
@@ -8,19 +8,20 @@ from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
import pytest
from homeassistant.components.smlight.const import DOMAIN
-from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF
+from homeassistant.config_entries import SOURCE_DHCP, SOURCE_USER, SOURCE_ZEROCONF
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
-from .conftest import MOCK_HOST, MOCK_PASSWORD, MOCK_USERNAME
+from .conftest import MOCK_DEVICE_NAME, MOCK_HOST, MOCK_PASSWORD, MOCK_USERNAME
from tests.common import MockConfigEntry
DISCOVERY_INFO = ZeroconfServiceInfo(
- ip_address=ip_address("127.0.0.1"),
- ip_addresses=[ip_address("127.0.0.1")],
+ ip_address=ip_address("192.168.1.161"),
+ ip_addresses=[ip_address("192.168.1.161")],
hostname="slzb-06.local.",
name="mock_name",
port=6638,
@@ -29,8 +30,8 @@ DISCOVERY_INFO = ZeroconfServiceInfo(
)
DISCOVERY_INFO_LEGACY = ZeroconfServiceInfo(
- ip_address=ip_address("127.0.0.1"),
- ip_addresses=[ip_address("127.0.0.1")],
+ ip_address=ip_address("192.168.1.161"),
+ ip_addresses=[ip_address("192.168.1.161")],
hostname="slzb-06.local.",
name="mock_name",
port=6638,
@@ -52,7 +53,7 @@ async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
result2 = await hass.config_entries.flow.async_configure(
result["flow_id"],
{
- CONF_HOST: MOCK_HOST,
+ CONF_HOST: "slzb-06p7.local",
},
)
@@ -76,7 +77,7 @@ async def test_zeroconf_flow(
DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
)
- assert result["description_placeholders"] == {"host": MOCK_HOST}
+ assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "confirm_discovery"
@@ -113,7 +114,7 @@ async def test_zeroconf_flow_auth(
DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
)
- assert result["description_placeholders"] == {"host": MOCK_HOST}
+ assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "confirm_discovery"
@@ -167,7 +168,7 @@ async def test_zeroconf_unsupported_abort(
DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
)
- assert result["description_placeholders"] == {"host": MOCK_HOST}
+ assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "confirm_discovery"
@@ -261,6 +262,44 @@ async def test_user_device_exists_abort(
assert result["reason"] == "already_configured"
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_user_flow_can_override_discovery(
+ hass: HomeAssistant,
+ mock_config_entry: MockConfigEntry,
+ mock_setup_entry: AsyncMock,
+) -> None:
+ """Test manual user flow can override discovery in progress."""
+
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_ZEROCONF}, data=DISCOVERY_INFO
+ )
+
+ assert result["type"] is FlowResultType.FORM
+ assert result["step_id"] == "confirm_discovery"
+
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_USER}
+ )
+ assert result["type"] is FlowResultType.FORM
+ assert result["step_id"] == SOURCE_USER
+ assert result["errors"] == {}
+
+ result2 = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ {
+ CONF_HOST: MOCK_HOST,
+ },
+ )
+
+ assert result2["type"] is FlowResultType.CREATE_ENTRY
+ assert result2["context"]["source"] == SOURCE_USER
+ assert result2["data"] == {
+ CONF_HOST: MOCK_HOST,
+ }
+ assert result2["context"]["unique_id"] == "aa:bb:cc:dd:ee:ff"
+ assert len(mock_setup_entry.mock_calls) == 1
+
+
@pytest.mark.usefixtures("mock_smlight_client")
async def test_zeroconf_device_exists_abort(
hass: HomeAssistant, mock_config_entry: MockConfigEntry
@@ -451,7 +490,7 @@ async def test_zeroconf_legacy_mac(
data=DISCOVERY_INFO_LEGACY,
)
- assert result["description_placeholders"] == {"host": MOCK_HOST}
+ assert result["description_placeholders"] == {"host": MOCK_DEVICE_NAME}
result2 = await hass.config_entries.flow.async_configure(
result["flow_id"], user_input={}
@@ -469,6 +508,76 @@ async def test_zeroconf_legacy_mac(
assert len(mock_smlight_client.get_info.mock_calls) == 3
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_zeroconf_updates_host(
+ hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
+ mock_config_entry: MockConfigEntry,
+) -> None:
+ """Test zeroconf discovery updates host ip."""
+ mock_config_entry.add_to_hass(hass)
+
+ service_info = DISCOVERY_INFO
+ service_info.ip_address = ip_address("192.168.1.164")
+
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_ZEROCONF}, data=service_info
+ )
+
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == "already_configured"
+
+ assert mock_config_entry.data[CONF_HOST] == "192.168.1.164"
+
+
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_dhcp_discovery_updates_host(
+ hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
+ mock_config_entry: MockConfigEntry,
+) -> None:
+ """Test dhcp discovery updates host ip."""
+ mock_config_entry.add_to_hass(hass)
+
+ service_info = DhcpServiceInfo(
+ ip="192.168.1.164",
+ hostname="slzb-06",
+ macaddress="aabbccddeeff",
+ )
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_DHCP}, data=service_info
+ )
+
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == "already_configured"
+
+ assert mock_config_entry.data[CONF_HOST] == "192.168.1.164"
+
+
+@pytest.mark.usefixtures("mock_smlight_client")
+async def test_dhcp_discovery_aborts(
+ hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
+ mock_config_entry: MockConfigEntry,
+) -> None:
+ """Test dhcp discovery updates host ip."""
+ mock_config_entry.add_to_hass(hass)
+
+ service_info = DhcpServiceInfo(
+ ip="192.168.1.161",
+ hostname="slzb-06",
+ macaddress="000000000000",
+ )
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_DHCP}, data=service_info
+ )
+
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == "already_configured"
+
+ assert mock_config_entry.data[CONF_HOST] == "192.168.1.161"
+
+
async def test_reauth_flow(
hass: HomeAssistant,
mock_smlight_client: MagicMock,
diff --git a/tests/components/smlight/test_init.py b/tests/components/smlight/test_init.py
index d0c5e494ae8..0acbab9f3a4 100644
--- a/tests/components/smlight/test_init.py
+++ b/tests/components/smlight/test_init.py
@@ -85,6 +85,7 @@ async def test_async_setup_no_internet(
freezer: FrozenDateTimeFactory,
) -> None:
"""Test we still load integration when no internet is available."""
+ side_effect = mock_smlight_client.get_firmware_version.side_effect
mock_smlight_client.get_firmware_version.side_effect = SmlightConnectionError
await setup_integration(hass, mock_config_entry_host)
@@ -101,7 +102,7 @@ async def test_async_setup_no_internet(
assert entity is not None
assert entity.state == STATE_UNKNOWN
- mock_smlight_client.get_firmware_version.side_effect = None
+ mock_smlight_client.get_firmware_version.side_effect = side_effect
freezer.tick(SCAN_FIRMWARE_INTERVAL)
async_fire_time_changed(hass)
diff --git a/tests/components/smlight/test_update.py b/tests/components/smlight/test_update.py
index 4fca7369116..632f1b5f26b 100644
--- a/tests/components/smlight/test_update.py
+++ b/tests/components/smlight/test_update.py
@@ -4,13 +4,13 @@ from datetime import timedelta
from unittest.mock import MagicMock, patch
from freezegun.api import FrozenDateTimeFactory
-from pysmlight import Firmware, Info
+from pysmlight import Firmware, Info, Radio
from pysmlight.const import Events as SmEvents
from pysmlight.sse import MessageEvent
import pytest
from syrupy.assertion import SnapshotAssertion
-from homeassistant.components.smlight.const import SCAN_FIRMWARE_INTERVAL
+from homeassistant.components.smlight.const import DOMAIN, SCAN_FIRMWARE_INTERVAL
from homeassistant.components.update import (
ATTR_IN_PROGRESS,
ATTR_INSTALLED_VERSION,
@@ -27,7 +27,12 @@ from homeassistant.helpers import entity_registry as er
from . import get_mock_event_function
from .conftest import setup_integration
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from tests.common import (
+ MockConfigEntry,
+ async_fire_time_changed,
+ load_json_object_fixture,
+ snapshot_platform,
+)
from tests.typing import WebSocketGenerator
pytestmark = [
@@ -62,12 +67,14 @@ MOCK_FIRMWARE_FAIL = MessageEvent(
MOCK_FIRMWARE_NOTES = [
Firmware(
- ver="v2.3.6",
+ ver="v2.7.2",
mode="ESP",
notes=None,
)
]
+MOCK_RADIO = Radio(chip_index=1, zb_channel=0, zb_type=0, zb_version="20240716")
+
@pytest.fixture
def platforms() -> list[Platform]:
@@ -103,7 +110,7 @@ async def test_update_firmware(
state = hass.states.get(entity_id)
assert state.state == STATE_ON
assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
await hass.services.async_call(
PLATFORM,
@@ -126,7 +133,7 @@ async def test_update_firmware(
event_function(MOCK_FIRMWARE_DONE)
mock_smlight_client.get_info.return_value = Info(
- sw_version="v2.5.2",
+ sw_version="v2.7.5",
)
freezer.tick(timedelta(seconds=5))
@@ -135,8 +142,50 @@ async def test_update_firmware(
state = hass.states.get(entity_id)
assert state.state == STATE_OFF
- assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.5.2"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.7.5"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
+
+
+async def test_update_zigbee2_firmware(
+ hass: HomeAssistant,
+ freezer: FrozenDateTimeFactory,
+ mock_config_entry: MockConfigEntry,
+ mock_smlight_client: MagicMock,
+) -> None:
+ """Test update of zigbee2 firmware where available."""
+ mock_smlight_client.get_info.return_value = Info.from_dict(
+ load_json_object_fixture("info-MR1.json", DOMAIN)
+ )
+ await setup_integration(hass, mock_config_entry)
+ entity_id = "update.mock_title_zigbee_firmware_2"
+ state = hass.states.get(entity_id)
+ assert state.state == STATE_ON
+ assert state.attributes[ATTR_INSTALLED_VERSION] == "20240314"
+ assert state.attributes[ATTR_LATEST_VERSION] == "20240716"
+
+ await hass.services.async_call(
+ PLATFORM,
+ SERVICE_INSTALL,
+ {ATTR_ENTITY_ID: entity_id},
+ blocking=False,
+ )
+
+ assert len(mock_smlight_client.fw_update.mock_calls) == 1
+
+ event_function = get_mock_event_function(mock_smlight_client, SmEvents.FW_UPD_done)
+
+ event_function(MOCK_FIRMWARE_DONE)
+ with patch(
+ "homeassistant.components.smlight.update.get_radio", return_value=MOCK_RADIO
+ ):
+ freezer.tick(timedelta(seconds=5))
+ async_fire_time_changed(hass)
+ await hass.async_block_till_done()
+
+ state = hass.states.get(entity_id)
+ assert state.state == STATE_OFF
+ assert state.attributes[ATTR_INSTALLED_VERSION] == "20240716"
+ assert state.attributes[ATTR_LATEST_VERSION] == "20240716"
async def test_update_legacy_firmware_v2(
@@ -156,7 +205,7 @@ async def test_update_legacy_firmware_v2(
state = hass.states.get(entity_id)
assert state.state == STATE_ON
assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.0.18"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
await hass.services.async_call(
PLATFORM,
@@ -172,7 +221,7 @@ async def test_update_legacy_firmware_v2(
event_function(MOCK_FIRMWARE_DONE)
mock_smlight_client.get_info.return_value = Info(
- sw_version="v2.5.2",
+ sw_version="v2.7.5",
)
freezer.tick(SCAN_FIRMWARE_INTERVAL)
@@ -181,8 +230,8 @@ async def test_update_legacy_firmware_v2(
state = hass.states.get(entity_id)
assert state.state == STATE_OFF
- assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.5.2"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.7.5"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
async def test_update_firmware_failed(
@@ -196,7 +245,7 @@ async def test_update_firmware_failed(
state = hass.states.get(entity_id)
assert state.state == STATE_ON
assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
await hass.services.async_call(
PLATFORM,
@@ -233,7 +282,7 @@ async def test_update_reboot_timeout(
state = hass.states.get(entity_id)
assert state.state == STATE_ON
assert state.attributes[ATTR_INSTALLED_VERSION] == "v2.3.6"
- assert state.attributes[ATTR_LATEST_VERSION] == "v2.5.2"
+ assert state.attributes[ATTR_LATEST_VERSION] == "v2.7.5"
with (
patch(
@@ -267,18 +316,29 @@ async def test_update_reboot_timeout(
mock_warning.assert_called_once()
+@pytest.mark.parametrize(
+ "entity_id",
+ [
+ "update.mock_title_core_firmware",
+ "update.mock_title_zigbee_firmware",
+ "update.mock_title_zigbee_firmware_2",
+ ],
+)
async def test_update_release_notes(
hass: HomeAssistant,
+ entity_id: str,
freezer: FrozenDateTimeFactory,
mock_config_entry: MockConfigEntry,
mock_smlight_client: MagicMock,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test firmware release notes."""
+ mock_smlight_client.get_info.return_value = Info.from_dict(
+ load_json_object_fixture("info-MR1.json", DOMAIN)
+ )
await setup_integration(hass, mock_config_entry)
ws_client = await hass_ws_client(hass)
await hass.async_block_till_done()
- entity_id = "update.mock_title_core_firmware"
state = hass.states.get(entity_id)
assert state
@@ -294,16 +354,30 @@ async def test_update_release_notes(
result = await ws_client.receive_json()
assert result["result"] is not None
+
+async def test_update_blank_release_notes(
+ hass: HomeAssistant,
+ mock_config_entry: MockConfigEntry,
+ mock_smlight_client: MagicMock,
+ hass_ws_client: WebSocketGenerator,
+) -> None:
+ """Test firmware missing release notes."""
+
+ entity_id = "update.mock_title_core_firmware"
mock_smlight_client.get_firmware_version.side_effect = None
mock_smlight_client.get_firmware_version.return_value = MOCK_FIRMWARE_NOTES
- freezer.tick(SCAN_FIRMWARE_INTERVAL)
- async_fire_time_changed(hass)
+ await setup_integration(hass, mock_config_entry)
+ ws_client = await hass_ws_client(hass)
await hass.async_block_till_done()
+ state = hass.states.get(entity_id)
+ assert state
+ assert state.state == STATE_ON
+
await ws_client.send_json(
{
- "id": 2,
+ "id": 1,
"type": "update/release_notes",
"entity_id": entity_id,
}
diff --git a/tests/components/synology_dsm/test_backup.py b/tests/components/synology_dsm/test_backup.py
index cdbc5934c5f..26e09d407ff 100644
--- a/tests/components/synology_dsm/test_backup.py
+++ b/tests/components/synology_dsm/test_backup.py
@@ -2,7 +2,7 @@
from io import StringIO
from typing import Any
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch
import pytest
from synology_dsm.api.file_station.models import SynoFileFile, SynoFileSharedFolder
@@ -36,6 +36,8 @@ from .consts import HOST, MACS, PASSWORD, PORT, SERIAL, USE_SSL, USERNAME
from tests.common import MockConfigEntry
from tests.typing import ClientSessionGenerator, WebSocketGenerator
+BASE_FILENAME = "Automatic_backup_2025.2.0.dev0_-_2025-01-09_20.14_35457323"
+
class MockStreamReaderChunked(MockStreamReader):
"""Mock a stream reader with simulated chunked data."""
@@ -46,14 +48,14 @@ class MockStreamReaderChunked(MockStreamReader):
async def _mock_download_file(path: str, filename: str) -> MockStreamReader:
- if filename == "abcd12ef_meta.json":
+ if filename == f"{BASE_FILENAME}_meta.json":
return MockStreamReader(
b'{"addons":[],"backup_id":"abcd12ef","date":"2025-01-09T20:14:35.457323+01:00",'
b'"database_included":true,"extra_metadata":{"instance_id":"36b3b7e984da43fc89f7bafb2645fa36",'
b'"with_automatic_settings":true},"folders":[],"homeassistant_included":true,'
b'"homeassistant_version":"2025.2.0.dev0","name":"Automatic backup 2025.2.0.dev0","protected":true,"size":13916160}'
)
- if filename == "abcd12ef.tar":
+ if filename == f"{BASE_FILENAME}.tar":
return MockStreamReaderChunked(b"backup data")
raise MockStreamReaderChunked(b"")
@@ -61,22 +63,22 @@ async def _mock_download_file(path: str, filename: str) -> MockStreamReader:
async def _mock_download_file_meta_ok_tar_missing(
path: str, filename: str
) -> MockStreamReader:
- if filename == "abcd12ef_meta.json":
+ if filename == f"{BASE_FILENAME}_meta.json":
return MockStreamReader(
b'{"addons":[],"backup_id":"abcd12ef","date":"2025-01-09T20:14:35.457323+01:00",'
b'"database_included":true,"extra_metadata":{"instance_id":"36b3b7e984da43fc89f7bafb2645fa36",'
b'"with_automatic_settings":true},"folders":[],"homeassistant_included":true,'
b'"homeassistant_version":"2025.2.0.dev0","name":"Automatic backup 2025.2.0.dev0","protected":true,"size":13916160}'
)
- if filename == "abcd12ef.tar":
- raise SynologyDSMAPIErrorException("api", "404", "not found")
+ if filename == f"{BASE_FILENAME}.tar":
+ raise SynologyDSMAPIErrorException("api", "900", [{"code": 408}])
raise MockStreamReaderChunked(b"")
async def _mock_download_file_meta_defect(path: str, filename: str) -> MockStreamReader:
- if filename == "abcd12ef_meta.json":
+ if filename == f"{BASE_FILENAME}_meta.json":
return MockStreamReader(b"im not a json")
- if filename == "abcd12ef.tar":
+ if filename == f"{BASE_FILENAME}.tar":
return MockStreamReaderChunked(b"backup data")
raise MockStreamReaderChunked(b"")
@@ -84,7 +86,6 @@ async def _mock_download_file_meta_defect(path: str, filename: str) -> MockStrea
@pytest.fixture
def mock_dsm_with_filestation():
"""Mock a successful service with filestation support."""
-
with patch("homeassistant.components.synology_dsm.common.SynologyDSM") as dsm:
dsm.login = AsyncMock(return_value=True)
dsm.update = AsyncMock(return_value=True)
@@ -115,14 +116,14 @@ def mock_dsm_with_filestation():
SynoFileFile(
additional=None,
is_dir=False,
- name="abcd12ef_meta.json",
- path="/ha_backup/my_backup_path/abcd12ef_meta.json",
+ name=f"{BASE_FILENAME}_meta.json",
+ path=f"/ha_backup/my_backup_path/{BASE_FILENAME}_meta.json",
),
SynoFileFile(
additional=None,
is_dir=False,
- name="abcd12ef.tar",
- path="/ha_backup/my_backup_path/abcd12ef.tar",
+ name=f"{BASE_FILENAME}.tar",
+ path=f"/ha_backup/my_backup_path/{BASE_FILENAME}.tar",
),
]
),
@@ -299,6 +300,7 @@ async def test_agents_list_backups(
"backup_id": "abcd12ef",
"date": "2025-01-09T20:14:35.457323+01:00",
"database_included": True,
+ "extra_metadata": {"instance_id": ANY, "with_automatic_settings": True},
"folders": [],
"homeassistant_included": True,
"homeassistant_version": "2025.2.0.dev0",
@@ -369,6 +371,7 @@ async def test_agents_list_backups_disabled_filestation(
"backup_id": "abcd12ef",
"date": "2025-01-09T20:14:35.457323+01:00",
"database_included": True,
+ "extra_metadata": {"instance_id": ANY, "with_automatic_settings": True},
"folders": [],
"homeassistant_included": True,
"homeassistant_version": "2025.2.0.dev0",
@@ -522,6 +525,7 @@ async def test_agents_upload(
protected=True,
size=0,
)
+ base_filename = "Test_-_1970-01-01_00.00_00000000"
with (
patch(
@@ -544,9 +548,9 @@ async def test_agents_upload(
assert f"Uploading backup {backup_id}" in caplog.text
mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
assert len(mock.mock_calls) == 2
- assert mock.call_args_list[0].kwargs["filename"] == "test-backup.tar"
+ assert mock.call_args_list[0].kwargs["filename"] == f"{base_filename}.tar"
assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
- assert mock.call_args_list[1].kwargs["filename"] == "test-backup_meta.json"
+ assert mock.call_args_list[1].kwargs["filename"] == f"{base_filename}_meta.json"
assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
@@ -572,6 +576,7 @@ async def test_agents_upload_error(
protected=True,
size=0,
)
+ base_filename = "Test_-_1970-01-01_00.00_00000000"
# fail to upload the tar file
with (
@@ -599,7 +604,7 @@ async def test_agents_upload_error(
assert "Failed to upload backup" in caplog.text
mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
assert len(mock.mock_calls) == 1
- assert mock.call_args_list[0].kwargs["filename"] == "test-backup.tar"
+ assert mock.call_args_list[0].kwargs["filename"] == f"{base_filename}.tar"
assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
# fail to upload the meta json file
@@ -630,9 +635,9 @@ async def test_agents_upload_error(
assert "Failed to upload backup" in caplog.text
mock: AsyncMock = setup_dsm_with_filestation.file.upload_file
assert len(mock.mock_calls) == 3
- assert mock.call_args_list[1].kwargs["filename"] == "test-backup.tar"
+ assert mock.call_args_list[1].kwargs["filename"] == f"{base_filename}.tar"
assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
- assert mock.call_args_list[2].kwargs["filename"] == "test-backup_meta.json"
+ assert mock.call_args_list[2].kwargs["filename"] == f"{base_filename}_meta.json"
assert mock.call_args_list[2].kwargs["path"] == "/ha_backup/my_backup_path"
@@ -657,9 +662,9 @@ async def test_agents_delete(
assert response["result"] == {"agent_errors": {}}
mock: AsyncMock = setup_dsm_with_filestation.file.delete_file
assert len(mock.mock_calls) == 2
- assert mock.call_args_list[0].kwargs["filename"] == "abcd12ef.tar"
+ assert mock.call_args_list[0].kwargs["filename"] == f"{BASE_FILENAME}.tar"
assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
- assert mock.call_args_list[1].kwargs["filename"] == "abcd12ef_meta.json"
+ assert mock.call_args_list[1].kwargs["filename"] == f"{BASE_FILENAME}_meta.json"
assert mock.call_args_list[1].kwargs["path"] == "/ha_backup/my_backup_path"
@@ -672,8 +677,15 @@ async def test_agents_delete_not_existing(
client = await hass_ws_client(hass)
backup_id = "ef34ab12"
+ setup_dsm_with_filestation.file.download_file = (
+ _mock_download_file_meta_ok_tar_missing
+ )
setup_dsm_with_filestation.file.delete_file = AsyncMock(
- side_effect=SynologyDSMAPIErrorException("api", "404", "not found")
+ side_effect=SynologyDSMAPIErrorException(
+ "api",
+ "900",
+ [{"code": 408, "path": f"/ha_backup/my_backup_path/{backup_id}.tar"}],
+ )
)
await client.send_json_auto_id(
@@ -685,26 +697,40 @@ async def test_agents_delete_not_existing(
response = await client.receive_json()
assert response["success"]
- assert response["result"] == {
- "agent_errors": {
- "synology_dsm.mocked_syno_dsm_entry": "Failed to delete the backup"
- }
- }
+ assert response["result"] == {"agent_errors": {}}
+@pytest.mark.parametrize(
+ ("error", "expected_log"),
+ [
+ (
+ SynologyDSMAPIErrorException("api", "100", "Unknown error"),
+ "{'api': 'api', 'code': '100', 'reason': 'Unknown', 'details': 'Unknown error'}",
+ ),
+ (
+ SynologyDSMAPIErrorException("api", "900", [{"code": 407}]),
+ "{'api': 'api', 'code': '900', 'reason': 'Unknown', 'details': [{'code': 407}]",
+ ),
+ (
+ SynologyDSMAPIErrorException("api", "900", [{"code": 417}]),
+ "{'api': 'api', 'code': '900', 'reason': 'Unknown', 'details': [{'code': 417}]",
+ ),
+ ],
+)
async def test_agents_delete_error(
hass: HomeAssistant,
hass_ws_client: WebSocketGenerator,
+ caplog: pytest.LogCaptureFixture,
setup_dsm_with_filestation: MagicMock,
+ error: SynologyDSMAPIErrorException,
+ expected_log: str,
) -> None:
"""Test error while delete backup."""
client = await hass_ws_client(hass)
# error while delete
backup_id = "abcd12ef"
- setup_dsm_with_filestation.file.delete_file.side_effect = (
- SynologyDSMAPIErrorException("api", "404", "not found")
- )
+ setup_dsm_with_filestation.file.delete_file.side_effect = error
await client.send_json_auto_id(
{
"type": "backup/delete",
@@ -716,10 +742,11 @@ async def test_agents_delete_error(
assert response["success"]
assert response["result"] == {
"agent_errors": {
- "synology_dsm.mocked_syno_dsm_entry": "Failed to delete the backup"
+ "synology_dsm.mocked_syno_dsm_entry": "Failed to delete backup"
}
}
+ assert f"Failed to delete backup: {expected_log}" in caplog.text
mock: AsyncMock = setup_dsm_with_filestation.file.delete_file
assert len(mock.mock_calls) == 1
- assert mock.call_args_list[0].kwargs["filename"] == "abcd12ef.tar"
+ assert mock.call_args_list[0].kwargs["filename"] == f"{BASE_FILENAME}.tar"
assert mock.call_args_list[0].kwargs["path"] == "/ha_backup/my_backup_path"
diff --git a/tests/components/thermopro/test_config_flow.py b/tests/components/thermopro/test_config_flow.py
index 9b9fdd67334..3cf68fb612c 100644
--- a/tests/components/thermopro/test_config_flow.py
+++ b/tests/components/thermopro/test_config_flow.py
@@ -79,6 +79,38 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
+async def test_async_step_user_replace_ignored(hass: HomeAssistant) -> None:
+ """Test setup from service info and replace an ignored entry."""
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ unique_id=TP357_SERVICE_INFO.address,
+ data={},
+ source=config_entries.SOURCE_IGNORE,
+ )
+ entry.add_to_hass(hass)
+ with patch(
+ "homeassistant.components.thermopro.config_flow.async_discovered_service_info",
+ return_value=[TP357_SERVICE_INFO],
+ ):
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": config_entries.SOURCE_USER},
+ )
+ assert result["type"] is FlowResultType.FORM
+ assert result["step_id"] == "user"
+ with patch(
+ "homeassistant.components.thermopro.async_setup_entry", return_value=True
+ ):
+ result2 = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={"address": "4125DDBA-2774-4851-9889-6AADDD4CAC3D"},
+ )
+ assert result2["type"] is FlowResultType.CREATE_ENTRY
+ assert result2["title"] == "TP357 (2142) AC3D"
+ assert result2["data"] == {}
+ assert result2["result"].unique_id == "4125DDBA-2774-4851-9889-6AADDD4CAC3D"
+
+
async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
"""Test the device gets added via another flow between steps."""
with patch(
diff --git a/tests/components/tilt_ble/test_config_flow.py b/tests/components/tilt_ble/test_config_flow.py
index fd996228034..9c9450f3996 100644
--- a/tests/components/tilt_ble/test_config_flow.py
+++ b/tests/components/tilt_ble/test_config_flow.py
@@ -79,6 +79,37 @@ async def test_async_step_user_with_found_devices(hass: HomeAssistant) -> None:
assert result2["result"].unique_id == "F6:0F:28:F2:1F:CB"
+async def test_async_step_user_replaces_ignored(hass: HomeAssistant) -> None:
+ """Test setup from service info can replace an ignored entry."""
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ unique_id=TILT_GREEN_SERVICE_INFO.address,
+ source=config_entries.SOURCE_IGNORE,
+ )
+ entry.add_to_hass(hass)
+ with patch(
+ "homeassistant.components.tilt_ble.config_flow.async_discovered_service_info",
+ return_value=[TILT_GREEN_SERVICE_INFO],
+ ):
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": config_entries.SOURCE_USER},
+ )
+ assert result["type"] is FlowResultType.FORM
+ assert result["step_id"] == "user"
+ with patch(
+ "homeassistant.components.tilt_ble.async_setup_entry", return_value=True
+ ):
+ result2 = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={"address": "F6:0F:28:F2:1F:CB"},
+ )
+ assert result2["type"] is FlowResultType.CREATE_ENTRY
+ assert result2["title"] == "Tilt Green"
+ assert result2["data"] == {}
+ assert result2["result"].unique_id == "F6:0F:28:F2:1F:CB"
+
+
async def test_async_step_user_device_added_between_steps(hass: HomeAssistant) -> None:
"""Test the device gets added via another flow between steps."""
with patch(
diff --git a/tests/components/todoist/conftest.py b/tests/components/todoist/conftest.py
index 4b2bfea2e30..84f0fa740e9 100644
--- a/tests/components/todoist/conftest.py
+++ b/tests/components/todoist/conftest.py
@@ -70,6 +70,7 @@ def make_api_task(
section_id=None,
url="https://todoist.com",
sync_id=None,
+ duration=None,
)
@@ -94,6 +95,7 @@ def mock_api(tasks: list[Task]) -> AsyncMock:
url="",
is_inbox_project=False,
is_team_inbox=False,
+ can_assign_tasks=False,
order=1,
parent_id=None,
view_style="list",
diff --git a/tests/components/tplink/snapshots/test_sensor.ambr b/tests/components/tplink/snapshots/test_sensor.ambr
index 0d1cc9a03e4..093b92ef315 100644
--- a/tests/components/tplink/snapshots/test_sensor.ambr
+++ b/tests/components/tplink/snapshots/test_sensor.ambr
@@ -243,7 +243,9 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
@@ -279,6 +281,7 @@
'attributes': ReadOnlyDict({
'device_class': 'area',
'friendly_name': 'my_device Cleaning area',
+ 'state_class': ,
'unit_of_measurement': ,
}),
'context': ,
@@ -294,11 +297,13 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
- 'disabled_by': None,
+ 'disabled_by': ,
'domain': 'sensor',
'entity_category': ,
'entity_id': 'sensor.my_device_cleaning_progress',
@@ -322,20 +327,6 @@
'unit_of_measurement': '%',
})
# ---
-# name: test_states[sensor.my_device_cleaning_progress-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'friendly_name': 'my_device Cleaning progress',
- 'unit_of_measurement': '%',
- }),
- 'context': ,
- 'entity_id': 'sensor.my_device_cleaning_progress',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': '30',
- })
-# ---
# name: test_states[sensor.my_device_cleaning_time-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -801,7 +792,9 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
@@ -1426,7 +1419,9 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
@@ -1462,7 +1457,9 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
@@ -1495,7 +1492,9 @@
'aliases': set({
}),
'area_id': None,
- 'capabilities': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
'config_entry_id': ,
'device_class': None,
'device_id': ,
diff --git a/tests/components/unifiprotect/test_camera.py b/tests/components/unifiprotect/test_camera.py
index 12b92beedd0..975e93edf09 100644
--- a/tests/components/unifiprotect/test_camera.py
+++ b/tests/components/unifiprotect/test_camera.py
@@ -174,7 +174,7 @@ def validate_common_camera_state(
entity_id: str,
features: int = CameraEntityFeature.STREAM,
):
- """Validate state that is common to all camera entity, regradless of type."""
+ """Validate state that is common to all camera entity, regardless of type."""
entity_state = hass.states.get(entity_id)
assert entity_state
assert entity_state.attributes[ATTR_ATTRIBUTION] == DEFAULT_ATTRIBUTION
diff --git a/tests/components/upb/test_config_flow.py b/tests/components/upb/test_config_flow.py
index 59a4e97d22b..3909c7e5dc4 100644
--- a/tests/components/upb/test_config_flow.py
+++ b/tests/components/upb/test_config_flow.py
@@ -13,15 +13,20 @@ from homeassistant.data_entry_flow import FlowResultType
def mocked_upb(sync_complete=True, config_ok=True):
"""Mock UPB lib."""
- def _upb_lib_connect(callback):
+ def _add_handler(_, callback):
callback()
+ def _dummy_add_handler(_, _callback):
+ pass
+
upb_mock = AsyncMock()
type(upb_mock).network_id = PropertyMock(return_value="42")
type(upb_mock).config_ok = PropertyMock(return_value=config_ok)
type(upb_mock).disconnect = MagicMock()
- if sync_complete:
- upb_mock.async_connect.side_effect = _upb_lib_connect
+ type(upb_mock).add_handler = MagicMock()
+ upb_mock.add_handler.side_effect = (
+ _add_handler if sync_complete else _dummy_add_handler
+ )
return patch(
"homeassistant.components.upb.config_flow.upb_lib.UpbPim", return_value=upb_mock
)
diff --git a/tests/components/vesync/conftest.py b/tests/components/vesync/conftest.py
index a80c2631088..9ec7bd23fa5 100644
--- a/tests/components/vesync/conftest.py
+++ b/tests/components/vesync/conftest.py
@@ -153,3 +153,25 @@ async def humidifier_config_entry(
await hass.async_block_till_done()
return entry
+
+
+@pytest.fixture(name="switch_old_id_config_entry")
+async def switch_old_id_config_entry(
+ hass: HomeAssistant, requests_mock: requests_mock.Mocker, config
+) -> MockConfigEntry:
+ """Create a mock VeSync config entry for `switch` with the old unique ID approach."""
+ entry = MockConfigEntry(
+ title="VeSync",
+ domain=DOMAIN,
+ data=config[DOMAIN],
+ version=1,
+ minor_version=1,
+ )
+ entry.add_to_hass(hass)
+
+ wall_switch = "Wall Switch"
+ humidifer = "Humidifier 200s"
+
+ mock_multiple_device_responses(requests_mock, [wall_switch, humidifer])
+
+ return entry
diff --git a/tests/components/vesync/snapshots/test_diagnostics.ambr b/tests/components/vesync/snapshots/test_diagnostics.ambr
index 54ed8acf2d7..1c409dbab00 100644
--- a/tests/components/vesync/snapshots/test_diagnostics.ambr
+++ b/tests/components/vesync/snapshots/test_diagnostics.ambr
@@ -128,7 +128,7 @@
'sleep',
'manual',
]),
- 'mode': None,
+ 'mode': 'humidity',
'night_light': True,
'pid': None,
'speed': None,
@@ -160,6 +160,30 @@
# ---
# name: test_async_get_device_diagnostics__single_fan
dict({
+ '_config_dict': dict({
+ 'features': list([
+ 'air_quality',
+ ]),
+ 'levels': list([
+ 1,
+ 2,
+ ]),
+ 'models': list([
+ 'LV-PUR131S',
+ 'LV-RH131S',
+ ]),
+ 'modes': list([
+ 'manual',
+ 'auto',
+ 'sleep',
+ 'off',
+ ]),
+ 'module': 'VeSyncAir131',
+ }),
+ '_features': list([
+ 'air_quality',
+ ]),
+ 'air_quality_feature': True,
'cid': 'abcdefghabcdefghabcdefghabcdefgh',
'config': dict({
}),
@@ -180,6 +204,7 @@
'device_region': 'US',
'device_status': 'unknown',
'device_type': 'LV-PUR131S',
+ 'enabled': True,
'extension': None,
'home_assistant': dict({
'disabled': False,
@@ -271,6 +296,12 @@
'mac_id': '**REDACTED**',
'manager': '**REDACTED**',
'mode': None,
+ 'modes': list([
+ 'manual',
+ 'auto',
+ 'sleep',
+ 'off',
+ ]),
'pid': None,
'speed': None,
'sub_device_no': None,
diff --git a/tests/components/vesync/snapshots/test_switch.ambr b/tests/components/vesync/snapshots/test_switch.ambr
index ec9cbc4398c..da652b30ac5 100644
--- a/tests/components/vesync/snapshots/test_switch.ambr
+++ b/tests/components/vesync/snapshots/test_switch.ambr
@@ -367,7 +367,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': None,
- 'unique_id': 'outlet',
+ 'unique_id': 'outlet-device_status',
'unit_of_measurement': None,
}),
])
@@ -525,7 +525,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': None,
- 'unique_id': 'switch',
+ 'unique_id': 'switch-device_status',
'unit_of_measurement': None,
}),
])
diff --git a/tests/components/vesync/test_humidifier.py b/tests/components/vesync/test_humidifier.py
index b93c97baab6..d5057c44951 100644
--- a/tests/components/vesync/test_humidifier.py
+++ b/tests/components/vesync/test_humidifier.py
@@ -10,9 +10,16 @@ from homeassistant.components.humidifier import (
ATTR_HUMIDITY,
ATTR_MODE,
DOMAIN as HUMIDIFIER_DOMAIN,
+ MODE_AUTO,
+ MODE_SLEEP,
SERVICE_SET_HUMIDITY,
SERVICE_SET_MODE,
)
+from homeassistant.components.vesync.const import (
+ VS_HUMIDIFIER_MODE_AUTO,
+ VS_HUMIDIFIER_MODE_MANUAL,
+ VS_HUMIDIFIER_MODE_SLEEP,
+)
from homeassistant.config_entries import ConfigEntry, ConfigEntryState
from homeassistant.const import (
ATTR_ENTITY_ID,
@@ -222,7 +229,7 @@ async def test_set_mode(
await hass.services.async_call(
HUMIDIFIER_DOMAIN,
SERVICE_SET_MODE,
- {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: "auto"},
+ {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: MODE_AUTO},
blocking=True,
)
await hass.async_block_till_done()
@@ -285,3 +292,38 @@ async def test_valid_mist_modes(
await hass.async_block_till_done()
assert "Unknown mode 'auto'" not in caplog.text
assert "Unknown mode 'manual'" not in caplog.text
+
+
+async def test_set_mode_sleep_turns_display_off(
+ hass: HomeAssistant,
+ config_entry: ConfigEntry,
+ humidifier,
+ manager,
+) -> None:
+ """Test update of display for sleep mode."""
+
+ # First define valid mist modes
+ humidifier.mist_modes = [
+ VS_HUMIDIFIER_MODE_AUTO,
+ VS_HUMIDIFIER_MODE_MANUAL,
+ VS_HUMIDIFIER_MODE_SLEEP,
+ ]
+
+ with patch(
+ "homeassistant.components.vesync.async_generate_device_list",
+ return_value=[humidifier],
+ ):
+ await hass.config_entries.async_setup(config_entry.entry_id)
+ await hass.async_block_till_done()
+
+ with (
+ patch.object(humidifier, "set_humidity_mode", return_value=True),
+ patch.object(humidifier, "set_display") as display_mock,
+ ):
+ await hass.services.async_call(
+ HUMIDIFIER_DOMAIN,
+ SERVICE_SET_MODE,
+ {ATTR_ENTITY_ID: ENTITY_HUMIDIFIER, ATTR_MODE: MODE_SLEEP},
+ blocking=True,
+ )
+ display_mock.assert_called_once_with(False)
diff --git a/tests/components/vesync/test_init.py b/tests/components/vesync/test_init.py
index 883e850fc62..f1fb3931bf9 100644
--- a/tests/components/vesync/test_init.py
+++ b/tests/components/vesync/test_init.py
@@ -10,6 +10,9 @@ from homeassistant.components.vesync.const import DOMAIN, VS_DEVICES, VS_MANAGER
from homeassistant.config_entries import ConfigEntry, ConfigEntryState
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
+
+from tests.common import MockConfigEntry
async def test_async_setup_entry__not_login(
@@ -125,3 +128,55 @@ async def test_async_new_device_discovery(
assert manager.login.call_count == 1
assert hass.data[DOMAIN][VS_MANAGER] == manager
assert hass.data[DOMAIN][VS_DEVICES] == [fan, humidifier]
+
+
+async def test_migrate_config_entry(
+ hass: HomeAssistant,
+ switch_old_id_config_entry: MockConfigEntry,
+ entity_registry: er.EntityRegistry,
+) -> None:
+ """Test migration of config entry. Only migrates switches to a new unique_id."""
+ switch: er.RegistryEntry = entity_registry.async_get_or_create(
+ domain="switch",
+ platform="vesync",
+ unique_id="switch",
+ config_entry=switch_old_id_config_entry,
+ suggested_object_id="switch",
+ )
+
+ humidifer: er.RegistryEntry = entity_registry.async_get_or_create(
+ domain="humidifer",
+ platform="vesync",
+ unique_id="humidifer",
+ config_entry=switch_old_id_config_entry,
+ suggested_object_id="humidifer",
+ )
+
+ assert switch.unique_id == "switch"
+ assert switch_old_id_config_entry.minor_version == 1
+ assert humidifer.unique_id == "humidifer"
+
+ await hass.config_entries.async_setup(switch_old_id_config_entry.entry_id)
+ await hass.async_block_till_done()
+
+ assert switch_old_id_config_entry.minor_version == 2
+
+ migrated_switch = entity_registry.async_get(switch.entity_id)
+ assert migrated_switch is not None
+ assert migrated_switch.entity_id.startswith("switch")
+ assert migrated_switch.unique_id == "switch-device_status"
+ # Confirm humidifer was not impacted
+ migrated_humidifer = entity_registry.async_get(humidifer.entity_id)
+ assert migrated_humidifer is not None
+ assert migrated_humidifer.unique_id == "humidifer"
+
+ # Assert that only one entity exists in the switch domain
+ switch_entities = [
+ e for e in entity_registry.entities.values() if e.domain == "switch"
+ ]
+ assert len(switch_entities) == 1
+
+ humidifer_entities = [
+ e for e in entity_registry.entities.values() if e.domain == "humidifer"
+ ]
+ assert len(humidifer_entities) == 1
diff --git a/tests/components/vicare/snapshots/test_binary_sensor.ambr b/tests/components/vicare/snapshots/test_binary_sensor.ambr
index f3e4d4e1c84..ec2451cd466 100644
--- a/tests/components/vicare/snapshots/test_binary_sensor.ambr
+++ b/tests/components/vicare/snapshots/test_binary_sensor.ambr
@@ -373,6 +373,53 @@
'state': 'unavailable',
})
# ---
+# name: test_all_entities[binary_sensor.model0_one_time_charge-entry]
+ EntityRegistryEntrySnapshot({
+ 'aliases': set({
+ }),
+ 'area_id': None,
+ 'capabilities': None,
+ 'config_entry_id': ,
+ 'device_class': None,
+ 'device_id': ,
+ 'disabled_by': None,
+ 'domain': 'binary_sensor',
+ 'entity_category': None,
+ 'entity_id': 'binary_sensor.model0_one_time_charge',
+ 'has_entity_name': True,
+ 'hidden_by': None,
+ 'icon': None,
+ 'id': ,
+ 'labels': set({
+ }),
+ 'name': None,
+ 'options': dict({
+ }),
+ 'original_device_class': ,
+ 'original_icon': None,
+ 'original_name': 'One-time charge',
+ 'platform': 'vicare',
+ 'previous_unique_id': None,
+ 'supported_features': 0,
+ 'translation_key': 'one_time_charge',
+ 'unique_id': 'gateway0_deviceSerialVitodens300W-one_time_charge',
+ 'unit_of_measurement': None,
+ })
+# ---
+# name: test_all_entities[binary_sensor.model0_one_time_charge-state]
+ StateSnapshot({
+ 'attributes': ReadOnlyDict({
+ 'device_class': 'running',
+ 'friendly_name': 'model0 One-time charge',
+ }),
+ 'context': ,
+ 'entity_id': 'binary_sensor.model0_one_time_charge',
+ 'last_changed': ,
+ 'last_reported': ,
+ 'last_updated': ,
+ 'state': 'unavailable',
+ })
+# ---
# name: test_binary_sensors[burner]
StateSnapshot({
'attributes': ReadOnlyDict({
diff --git a/tests/components/vodafone_station/conftest.py b/tests/components/vodafone_station/conftest.py
index 7763db5044a..a065a1e8065 100644
--- a/tests/components/vodafone_station/conftest.py
+++ b/tests/components/vodafone_station/conftest.py
@@ -8,7 +8,7 @@ import pytest
from homeassistant.components.vodafone_station import DOMAIN
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
-from .const import DEVICE_1_MAC
+from .const import DEVICE_1_HOST, DEVICE_1_MAC, DEVICE_2_MAC
from tests.common import (
AsyncMock,
@@ -48,11 +48,20 @@ def mock_vodafone_station_router() -> Generator[AsyncMock]:
connected=True,
connection_type="wifi",
ip_address="192.168.1.10",
- name="WifiDevice0",
+ name=DEVICE_1_HOST,
mac=DEVICE_1_MAC,
type="laptop",
wifi="2.4G",
),
+ DEVICE_2_MAC: VodafoneStationDevice(
+ connected=False,
+ connection_type="lan",
+ ip_address="192.168.1.11",
+ name="LanDevice1",
+ mac=DEVICE_2_MAC,
+ type="desktop",
+ wifi="",
+ ),
}
router.get_sensor_data.return_value = load_json_object_fixture(
"get_sensor_data.json", DOMAIN
diff --git a/tests/components/vodafone_station/const.py b/tests/components/vodafone_station/const.py
index 0f1ed2ba7da..cf6c274e5d5 100644
--- a/tests/components/vodafone_station/const.py
+++ b/tests/components/vodafone_station/const.py
@@ -1,3 +1,6 @@
"""Common stuff for Vodafone Station tests."""
+DEVICE_1_HOST = "WifiDevice0"
DEVICE_1_MAC = "xx:xx:xx:xx:xx:xx"
+DEVICE_2_HOST = "LanDevice1"
+DEVICE_2_MAC = "yy:yy:yy:yy:yy:yy"
diff --git a/tests/components/vodafone_station/snapshots/test_device_tracker.ambr b/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
index 834c8b14459..e019ea73ab9 100644
--- a/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
+++ b/tests/components/vodafone_station/snapshots/test_device_tracker.ambr
@@ -1,5 +1,5 @@
# serializer version: 1
-# name: test_all_entities[device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx-entry]
+# name: test_all_entities[device_tracker.landevice1-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -11,8 +11,8 @@
'disabled_by': None,
'domain': 'device_tracker',
'entity_category': ,
- 'entity_id': 'device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx',
- 'has_entity_name': False,
+ 'entity_id': 'device_tracker.landevice1',
+ 'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': ,
@@ -23,7 +23,57 @@
}),
'original_device_class': None,
'original_icon': None,
- 'original_name': None,
+ 'original_name': 'LanDevice1',
+ 'platform': 'vodafone_station',
+ 'previous_unique_id': None,
+ 'supported_features': 0,
+ 'translation_key': 'device_tracker',
+ 'unique_id': 'yy:yy:yy:yy:yy:yy',
+ 'unit_of_measurement': None,
+ })
+# ---
+# name: test_all_entities[device_tracker.landevice1-state]
+ StateSnapshot({
+ 'attributes': ReadOnlyDict({
+ 'friendly_name': 'LanDevice1',
+ 'host_name': 'LanDevice1',
+ 'ip': '192.168.1.11',
+ 'mac': 'yy:yy:yy:yy:yy:yy',
+ 'source_type': ,
+ }),
+ 'context': ,
+ 'entity_id': 'device_tracker.landevice1',
+ 'last_changed': ,
+ 'last_reported': ,
+ 'last_updated': ,
+ 'state': 'not_home',
+ })
+# ---
+# name: test_all_entities[device_tracker.wifidevice0-entry]
+ EntityRegistryEntrySnapshot({
+ 'aliases': set({
+ }),
+ 'area_id': None,
+ 'capabilities': None,
+ 'config_entry_id': ,
+ 'device_class': None,
+ 'device_id': ,
+ 'disabled_by': None,
+ 'domain': 'device_tracker',
+ 'entity_category': ,
+ 'entity_id': 'device_tracker.wifidevice0',
+ 'has_entity_name': True,
+ 'hidden_by': None,
+ 'icon': None,
+ 'id': ,
+ 'labels': set({
+ }),
+ 'name': None,
+ 'options': dict({
+ }),
+ 'original_device_class': None,
+ 'original_icon': None,
+ 'original_name': 'WifiDevice0',
'platform': 'vodafone_station',
'previous_unique_id': None,
'supported_features': 0,
@@ -32,16 +82,17 @@
'unit_of_measurement': None,
})
# ---
-# name: test_all_entities[device_tracker.vodafone_station_xx_xx_xx_xx_xx_xx-state]
+# name: test_all_entities[device_tracker.wifidevice0-state]
StateSnapshot({
'attributes': ReadOnlyDict({
+ 'friendly_name': 'WifiDevice0',
'host_name': 'WifiDevice0',
'ip': '192.168.1.10',
'mac': 'xx:xx:xx:xx:xx:xx',
'source_type': ,
}),
'context':