diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index aa4bfc60c11..cdffcbe4d5b 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -324,7 +324,7 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Install Cosign
- uses: sigstore/cosign-installer@v3.7.0
+ uses: sigstore/cosign-installer@v3.8.0
with:
cosign-release: "v2.2.3"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 863c861db75..2a9f1571830 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -975,6 +975,7 @@ jobs:
${cov_params[@]} \
-o console_output_style=count \
-p no:sugar \
+ --exclude-warning-annotations \
$(sed -n "${{ matrix.group }},1p" pytest_buckets.txt) \
2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
- name: Upload pytest output
@@ -1098,6 +1099,7 @@ jobs:
-o console_output_style=count \
--durations=10 \
-p no:sugar \
+ --exclude-warning-annotations \
--dburl=mysql://root:password@127.0.0.1/homeassistant-test \
tests/components/history \
tests/components/logbook \
@@ -1228,6 +1230,7 @@ jobs:
--durations=0 \
--durations-min=10 \
-p no:sugar \
+ --exclude-warning-annotations \
--dburl=postgresql://postgres:password@127.0.0.1/homeassistant-test \
tests/components/history \
tests/components/logbook \
@@ -1374,6 +1377,7 @@ jobs:
--durations=0 \
--durations-min=1 \
-p no:sugar \
+ --exclude-warning-annotations \
tests/components/${{ matrix.group }} \
2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
- name: Upload pytest output
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/airgradient/__init__.py b/homeassistant/components/airgradient/__init__.py
index 3b27d6cda5e..8f7fd86847d 100644
--- a/homeassistant/components/airgradient/__init__.py
+++ b/homeassistant/components/airgradient/__init__.py
@@ -4,12 +4,11 @@ from __future__ import annotations
from airgradient import AirGradientClient
-from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_HOST, Platform
from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from .coordinator import AirGradientCoordinator
+from .coordinator import AirGradientConfigEntry, AirGradientCoordinator
PLATFORMS: list[Platform] = [
Platform.BUTTON,
@@ -21,9 +20,6 @@ PLATFORMS: list[Platform] = [
]
-type AirGradientConfigEntry = ConfigEntry[AirGradientCoordinator]
-
-
async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry) -> bool:
"""Set up Airgradient from a config entry."""
@@ -31,7 +27,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry)
entry.data[CONF_HOST], session=async_get_clientsession(hass)
)
- coordinator = AirGradientCoordinator(hass, client)
+ coordinator = AirGradientCoordinator(hass, entry, client)
await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/airgradient/coordinator.py b/homeassistant/components/airgradient/coordinator.py
index d2fc2a9de1b..7484c7e85a9 100644
--- a/homeassistant/components/airgradient/coordinator.py
+++ b/homeassistant/components/airgradient/coordinator.py
@@ -4,18 +4,17 @@ from __future__ import annotations
from dataclasses import dataclass
from datetime import timedelta
-from typing import TYPE_CHECKING
from airgradient import AirGradientClient, AirGradientError, Config, Measures
+from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import DOMAIN, LOGGER
-if TYPE_CHECKING:
- from . import AirGradientConfigEntry
+type AirGradientConfigEntry = ConfigEntry[AirGradientCoordinator]
@dataclass
@@ -32,11 +31,17 @@ class AirGradientCoordinator(DataUpdateCoordinator[AirGradientData]):
config_entry: AirGradientConfigEntry
_current_version: str
- def __init__(self, hass: HomeAssistant, client: AirGradientClient) -> None:
+ def __init__(
+ self,
+ hass: HomeAssistant,
+ config_entry: AirGradientConfigEntry,
+ client: AirGradientClient,
+ ) -> None:
"""Initialize coordinator."""
super().__init__(
hass,
logger=LOGGER,
+ config_entry=config_entry,
name=f"AirGradient {client.host}",
update_interval=timedelta(minutes=1),
)
diff --git a/homeassistant/components/airq/manifest.json b/homeassistant/components/airq/manifest.json
index 1ae7da14875..d4a6e9c295f 100644
--- a/homeassistant/components/airq/manifest.json
+++ b/homeassistant/components/airq/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["aioairq"],
- "requirements": ["aioairq==0.4.3"]
+ "requirements": ["aioairq==0.4.4"]
}
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/anova/strings.json b/homeassistant/components/anova/strings.json
index bfe3a61282e..e9905e4cce5 100644
--- a/homeassistant/components/anova/strings.json
+++ b/homeassistant/components/anova/strings.json
@@ -39,7 +39,7 @@
"idle": "[%key:common::state::idle%]",
"cook": "Cooking",
"low_water": "Low water",
- "ota": "Ota",
+ "ota": "OTA update",
"provisioning": "Provisioning",
"high_temp": "High temperature",
"device_failure": "Device failure"
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/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 cfc7261410a..94e2b04d7ae 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -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
@@ -1105,9 +1106,8 @@ class PipelineRun:
speech: str = intent_response.speech.get("plain", {}).get(
"speech", ""
)
- chat_log.async_add_message(
- conversation.Content(
- role="assistant",
+ chat_log.async_add_assistant_content_without_tools(
+ conversation.AssistantContent(
agent_id=agent_id,
content=speech,
)
@@ -1409,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."""
@@ -1430,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."""
@@ -1441,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..25393a872cc 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -9,6 +9,7 @@ from dataclasses import dataclass, replace
from enum import StrEnum
import hashlib
import io
+from itertools import chain
import json
from pathlib import Path, PurePath
import shutil
@@ -50,7 +51,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 +282,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."""
@@ -826,7 +828,7 @@ class BackupManager:
password=None,
)
await written_backup.release_stream()
- self.known_backups.add(written_backup.backup, agent_errors)
+ self.known_backups.add(written_backup.backup, agent_errors, [])
return written_backup.backup.backup_id
async def async_create_backup(
@@ -950,12 +952,23 @@ class BackupManager:
with_automatic_settings: bool,
) -> NewBackup:
"""Initiate generating a backup."""
- if not agent_ids:
- raise BackupManagerError("At least one agent must be selected")
- if invalid_agents := [
+ unavailable_agents = [
agent_id for agent_id in agent_ids if agent_id not in self.backup_agents
- ]:
- raise BackupManagerError(f"Invalid agents selected: {invalid_agents}")
+ ]
+ if not (
+ available_agents := [
+ agent_id for agent_id in agent_ids if agent_id in self.backup_agents
+ ]
+ ):
+ raise BackupManagerError(
+ f"At least one available backup agent must be selected, got {agent_ids}"
+ )
+ if unavailable_agents:
+ LOGGER.warning(
+ "Backup agents %s are not available, will backupp to %s",
+ unavailable_agents,
+ available_agents,
+ )
if include_all_addons and include_addons:
raise BackupManagerError(
"Cannot include all addons and specify specific addons"
@@ -972,7 +985,7 @@ class BackupManager:
new_backup,
self._backup_task,
) = await self._reader_writer.async_create_backup(
- agent_ids=agent_ids,
+ agent_ids=available_agents,
backup_name=backup_name,
extra_metadata=extra_metadata
| {
@@ -991,7 +1004,9 @@ class BackupManager:
raise BackupManagerError(str(err)) from err
backup_finish_task = self._backup_finish_task = self.hass.async_create_task(
- self._async_finish_backup(agent_ids, with_automatic_settings, password),
+ self._async_finish_backup(
+ available_agents, unavailable_agents, with_automatic_settings, password
+ ),
name="backup_manager_finish_backup",
)
if not raise_task_error:
@@ -1008,7 +1023,11 @@ class BackupManager:
return new_backup
async def _async_finish_backup(
- self, agent_ids: list[str], with_automatic_settings: bool, password: str | None
+ self,
+ available_agents: list[str],
+ unavailable_agents: list[str],
+ with_automatic_settings: bool,
+ password: str | None,
) -> None:
"""Finish a backup."""
if TYPE_CHECKING:
@@ -1027,7 +1046,7 @@ class BackupManager:
LOGGER.debug(
"Generated new backup with backup_id %s, uploading to agents %s",
written_backup.backup.backup_id,
- agent_ids,
+ available_agents,
)
self.async_on_backup_event(
CreateBackupEvent(
@@ -1040,13 +1059,15 @@ class BackupManager:
try:
agent_errors = await self._async_upload_backup(
backup=written_backup.backup,
- agent_ids=agent_ids,
+ agent_ids=available_agents,
open_stream=written_backup.open_stream,
password=password,
)
finally:
await written_backup.release_stream()
- self.known_backups.add(written_backup.backup, agent_errors)
+ self.known_backups.add(
+ written_backup.backup, agent_errors, unavailable_agents
+ )
if not agent_errors:
if with_automatic_settings:
# create backup was successful, update last_completed_automatic_backup
@@ -1055,7 +1076,7 @@ class BackupManager:
backup_success = True
if with_automatic_settings:
- self._update_issue_after_agent_upload(agent_errors)
+ self._update_issue_after_agent_upload(agent_errors, unavailable_agents)
# delete old backups more numerous than copies
# try this regardless of agent errors above
await delete_backups_exceeding_configured_count(self)
@@ -1215,10 +1236,10 @@ class BackupManager:
)
def _update_issue_after_agent_upload(
- self, agent_errors: dict[str, Exception]
+ self, agent_errors: dict[str, Exception], unavailable_agents: list[str]
) -> None:
"""Update issue registry after a backup is uploaded to agents."""
- if not agent_errors:
+ if not agent_errors and not unavailable_agents:
ir.async_delete_issue(self.hass, DOMAIN, "automatic_backup_failed")
return
ir.async_create_issue(
@@ -1232,7 +1253,13 @@ class BackupManager:
translation_key="automatic_backup_failed_upload_agents",
translation_placeholders={
"failed_agents": ", ".join(
- self.backup_agents[agent_id].name for agent_id in agent_errors
+ chain(
+ (
+ self.backup_agents[agent_id].name
+ for agent_id in agent_errors
+ ),
+ unavailable_agents,
+ )
)
},
)
@@ -1301,11 +1328,12 @@ class KnownBackups:
self,
backup: AgentBackup,
agent_errors: dict[str, Exception],
+ unavailable_agents: list[str],
) -> None:
"""Add a backup."""
self._backups[backup.backup_id] = KnownBackup(
backup_id=backup.backup_id,
- failed_agent_ids=list(agent_errors),
+ failed_agent_ids=list(chain(agent_errors, unavailable_agents)),
)
self._manager.store.save()
@@ -1411,7 +1439,11 @@ class CoreBackupReaderWriter(BackupReaderWriter):
manager = self._hass.data[DATA_MANAGER]
agent_config = manager.config.data.agents.get(self._local_agent_id)
- if agent_config and not agent_config.protected:
+ if (
+ self._local_agent_id in agent_ids
+ and agent_config
+ and not agent_config.protected
+ ):
password = None
backup = AgentBackup(
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..9d8f6e815dc 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
@@ -121,7 +122,7 @@ def read_backup(backup_path: Path) -> AgentBackup:
def suggested_filename_from_name_date(name: str, date_str: str) -> str:
"""Suggest a filename for the backup."""
date = dt_util.parse_datetime(date_str, raise_on_error=True)
- return "_".join(f"{name} - {date.strftime('%Y-%m-%d %H.%M %S%f')}.tar".split())
+ return "_".join(f"{name} {date.strftime('%Y-%m-%d %H.%M %S%f')}.tar".split())
def suggested_filename(backup: AgentBackup) -> str:
@@ -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/__init__.py b/homeassistant/components/bluesound/__init__.py
index 6cf1957f799..37e83ce2c47 100644
--- a/homeassistant/components/bluesound/__init__.py
+++ b/homeassistant/components/bluesound/__init__.py
@@ -1,8 +1,6 @@
"""The bluesound component."""
-from dataclasses import dataclass
-
-from pyblu import Player, SyncStatus
+from pyblu import Player
from pyblu.errors import PlayerUnreachableError
from homeassistant.config_entries import ConfigEntry
@@ -14,7 +12,11 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.typing import ConfigType
from .const import DOMAIN
-from .coordinator import BluesoundCoordinator
+from .coordinator import (
+ BluesoundConfigEntry,
+ BluesoundCoordinator,
+ BluesoundRuntimeData,
+)
CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -23,18 +25,6 @@ PLATFORMS = [
]
-@dataclass
-class BluesoundRuntimeData:
- """Bluesound data class."""
-
- player: Player
- sync_status: SyncStatus
- coordinator: BluesoundCoordinator
-
-
-type BluesoundConfigEntry = ConfigEntry[BluesoundRuntimeData]
-
-
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
"""Set up the Bluesound."""
return True
@@ -53,7 +43,7 @@ async def async_setup_entry(
except PlayerUnreachableError as ex:
raise ConfigEntryNotReady(f"Error connecting to {host}:{port}") from ex
- coordinator = BluesoundCoordinator(hass, player, sync_status)
+ coordinator = BluesoundCoordinator(hass, config_entry, player, sync_status)
await coordinator.async_config_entry_first_refresh()
config_entry.runtime_data = BluesoundRuntimeData(player, sync_status, coordinator)
diff --git a/homeassistant/components/bluesound/coordinator.py b/homeassistant/components/bluesound/coordinator.py
index e62f3ef96cf..ceaf0b392eb 100644
--- a/homeassistant/components/bluesound/coordinator.py
+++ b/homeassistant/components/bluesound/coordinator.py
@@ -12,6 +12,7 @@ import logging
from pyblu import Input, Player, Preset, Status, SyncStatus
from pyblu.errors import PlayerUnreachableError
+from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -21,6 +22,15 @@ NODE_OFFLINE_CHECK_TIMEOUT = timedelta(minutes=3)
PRESET_AND_INPUTS_INTERVAL = timedelta(minutes=15)
+@dataclass
+class BluesoundRuntimeData:
+ """Bluesound data class."""
+
+ player: Player
+ sync_status: SyncStatus
+ coordinator: BluesoundCoordinator
+
+
@dataclass
class BluesoundData:
"""Define a class to hold Bluesound data."""
@@ -31,6 +41,9 @@ class BluesoundData:
inputs: list[Input]
+type BluesoundConfigEntry = ConfigEntry[BluesoundRuntimeData]
+
+
def cancel_task(task: asyncio.Task) -> Callable[[], Coroutine[None, None, None]]:
"""Cancel a task."""
@@ -45,8 +58,14 @@ def cancel_task(task: asyncio.Task) -> Callable[[], Coroutine[None, None, None]]
class BluesoundCoordinator(DataUpdateCoordinator[BluesoundData]):
"""Define an object to hold Bluesound data."""
+ config_entry: BluesoundConfigEntry
+
def __init__(
- self, hass: HomeAssistant, player: Player, sync_status: SyncStatus
+ self,
+ hass: HomeAssistant,
+ config_entry: BluesoundConfigEntry,
+ player: Player,
+ sync_status: SyncStatus,
) -> None:
"""Initialize."""
self.player = player
@@ -55,12 +74,11 @@ class BluesoundCoordinator(DataUpdateCoordinator[BluesoundData]):
super().__init__(
hass,
logger=_LOGGER,
+ config_entry=config_entry,
name=sync_status.name,
)
async def _async_setup(self) -> None:
- assert self.config_entry is not None
-
preset = await self.player.presets()
inputs = await self.player.inputs()
status = await self.player.status()
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 c423e9e747b..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 (
@@ -302,7 +302,6 @@ async def async_update_device(
entry: ConfigEntry,
adapter: str,
details: AdapterDetails,
- via_device_domain: str | None = None,
via_device_id: str | None = None,
) -> None:
"""Update device registry entry.
@@ -322,10 +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:
- device_registry.async_update_device(
- device_entry.id, via_device_id=via_device_id
- )
+ 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:
@@ -360,7 +360,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry,
source_entry.title,
details,
- source_domain,
entry.data.get(CONF_SOURCE_DEVICE_ID),
)
return True
diff --git a/homeassistant/components/bluetooth/config_flow.py b/homeassistant/components/bluetooth/config_flow.py
index 5d03a9c9d0f..e76277306f5 100644
--- a/homeassistant/components/bluetooth/config_flow.py
+++ b/homeassistant/components/bluetooth/config_flow.py
@@ -140,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
@@ -155,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]
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index cd2530e1717..5d2b8ab6285 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.23.3",
- "dbus-fast==2.31.0",
- "habluetooth==3.21.0"
+ "bluetooth-data-tools==1.23.4",
+ "dbus-fast==2.33.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/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 4dad06b0fa3..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"
@@ -489,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={}
@@ -507,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/switchbot/__init__.py b/tests/components/switchbot/__init__.py
index 9ecffd395a3..4d6794b962f 100644
--- a/tests/components/switchbot/__init__.py
+++ b/tests/components/switchbot/__init__.py
@@ -274,3 +274,23 @@ LEAK_SERVICE_INFO = BluetoothServiceInfoBleak(
connectable=False,
tx_power=-127,
)
+
+REMOTE_SERVICE_INFO = BluetoothServiceInfoBleak(
+ name="Any",
+ manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+ service_data={"00000d00-0000-1000-8000-00805f9b34fb": b"b V\x00"},
+ service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+ address="AA:BB:CC:DD:EE:FF",
+ rssi=-60,
+ source="local",
+ advertisement=generate_advertisement_data(
+ local_name="Any",
+ manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+ service_data={"00000d00-0000-1000-8000-00805f9b34fb": b"b V\x00"},
+ service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+ ),
+ device=generate_ble_device("AA:BB:CC:DD:EE:FF", "Any"),
+ time=0,
+ connectable=False,
+ tx_power=-127,
+)
diff --git a/tests/components/switchbot/test_sensor.py b/tests/components/switchbot/test_sensor.py
index acf1bacc054..6a7111a054e 100644
--- a/tests/components/switchbot/test_sensor.py
+++ b/tests/components/switchbot/test_sensor.py
@@ -23,6 +23,7 @@ from homeassistant.setup import async_setup_component
from . import (
LEAK_SERVICE_INFO,
+ REMOTE_SERVICE_INFO,
WOHAND_SERVICE_INFO,
WOMETERTHPC_SERVICE_INFO,
WORELAY_SWITCH_1PM_SERVICE_INFO,
@@ -194,3 +195,42 @@ async def test_leak_sensor(hass: HomeAssistant) -> None:
assert await hass.config_entries.async_unload(entry.entry_id)
await hass.async_block_till_done()
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_remote(hass: HomeAssistant) -> None:
+ """Test setting up the remote sensor."""
+ await async_setup_component(hass, DOMAIN, {})
+ inject_bluetooth_service_info(hass, REMOTE_SERVICE_INFO)
+
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ data={
+ CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
+ CONF_NAME: "test-name",
+ CONF_SENSOR_TYPE: "remote",
+ },
+ unique_id="aabbccddeeff",
+ )
+ entry.add_to_hass(hass)
+
+ assert await hass.config_entries.async_setup(entry.entry_id)
+ await hass.async_block_till_done()
+
+ assert len(hass.states.async_all("sensor")) == 2
+
+ battery_sensor = hass.states.get("sensor.test_name_battery")
+ battery_sensor_attrs = battery_sensor.attributes
+ assert battery_sensor.state == "86"
+ assert battery_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Battery"
+ assert battery_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "%"
+ assert battery_sensor_attrs[ATTR_STATE_CLASS] == "measurement"
+
+ rssi_sensor = hass.states.get("sensor.test_name_bluetooth_signal")
+ rssi_sensor_attrs = rssi_sensor.attributes
+ assert rssi_sensor.state == "-60"
+ assert rssi_sensor_attrs[ATTR_FRIENDLY_NAME] == "test-name Bluetooth signal"
+ assert rssi_sensor_attrs[ATTR_UNIT_OF_MEASUREMENT] == "dBm"
+
+ assert await hass.config_entries.async_unload(entry.entry_id)
+ await hass.async_block_till_done()
diff --git a/tests/components/switchbot_cloud/__init__.py b/tests/components/switchbot_cloud/__init__.py
index ce570499b3a..42fe3e4f543 100644
--- a/tests/components/switchbot_cloud/__init__.py
+++ b/tests/components/switchbot_cloud/__init__.py
@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
from tests.common import MockConfigEntry
-def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
+async def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
"""Configure the integration."""
config = {
CONF_API_TOKEN: "test-token",
@@ -17,5 +17,7 @@ def configure_integration(hass: HomeAssistant) -> MockConfigEntry:
domain=DOMAIN, data=config, entry_id="123456", unique_id="123456"
)
entry.add_to_hass(hass)
+ await hass.config_entries.async_setup(entry.entry_id)
+ await hass.async_block_till_done()
return entry
diff --git a/tests/components/switchbot_cloud/fixtures/meter_status.json b/tests/components/switchbot_cloud/fixtures/meter_status.json
new file mode 100644
index 00000000000..8b5bcd0c031
--- /dev/null
+++ b/tests/components/switchbot_cloud/fixtures/meter_status.json
@@ -0,0 +1,9 @@
+{
+ "version": "V3.3",
+ "temperature": 21.8,
+ "battery": 100,
+ "humidity": 32,
+ "deviceId": "meter-id-1",
+ "deviceType": "Meter",
+ "hubDeviceId": "test-hub-id"
+}
diff --git a/tests/components/switchbot_cloud/snapshots/test_sensor.ambr b/tests/components/switchbot_cloud/snapshots/test_sensor.ambr
new file mode 100644
index 00000000000..a9b6fb20bfb
--- /dev/null
+++ b/tests/components/switchbot_cloud/snapshots/test_sensor.ambr
@@ -0,0 +1,307 @@
+# serializer version: 1
+# name: test_meter[sensor.meter_1_battery-entry]
+ EntityRegistryEntrySnapshot({
+ 'aliases': set({
+ }),
+ 'area_id': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
+ 'config_entry_id': ,
+ 'device_class': None,
+ 'device_id': ,
+ 'disabled_by': None,
+ 'domain': 'sensor',
+ 'entity_category': None,
+ 'entity_id': 'sensor.meter_1_battery',
+ 'has_entity_name': True,
+ 'hidden_by': None,
+ 'icon': None,
+ 'id': ,
+ 'labels': set({
+ }),
+ 'name': None,
+ 'options': dict({
+ }),
+ 'original_device_class': ,
+ 'original_icon': None,
+ 'original_name': 'Battery',
+ 'platform': 'switchbot_cloud',
+ 'previous_unique_id': None,
+ 'supported_features': 0,
+ 'translation_key': None,
+ 'unique_id': 'meter-id-1_battery',
+ 'unit_of_measurement': '%',
+ })
+# ---
+# name: test_meter[sensor.meter_1_battery-state]
+ StateSnapshot({
+ 'attributes': ReadOnlyDict({
+ 'device_class': 'battery',
+ 'friendly_name': 'meter-1 Battery',
+ 'state_class': ,
+ 'unit_of_measurement': '%',
+ }),
+ 'context': ,
+ 'entity_id': 'sensor.meter_1_battery',
+ 'last_changed': ,
+ 'last_reported': ,
+ 'last_updated': ,
+ 'state': '100',
+ })
+# ---
+# name: test_meter[sensor.meter_1_humidity-entry]
+ EntityRegistryEntrySnapshot({
+ 'aliases': set({
+ }),
+ 'area_id': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
+ 'config_entry_id': ,
+ 'device_class': None,
+ 'device_id': ,
+ 'disabled_by': None,
+ 'domain': 'sensor',
+ 'entity_category': None,
+ 'entity_id': 'sensor.meter_1_humidity',
+ 'has_entity_name': True,
+ 'hidden_by': None,
+ 'icon': None,
+ 'id': ,
+ 'labels': set({
+ }),
+ 'name': None,
+ 'options': dict({
+ }),
+ 'original_device_class': ,
+ 'original_icon': None,
+ 'original_name': 'Humidity',
+ 'platform': 'switchbot_cloud',
+ 'previous_unique_id': None,
+ 'supported_features': 0,
+ 'translation_key': None,
+ 'unique_id': 'meter-id-1_humidity',
+ 'unit_of_measurement': '%',
+ })
+# ---
+# name: test_meter[sensor.meter_1_humidity-state]
+ StateSnapshot({
+ 'attributes': ReadOnlyDict({
+ 'device_class': 'humidity',
+ 'friendly_name': 'meter-1 Humidity',
+ 'state_class': ,
+ 'unit_of_measurement': '%',
+ }),
+ 'context': ,
+ 'entity_id': 'sensor.meter_1_humidity',
+ 'last_changed': ,
+ 'last_reported': ,
+ 'last_updated': ,
+ 'state': '32',
+ })
+# ---
+# name: test_meter[sensor.meter_1_temperature-entry]
+ EntityRegistryEntrySnapshot({
+ 'aliases': set({
+ }),
+ 'area_id': None,
+ 'capabilities': dict({
+ 'state_class': ,
+ }),
+ 'config_entry_id': ,
+ 'device_class': None,
+ 'device_id': ,
+ 'disabled_by': None,
+ 'domain': 'sensor',
+ 'entity_category': None,
+ 'entity_id': 'sensor.meter_1_temperature',
+ 'has_entity_name': True,
+ 'hidden_by': None,
+ 'icon': None,
+ 'id': ,
+ 'labels': set({
+ }),
+ 'name': None,
+ 'options': dict({
+ }),
+ 'original_device_class': ,
+ 'original_icon': None,
+ 'original_name': 'Temperature',
+ 'platform': 'switchbot_cloud',
+ 'previous_unique_id': None,
+ 'supported_features': 0,
+ 'translation_key': None,
+ 'unique_id': 'meter-id-1_temperature',
+ 'unit_of_measurement': ,
+ })
+# ---
+# name: test_meter[sensor.meter_1_temperature-state]
+ StateSnapshot({
+ 'attributes': ReadOnlyDict({
+ 'device_class': 'temperature',
+ 'friendly_name': 'meter-1 Temperature',
+ 'state_class': ,
+ 'unit_of_measurement': ,
+ }),
+ 'context': ,
+ 'entity_id': 'sensor.meter_1_temperature',
+ 'last_changed': ,
+ 'last_reported': ,
+ 'last_updated':