[pull] dev from home-assistant:dev

homeassistant/components/apple_tv/media_player.py

@@ -204,7 +204,7 @@ def state(self) -> MediaPlayerState | None:
                 return MediaPlayerState.PLAYING
             if state in (DeviceState.Paused, DeviceState.Seeking, DeviceState.Stopped):
                 return MediaPlayerState.PAUSED
-            return MediaPlayerState.IDLE  # Bad or unknown state?
+            return MediaPlayerState.IDLE  # type: ignore[unreachable]  # Bad or unknown state?
         return None
 
     @callback

homeassistant/components/assist_satellite/llm.py

@@ -0,0 +1,24 @@
+"""LLM tools for the assist_satellite integration."""
+
+from homeassistant.components.llm import LLMTools
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import intent
+from homeassistant.helpers.llm import LLM_API_ASSIST, IntentTool, LLMContext, Tool
+
+
+@callback
+def async_get_tools(
+    hass: HomeAssistant, llm_context: LLMContext, api_id: str
+) -> LLMTools | None:
+    """Return the broadcast LLM tool."""
+    if api_id != LLM_API_ASSIST:
+        return None
+
+    # assist_satellite registers the broadcast intent when it is set up, and
+    # this platform is only queried once that has happened.
+    tools: list[Tool] = [
+        IntentTool(handler.intent_type, handler)
+        for handler in intent.async_get(hass)
+        if handler.intent_type == intent.INTENT_BROADCAST
+    ]
+    return LLMTools(tools=tools)

homeassistant/components/bsblan/services.py

@@ -2,7 +2,7 @@
 
 from datetime import time
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Final
 
 from bsblan import BSBLANError, DaySchedule, DHWSchedule, TimeSlot
 import voluptuous as vol
@@ -29,6 +29,16 @@
 ATTR_SATURDAY_SLOTS = "saturday_slots"
 ATTR_SUNDAY_SLOTS = "sunday_slots"
 
+_DAY_NAME_SLOT_ATTR_PAIRS: tuple[tuple[str, str], ...] = (
+    ("monday", ATTR_MONDAY_SLOTS),
+    ("tuesday", ATTR_TUESDAY_SLOTS),
+    ("wednesday", ATTR_WEDNESDAY_SLOTS),
+    ("thursday", ATTR_THURSDAY_SLOTS),
+    ("friday", ATTR_FRIDAY_SLOTS),
+    ("saturday", ATTR_SATURDAY_SLOTS),
+    ("sunday", ATTR_SUNDAY_SLOTS),
+)
+
 
 # Schema for a single time slot
 _SLOT_SCHEMA = vol.Schema(
@@ -39,16 +49,16 @@
 )
 
 
+_WEEKLY_SCHEDULE_FIELDS: Final[dict[vol.Marker, Any]] = {
+    vol.Optional(slot_attr): vol.All(cv.ensure_list, [_SLOT_SCHEMA])
+    for _, slot_attr in _DAY_NAME_SLOT_ATTR_PAIRS
+}
+
+
 SERVICE_SET_HOT_WATER_SCHEDULE_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_DEVICE_ID): cv.string,
-        vol.Optional(ATTR_MONDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_TUESDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_WEDNESDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_THURSDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_FRIDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_SATURDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
-        vol.Optional(ATTR_SUNDAY_SLOTS): vol.All(cv.ensure_list, [_SLOT_SCHEMA]),
+        **_WEEKLY_SCHEDULE_FIELDS,
     }
 )
 
@@ -98,11 +108,26 @@ def _convert_time_slots_to_day_schedule(
     return DaySchedule(slots=time_slots)
 
 
-async def set_hot_water_schedule(service_call: ServiceCall) -> None:
-    """Set hot water heating schedule."""
-    device_id = service_call.data[ATTR_DEVICE_ID]
+def _build_weekly_schedule_days(
+    service_call: ServiceCall,
+) -> dict[str, DaySchedule | None]:
+    """Build day-name -> schedule values from the service call data.
+
+    Days omitted from the service call map to None, which tells python-bsblan not to
+    modify that day.
+    """
+    return {
+        day_name: _convert_time_slots_to_day_schedule(service_call.data.get(attr_name))
+        for day_name, attr_name in _DAY_NAME_SLOT_ATTR_PAIRS
+    }
+
+
+def _resolve_config_entry(
+    service_call: ServiceCall,
+) -> tuple[BSBLanConfigEntry, dr.DeviceEntry]:
+    """Resolve device_id from a service call into a loaded BSBLAN config entry."""
+    device_id: str = service_call.data[ATTR_DEVICE_ID]
 
-    # Get the device and config entry
     device_registry = dr.async_get(service_call.hass)
     device_entry = device_registry.async_get(device_id)
 
@@ -137,56 +162,20 @@ async def set_hot_water_schedule(service_call: ServiceCall) -> None:
             translation_placeholders={"device_name": device_entry.name or device_id},
         )
 
-    client = entry.runtime_data.client
+    return entry, device_entry
 
-    # Convert time slots to DaySchedule objects
-    monday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_MONDAY_SLOTS)
-    )
-    tuesday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_TUESDAY_SLOTS)
-    )
-    wednesday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_WEDNESDAY_SLOTS)
-    )
-    thursday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_THURSDAY_SLOTS)
-    )
-    friday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_FRIDAY_SLOTS)
-    )
-    saturday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_SATURDAY_SLOTS)
-    )
-    sunday = _convert_time_slots_to_day_schedule(
-        service_call.data.get(ATTR_SUNDAY_SLOTS)
-    )
 
-    # Create the DHWSchedule object
-    dhw_schedule = DHWSchedule(
-        monday=monday,
-        tuesday=tuesday,
-        wednesday=wednesday,
-        thursday=thursday,
-        friday=friday,
-        saturday=saturday,
-        sunday=sunday,
-    )
+async def set_hot_water_schedule(service_call: ServiceCall) -> None:
+    """Set hot water heating schedule."""
+    entry, _ = _resolve_config_entry(service_call)
+    client = entry.runtime_data.client
 
-    LOGGER.debug(
-        "Setting hot water schedule - Monday: %s, Tuesday: %s, Wednesday: %s, "
-        "Thursday: %s, Friday: %s, Saturday: %s, Sunday: %s",
-        monday,
-        tuesday,
-        wednesday,
-        thursday,
-        friday,
-        saturday,
-        sunday,
-    )
+    days = _build_weekly_schedule_days(service_call)
+    dhw_schedule = DHWSchedule(**days)
+
+    LOGGER.debug("Setting hot water schedule: %s", dhw_schedule)
 
     try:
-        # Call the BSB-LAN API to set the schedule
         await client.set_hot_water_schedule(dhw_schedule)
     except BSBLANError as err:
         raise HomeAssistantError(
@@ -201,45 +190,11 @@ async def set_hot_water_schedule(service_call: ServiceCall) -> None:
 
 async def async_sync_time(service_call: ServiceCall) -> None:
     """Synchronize BSB-LAN device time with Home Assistant."""
-    device_id: str = service_call.data[ATTR_DEVICE_ID]
-
-    # Get the device and config entry
-    device_registry = dr.async_get(service_call.hass)
-    device_entry = device_registry.async_get(device_id)
-
-    if device_entry is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_device_id",
-            translation_placeholders={"device_id": device_id},
-        )
-
-    # Find the config entry for this device
-    matching_entries: list[BSBLanConfigEntry] = [
-        entry
-        for entry in service_call.hass.config_entries.async_entries(DOMAIN)
-        if entry.entry_id in device_entry.config_entries
-    ]
-
-    if not matching_entries:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="no_config_entry_for_device",
-            translation_placeholders={"device_id": device_entry.name or device_id},
-        )
-
-    entry = matching_entries[0]
-
-    # Verify the config entry is loaded
-    if entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="config_entry_not_loaded",
-            translation_placeholders={"device_name": device_entry.name or device_id},
-        )
-
+    entry, device_entry = _resolve_config_entry(service_call)
     client = entry.runtime_data.client
-    await async_sync_device_time(client, device_entry.name or device_id)
+    await async_sync_device_time(
+        client, device_entry.name or service_call.data[ATTR_DEVICE_ID]
+    )
 
 
 SYNC_TIME_SCHEMA = vol.Schema(

homeassistant/components/conversation/trigger.py

@@ -151,8 +151,7 @@ async def call_action(
             if isinstance(
                 automation_result, ScriptRunResult
             ) and automation_result.conversation_response not in (None, UNDEFINED):
-                # mypy does not understand the type narrowing, unclear why
-                return automation_result.conversation_response  # type: ignore[return-value]
+                return automation_result.conversation_response
 
         # It's important to return None here instead of a string.
         #

homeassistant/components/device_tracker/__init__.py

@@ -36,7 +36,11 @@
     LOGGER,
     PLATFORM_TYPE_LEGACY,
     SCAN_INTERVAL,
+    DeviceTrackerEntityCapabilityAttribute,
+    DeviceTrackerEntityStateAttribute,
+    ScannerEntityStateAttribute,
     SourceType,
+    TrackerEntityStateAttribute,
     TrackingType,
 )
 from .entity import (  # noqa: F401

homeassistant/components/etherscan/__init__.py

@@ -1 +1 @@
-"""The etherscan component."""
+"""The Etherscan integration."""

homeassistant/components/google_health/config_flow.py

@@ -6,14 +6,17 @@
 
 from google_health_api import GoogleHealthApi
 from google_health_api.const import HealthApiScope
-from google_health_api.exceptions import GoogleHealthApiError
+from google_health_api.exceptions import (
+    GoogleHealthApiError,
+    HealthApiForbiddenException,
+)
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
 from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
 from .api import SimpleAuth
-from .const import DEFAULT_TITLE, DOMAIN, OAUTH_SCOPES
+from .const import API_CONSOLE_URL, DEFAULT_TITLE, DOMAIN, OAUTH_SCOPES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -68,6 +71,12 @@ async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResu
 
         try:
             identity = await api.get_identity()
+        except HealthApiForbiddenException as err:
+            _LOGGER.error("Error getting Google Health identity: %s", err)
+            return self.async_abort(
+                reason="api_not_enabled",
+                description_placeholders={"url": API_CONSOLE_URL},
+            )
         except GoogleHealthApiError as err:
             _LOGGER.error("Error getting Google Health identity: %s", err)
             return self.async_abort(reason="cannot_connect")

homeassistant/components/google_health/const.py

@@ -7,6 +7,10 @@
 OAUTH2_AUTHORIZE = "https://accounts.google.com/o/oauth2/v2/auth"
 OAUTH2_TOKEN = "https://oauth2.googleapis.com/token"
 
+API_CONSOLE_URL = (
+    "https://console.developers.google.com/apis/api/health.googleapis.com/overview"
+)
+
 DEFAULT_TITLE = "Google Health"
 
 OAUTH_SCOPES = [

homeassistant/components/google_health/strings.json

@@ -6,6 +6,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "api_not_enabled": "The Google Health API is not enabled for your Google Cloud project. Enable it in the [Google Cloud Console]({url}), wait a few minutes for the change to propagate, then try again.",
       "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
       "cannot_connect": "Failed to connect.",
       "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",

homeassistant/components/hassio/__init__.py

@@ -60,13 +60,15 @@
     DATA_HASSIO_SUPERVISOR_USER,
     DATA_KEY_SUPERVISOR_ISSUES,
     DOMAIN,
+    JOBS_COORDINATOR,
     MAIN_COORDINATOR,
     STATS_COORDINATOR,
 )
 from .coordinator import (
     HassioAddOnDataUpdateCoordinator,
     HassioMainDataUpdateCoordinator,
     HassioStatsDataUpdateCoordinator,
+    SupervisorJobsCoordinator,
     get_addons_info,
     get_addons_list,
     get_addons_stats,
@@ -326,9 +328,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await coordinator.async_config_entry_first_refresh()
     hass.data[MAIN_COORDINATOR] = coordinator
 
-    addon_coordinator = HassioAddOnDataUpdateCoordinator(
-        hass, entry, dev_reg, coordinator.jobs
-    )
+    jobs_coordinator = SupervisorJobsCoordinator(hass, entry)
+    await jobs_coordinator.async_config_entry_first_refresh()
+    hass.data[JOBS_COORDINATOR] = jobs_coordinator
+
+    addon_coordinator = HassioAddOnDataUpdateCoordinator(hass, entry, dev_reg)
     await addon_coordinator.async_config_entry_first_refresh()
     hass.data[ADDONS_COORDINATOR] = addon_coordinator
 
@@ -437,5 +441,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.pop(MAIN_COORDINATOR, None)
     hass.data.pop(ADDONS_COORDINATOR, None)
     hass.data.pop(STATS_COORDINATOR, None)
+    hass.data.pop(JOBS_COORDINATOR, None)
 
     return unload_ok

homeassistant/components/hassio/const.py

@@ -27,6 +27,7 @@
         HassioAddOnDataUpdateCoordinator,
         HassioMainDataUpdateCoordinator,
         HassioStatsDataUpdateCoordinator,
+        SupervisorJobsCoordinator,
     )
     from .handler import HassIO
     from .issues import SupervisorIssues
@@ -103,6 +104,9 @@
 STATS_COORDINATOR: HassKey[HassioStatsDataUpdateCoordinator] = HassKey(
     "hassio_stats_coordinator"
 )
+JOBS_COORDINATOR: HassKey[SupervisorJobsCoordinator] = HassKey(
+    "hassio_jobs_coordinator"
+)
 
 
 DATA_COMPONENT: HassKey[HassIO] = HassKey(DOMAIN)
@@ -126,6 +130,7 @@
 HASSIO_MAIN_UPDATE_INTERVAL = timedelta(minutes=5)
 HASSIO_ADDON_UPDATE_INTERVAL = timedelta(minutes=15)
 HASSIO_STATS_UPDATE_INTERVAL = timedelta(seconds=60)
+SUPERVISOR_JOBS_UPDATE_INTERVAL = timedelta(minutes=15)
 
 ATTR_AUTO_UPDATE = "auto_update"
 ATTR_VERSION = "version"