[pull] dev from home-assistant:dev

.github/workflows/ci.yaml

@@ -247,17 +247,11 @@ jobs:
       && github.event.inputs.audit-licenses-only != 'true'
     steps:
       - *checkout
-      - name: Register yamllint problem matcher
+      - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/yamllint.json"
-      - name: Register check-json problem matcher
-        run: |
           echo "::add-matcher::.github/workflows/matchers/check-json.json"
-      - name: Register check executables problem matcher
-        run: |
           echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
-      - name: Register codespell problem matcher
-        run: |
           echo "::add-matcher::.github/workflows/matchers/codespell.json"
       - name: Run prek
         uses: j178/prek-action@9d6a3097e0c1865ecce00cfb89fe80f2ee91b547 # v1.0.12

.github/workflows/matchers/check-executables-have-shebangs.json

@@ -4,7 +4,7 @@
       "owner": "check-executables-have-shebangs",
       "pattern": [
         {
-          "regexp": "^(.+):\\s(.+)$",
+          "regexp": "^(.+):\\s(marked executable but has no \\(or invalid\\) shebang!.*)$",
           "file": 1,
           "message": 2
         }

homeassistant/components/assist_satellite/condition.py

@@ -0,0 +1,23 @@
+"""Provides conditions for assist satellites."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from .const import DOMAIN
+from .entity import AssistSatelliteState
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_idle": make_entity_state_condition(DOMAIN, AssistSatelliteState.IDLE),
+    "is_listening": make_entity_state_condition(DOMAIN, AssistSatelliteState.LISTENING),
+    "is_processing": make_entity_state_condition(
+        DOMAIN, AssistSatelliteState.PROCESSING
+    ),
+    "is_responding": make_entity_state_condition(
+        DOMAIN, AssistSatelliteState.RESPONDING
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the assist satellite conditions."""
+    return CONDITIONS

homeassistant/components/assist_satellite/conditions.yaml

@@ -0,0 +1,19 @@
+.condition_common: &condition_common
+  target:
+    entity:
+      domain: assist_satellite
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+is_idle: *condition_common
+is_listening: *condition_common
+is_processing: *condition_common
+is_responding: *condition_common

homeassistant/components/assist_satellite/icons.json

@@ -1,4 +1,18 @@
 {
+  "conditions": {
+    "is_idle": {
+      "condition": "mdi:chat-sleep"
+    },
+    "is_listening": {
+      "condition": "mdi:chat-question"
+    },
+    "is_processing": {
+      "condition": "mdi:chat-processing"
+    },
+    "is_responding": {
+      "condition": "mdi:chat-alert"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:account-voice"

homeassistant/components/assist_satellite/strings.json

@@ -1,8 +1,52 @@
 {
   "common": {
+    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
+    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
+  "conditions": {
+    "is_idle": {
+      "description": "Tests if one or more Assist satellites are idle.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is idle"
+    },
+    "is_listening": {
+      "description": "Tests if one or more Assist satellites are listening.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is listening"
+    },
+    "is_processing": {
+      "description": "Tests if one or more Assist satellites are processing.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is processing"
+    },
+    "is_responding": {
+      "description": "Tests if one or more Assist satellites are responding.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
+          "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
+        }
+      },
+      "name": "If a satellite is responding"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "Assist satellite",
@@ -21,6 +65,12 @@
         "sentences": "Sentences"
       }
     },
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/automation/__init__.py

@@ -124,6 +124,7 @@
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "alarm_control_panel",
+    "assist_satellite",
     "fan",
     "light",
 }

homeassistant/components/concord232/alarm_control_panel.py

@@ -49,11 +49,11 @@ def setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Concord232 alarm control panel platform."""
-    name = config[CONF_NAME]
-    code = config.get(CONF_CODE)
-    mode = config[CONF_MODE]
-    host = config[CONF_HOST]
-    port = config[CONF_PORT]
+    name: str = config[CONF_NAME]
+    code: str | None = config.get(CONF_CODE)
+    mode: str = config[CONF_MODE]
+    host: str = config[CONF_HOST]
+    port: int = config[CONF_PORT]
 
     url = f"http://{host}:{port}"
 
@@ -72,7 +72,7 @@ class Concord232Alarm(AlarmControlPanelEntity):
         | AlarmControlPanelEntityFeature.ARM_AWAY
     )
 
-    def __init__(self, url, name, code, mode):
+    def __init__(self, url: str, name: str, code: str | None, mode: str) -> None:
         """Initialize the Concord232 alarm panel."""
 
         self._attr_name = name
@@ -125,7 +125,7 @@ def alarm_arm_away(self, code: str | None = None) -> None:
             return
         self._alarm.arm("away")
 
-    def _validate_code(self, code, state):
+    def _validate_code(self, code: str | None, state: AlarmControlPanelState) -> bool:
         """Validate given code."""
         if self._code is None:
             return True

homeassistant/components/concord232/binary_sensor.py

@@ -4,6 +4,7 @@
 
 import datetime
 import logging
+from typing import Any
 
 from concord232 import client as concord232_client
 import requests
@@ -29,8 +30,7 @@
 
 DEFAULT_HOST = "localhost"
 DEFAULT_NAME = "Alarm"
-DEFAULT_PORT = "5007"
-DEFAULT_SSL = False
+DEFAULT_PORT = 5007
 
 SCAN_INTERVAL = datetime.timedelta(seconds=10)
 
@@ -56,10 +56,10 @@ def setup_platform(
 ) -> None:
     """Set up the Concord232 binary sensor platform."""
 
-    host = config[CONF_HOST]
-    port = config[CONF_PORT]
-    exclude = config[CONF_EXCLUDE_ZONES]
-    zone_types = config[CONF_ZONE_TYPES]
+    host: str = config[CONF_HOST]
+    port: int = config[CONF_PORT]
+    exclude: list[int] = config[CONF_EXCLUDE_ZONES]
+    zone_types: dict[int, BinarySensorDeviceClass] = config[CONF_ZONE_TYPES]
     sensors = []
 
     try:
@@ -84,7 +84,6 @@ def setup_platform(
         if zone["number"] not in exclude:
             sensors.append(
                 Concord232ZoneSensor(
-                    hass,
                     client,
                     zone,
                     zone_types.get(zone["number"], get_opening_type(zone)),
@@ -110,26 +109,25 @@ def get_opening_type(zone):
 class Concord232ZoneSensor(BinarySensorEntity):
     """Representation of a Concord232 zone as a sensor."""
 
-    def __init__(self, hass, client, zone, zone_type):
+    def __init__(
+        self,
+        client: concord232_client.Client,
+        zone: dict[str, Any],
+        zone_type: BinarySensorDeviceClass,
+    ) -> None:
         """Initialize the Concord232 binary sensor."""
-        self._hass = hass
         self._client = client
         self._zone = zone
         self._number = zone["number"]
-        self._zone_type = zone_type
+        self._attr_device_class = zone_type
 
     @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor, from DEVICE_CLASSES."""
-        return self._zone_type
-
-    @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the binary sensor."""
         return self._zone["name"]
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
         # True means "faulted" or "open" or "abnormal state"
         return bool(self._zone["state"] != "Normal")
@@ -145,5 +143,5 @@ def update(self) -> None:
 
         if hasattr(self._client, "zones"):
             self._zone = next(
-                (x for x in self._client.zones if x["number"] == self._number), None
+                x for x in self._client.zones if x["number"] == self._number
             )

homeassistant/components/digital_ocean/__init__.py

@@ -1,6 +1,7 @@
 """Support for Digital Ocean."""
 
-from datetime import timedelta
+from __future__ import annotations
+
 import logging
 
 import digitalocean
@@ -12,27 +13,12 @@
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
-ATTR_CREATED_AT = "created_at"
-ATTR_DROPLET_ID = "droplet_id"
-ATTR_DROPLET_NAME = "droplet_name"
-ATTR_FEATURES = "features"
-ATTR_IPV4_ADDRESS = "ipv4_address"
-ATTR_IPV6_ADDRESS = "ipv6_address"
-ATTR_MEMORY = "memory"
-ATTR_REGION = "region"
-ATTR_VCPUS = "vcpus"
+from .const import DATA_DIGITAL_OCEAN, DOMAIN, MIN_TIME_BETWEEN_UPDATES
 
-ATTRIBUTION = "Data provided by Digital Ocean"
+_LOGGER = logging.getLogger(__name__)
 
-CONF_DROPLETS = "droplets"
 
-DATA_DIGITAL_OCEAN = "data_do"
 DIGITAL_OCEAN_PLATFORMS = [Platform.SWITCH, Platform.BINARY_SENSOR]
-DOMAIN = "digital_ocean"
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
 
 CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.Schema({vol.Required(CONF_ACCESS_TOKEN): cv.string})},

homeassistant/components/digital_ocean/binary_sensor.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
 import voluptuous as vol
 
@@ -16,7 +17,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import (
+from .const import (
     ATTR_CREATED_AT,
     ATTR_DROPLET_ID,
     ATTR_DROPLET_NAME,
@@ -65,6 +66,7 @@ class DigitalOceanBinarySensor(BinarySensorEntity):
     """Representation of a Digital Ocean droplet sensor."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_device_class = BinarySensorDeviceClass.MOVING
 
     def __init__(self, do, droplet_id):
         """Initialize a new Digital Ocean sensor."""
@@ -79,17 +81,12 @@ def name(self):
         return self.data.name
 
     @property
-    def is_on(self):
+    def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
         return self.data.status == "active"
 
     @property
-    def device_class(self) -> BinarySensorDeviceClass:
-        """Return the class of this sensor."""
-        return BinarySensorDeviceClass.MOVING
-
-    @property
-    def extra_state_attributes(self):
+    def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes of the Digital Ocean droplet."""
         return {
             ATTR_CREATED_AT: self.data.created_at,

homeassistant/components/digital_ocean/const.py

@@ -0,0 +1,30 @@
+"""Support for Digital Ocean."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+from typing import TYPE_CHECKING
+
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from . import DigitalOcean
+
+ATTR_CREATED_AT = "created_at"
+ATTR_DROPLET_ID = "droplet_id"
+ATTR_DROPLET_NAME = "droplet_name"
+ATTR_FEATURES = "features"
+ATTR_IPV4_ADDRESS = "ipv4_address"
+ATTR_IPV6_ADDRESS = "ipv6_address"
+ATTR_MEMORY = "memory"
+ATTR_REGION = "region"
+ATTR_VCPUS = "vcpus"
+
+ATTRIBUTION = "Data provided by Digital Ocean"
+
+CONF_DROPLETS = "droplets"
+
+DOMAIN = "digital_ocean"
+DATA_DIGITAL_OCEAN: HassKey[DigitalOcean] = HassKey(DOMAIN)
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)