[pull] dev from home-assistant:dev

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,10 +6,14 @@ body:
       value: |
         This issue form is for reporting bugs only!
 
+        Please read our [issue reporting guide][reporting-issues] before submitting a report.
+
         If you have a feature or enhancement request, please [request them here instead][fr].
 
         [fr]: https://github.com/orgs/home-assistant/discussions
+        [reporting-issues]: https://www.home-assistant.io/help/reporting_issues/
   - type: textarea
+    id: problem
     validations:
       required: true
     attributes:
@@ -35,12 +39,14 @@ body:
 
         [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
   - type: input
+    id: last_working_version
     attributes:
       label: What was the last working version of Home Assistant Core?
       placeholder: core-
       description: >
         If known, otherwise leave blank.
   - type: dropdown
+    id: installation_type
     validations:
       required: true
     attributes:
@@ -76,6 +82,7 @@ body:
       value: |
         # Details
   - type: textarea
+    id: diagnostics
     attributes:
       label: Diagnostics information
       placeholder: "drag-and-drop the diagnostics data file here (do not copy-and-paste the content)"
@@ -87,18 +94,21 @@ body:
 
         It generally allows pinpointing defects and thus resolving issues faster.
   - type: textarea
+    id: configuration
     attributes:
       label: Example YAML snippet
       description: |
         If applicable, please provide an example piece of YAML that can help reproduce this problem.
         This can be from an automation, script, scene or configuration.
       render: yaml
   - type: textarea
+    id: logs
     attributes:
       label: Anything in the logs that might be useful for us?
       description: For example, error message, or stack traces.
       render: txt
   - type: textarea
+    id: additional_information
     attributes:
       label: Additional information
       description: >

.github/actions/cache-apt-packages/action.yml

@@ -29,7 +29,7 @@ runs:
       shell: bash
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
     - name: Install apt packages via cache
-      uses: awalsh128/cache-apt-pkgs-action@2c09a5e66da6c8016428a2172bd76e5e4f14bb17 # v1.5.3
+      uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
       with:
         packages: ${{ inputs.packages }}
         version: ${{ inputs.version }}

homeassistant/components/alarm_control_panel/__init__.py

@@ -4,7 +4,6 @@
 import logging
 from typing import Any, Final, final, override
 
-import probatio
 from propcache.api import cached_property
 
 from homeassistant.config_entries import ConfigEntry
@@ -22,37 +21,31 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.config_validation import make_entity_service_schema
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util.hass_dict import HassKey
 
 from .const import (  # noqa: F401
     ATTR_CHANGED_BY,
     ATTR_CODE_ARM_REQUIRED,
+    DATA_COMPONENT,
     DOMAIN,
     AlarmControlPanelEntityFeature,
     AlarmControlPanelEntityStateAttribute,
     AlarmControlPanelState,
     CodeFormat,
 )
+from .services import async_setup_services
 
 _LOGGER: Final = logging.getLogger(__name__)
 
-DATA_COMPONENT: HassKey[EntityComponent[AlarmControlPanelEntity]] = HassKey(DOMAIN)
 ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
 PLATFORM_SCHEMA: Final = cv.PLATFORM_SCHEMA
 PLATFORM_SCHEMA_BASE: Final = cv.PLATFORM_SCHEMA_BASE
 SCAN_INTERVAL: Final = timedelta(seconds=30)
 
 CONF_DEFAULT_CODE = "default_code"
 
-ALARM_SERVICE_SCHEMA: Final = make_entity_service_schema(
-    {probatio.Optional(ATTR_CODE): cv.string}
-)
-
-
 # mypy: disallow-any-generics
 
 
@@ -64,47 +57,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
     await component.async_setup(config)
 
-    component.async_register_entity_service(
-        SERVICE_ALARM_DISARM,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_disarm",
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_ARM_HOME,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_arm_home",
-        [AlarmControlPanelEntityFeature.ARM_HOME],
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_ARM_AWAY,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_arm_away",
-        [AlarmControlPanelEntityFeature.ARM_AWAY],
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_ARM_NIGHT,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_arm_night",
-        [AlarmControlPanelEntityFeature.ARM_NIGHT],
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_ARM_VACATION,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_arm_vacation",
-        [AlarmControlPanelEntityFeature.ARM_VACATION],
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_ARM_CUSTOM_BYPASS,
-        ALARM_SERVICE_SCHEMA,
-        "async_handle_alarm_arm_custom_bypass",
-        [AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS],
-    )
-    component.async_register_entity_service(
-        SERVICE_ALARM_TRIGGER,
-        ALARM_SERVICE_SCHEMA,
-        "async_alarm_trigger",
-        [AlarmControlPanelEntityFeature.TRIGGER],
-    )
+    async_setup_services(hass)
 
     return True
 

homeassistant/components/alarm_control_panel/const.py

@@ -1,9 +1,17 @@
 """Provides the constants needed for component."""
 
 from enum import IntFlag, StrEnum
-from typing import Final
+from typing import TYPE_CHECKING, Final
+
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from homeassistant.helpers.entity_component import EntityComponent
+
+    from . import AlarmControlPanelEntity
 
 DOMAIN: Final = "alarm_control_panel"
+DATA_COMPONENT: HassKey[EntityComponent[AlarmControlPanelEntity]] = HassKey(DOMAIN)
 
 ATTR_CHANGED_BY: Final = "changed_by"
 ATTR_CODE_ARM_REQUIRED: Final = "code_arm_required"

homeassistant/components/alarm_control_panel/services.py

@@ -0,0 +1,73 @@
+"""Services for the Alarm control panel integration."""
+
+from typing import Final
+
+import probatio
+
+from homeassistant.const import (
+    ATTR_CODE,
+    SERVICE_ALARM_ARM_AWAY,
+    SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+    SERVICE_ALARM_ARM_HOME,
+    SERVICE_ALARM_ARM_NIGHT,
+    SERVICE_ALARM_ARM_VACATION,
+    SERVICE_ALARM_DISARM,
+    SERVICE_ALARM_TRIGGER,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.config_validation import make_entity_service_schema
+
+from .const import DATA_COMPONENT, AlarmControlPanelEntityFeature
+
+ALARM_SERVICE_SCHEMA: Final = make_entity_service_schema(
+    {probatio.Optional(ATTR_CODE): cv.string}
+)
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Register the alarm control panel services."""
+    component = hass.data[DATA_COMPONENT]
+
+    component.async_register_entity_service(
+        SERVICE_ALARM_DISARM,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_disarm",
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_ARM_HOME,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_arm_home",
+        [AlarmControlPanelEntityFeature.ARM_HOME],
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_ARM_AWAY,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_arm_away",
+        [AlarmControlPanelEntityFeature.ARM_AWAY],
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_ARM_NIGHT,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_arm_night",
+        [AlarmControlPanelEntityFeature.ARM_NIGHT],
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_ARM_VACATION,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_arm_vacation",
+        [AlarmControlPanelEntityFeature.ARM_VACATION],
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_ARM_CUSTOM_BYPASS,
+        ALARM_SERVICE_SCHEMA,
+        "async_handle_alarm_arm_custom_bypass",
+        [AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS],
+    )
+    component.async_register_entity_service(
+        SERVICE_ALARM_TRIGGER,
+        ALARM_SERVICE_SCHEMA,
+        "async_alarm_trigger",
+        [AlarmControlPanelEntityFeature.TRIGGER],
+    )

homeassistant/components/alexa_devices/diagnostics.py

@@ -55,9 +55,11 @@ async def async_get_device_diagnostics(
     coordinator = entry.runtime_data
 
     if TYPE_CHECKING:
-        # alexa_devices does not create child devices, and devices have a serial number
         assert isinstance(device_entry, DeviceEntry)
-        assert device_entry.serial_number
+
+    if device_entry.serial_number is None:
+        # Service device has no serial number and no matching coordinator data
+        return {"service device": True}
 
     return build_device_data(coordinator.data[device_entry.serial_number])
 

homeassistant/components/bosch_shc/__init__.py

@@ -20,6 +20,7 @@
     Platform.COVER,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.VALVE,
 ]
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/bosch_shc/icons.json

@@ -12,6 +12,12 @@
       }
     },
     "switch": {
+      "bypass": {
+        "default": "mdi:shield-off-outline"
+      },
+      "bypass_infinite": {
+        "default": "mdi:timer-off-outline"
+      },
       "child_lock": {
         "default": "mdi:lock"
       },