2022.11.2 (#81780)

homeassistant/components/airvisual/__init__.py

@@ -7,13 +7,9 @@
 from typing import Any
 
 from pyairvisual import CloudAPI, NodeSamba
-from pyairvisual.errors import (
-    AirVisualError,
-    InvalidKeyError,
-    KeyExpiredError,
-    NodeProError,
-    UnauthorizedError,
-)
+from pyairvisual.cloud_api import InvalidKeyError, KeyExpiredError, UnauthorizedError
+from pyairvisual.errors import AirVisualError
+from pyairvisual.node import NodeProError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (

homeassistant/components/airvisual/config_flow.py

@@ -6,14 +6,14 @@
 from typing import Any
 
 from pyairvisual import CloudAPI, NodeSamba
-from pyairvisual.errors import (
-    AirVisualError,
+from pyairvisual.cloud_api import (
     InvalidKeyError,
     KeyExpiredError,
-    NodeProError,
     NotFoundError,
     UnauthorizedError,
 )
+from pyairvisual.errors import AirVisualError
+from pyairvisual.node import NodeProError
 import voluptuous as vol
 
 from homeassistant import config_entries

homeassistant/components/airvisual/manifest.json

@@ -3,7 +3,7 @@
   "name": "AirVisual",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airvisual",
-  "requirements": ["pyairvisual==2022.07.0"],
+  "requirements": ["pyairvisual==2022.11.1"],
   "codeowners": ["@bachya"],
   "iot_class": "cloud_polling",
   "loggers": ["pyairvisual", "pysmb"],

homeassistant/components/bluetooth/manifest.json

@@ -6,9 +6,9 @@
   "after_dependencies": ["hassio"],
   "quality_scale": "internal",
   "requirements": [
-    "bleak==0.19.1",
-    "bleak-retry-connector==2.8.2",
-    "bluetooth-adapters==0.6.0",
+    "bleak==0.19.2",
+    "bleak-retry-connector==2.8.3",
+    "bluetooth-adapters==0.7.0",
     "bluetooth-auto-recovery==0.3.6",
     "dbus-fast==1.61.1"
   ],

homeassistant/components/braviatv/config_flow.py

@@ -262,7 +262,11 @@ async def async_step_init(
             self.config_entry.entry_id
         ]
 
-        await coordinator.async_update_sources()
+        try:
+            await coordinator.async_update_sources()
+        except BraviaTVError:
+            return self.async_abort(reason="failed_update")
+
         sources = coordinator.source_map.values()
         self.source_list = [item["title"] for item in sources]
         return await self.async_step_user()

homeassistant/components/braviatv/strings.json

@@ -48,6 +48,9 @@
           "ignored_sources": "List of ignored sources"
         }
       }
+    },
+    "abort": {
+      "failed_update": "An error occurred while updating the list of sources.\n\n Ensure that your TV is turned on before trying to set it up."
     }
   }
 }

homeassistant/components/braviatv/translations/en.json

@@ -41,6 +41,9 @@
         }
     },
     "options": {
+        "abort": {
+            "failed_update": "An error occurred while updating the list of sources.\n\n Ensure that your TV is turned on before trying to set it up."
+        },
         "step": {
             "user": {
                 "data": {

homeassistant/components/deconz/sensor.py

@@ -89,6 +89,7 @@
 class DeconzSensorDescriptionMixin(Generic[T]):
     """Required values when describing secondary sensor attributes."""
 
+    supported_fn: Callable[[T], bool]
     update_key: str
     value_fn: Callable[[T], datetime | StateType]
 
@@ -105,13 +106,15 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
 ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
     DeconzSensorDescription[AirQuality](
         key="air_quality",
+        supported_fn=lambda device: device.air_quality is not None,
         update_key="airquality",
         value_fn=lambda device: device.air_quality,
         instance_check=AirQuality,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     DeconzSensorDescription[AirQuality](
         key="air_quality_ppb",
+        supported_fn=lambda device: device.air_quality_ppb is not None,
         update_key="airqualityppb",
         value_fn=lambda device: device.air_quality_ppb,
         instance_check=AirQuality,
@@ -122,6 +125,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Consumption](
         key="consumption",
+        supported_fn=lambda device: device.consumption is not None,
         update_key="consumption",
         value_fn=lambda device: device.scaled_consumption,
         instance_check=Consumption,
@@ -131,6 +135,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Daylight](
         key="daylight_status",
+        supported_fn=lambda device: True,
         update_key="status",
         value_fn=lambda device: DAYLIGHT_STATUS[device.daylight_status],
         instance_check=Daylight,
@@ -139,12 +144,14 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[GenericStatus](
         key="status",
+        supported_fn=lambda device: device.status is not None,
         update_key="status",
         value_fn=lambda device: device.status,
         instance_check=GenericStatus,
     ),
     DeconzSensorDescription[Humidity](
         key="humidity",
+        supported_fn=lambda device: device.humidity is not None,
         update_key="humidity",
         value_fn=lambda device: device.scaled_humidity,
         instance_check=Humidity,
@@ -154,6 +161,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[LightLevel](
         key="light_level",
+        supported_fn=lambda device: device.light_level is not None,
         update_key="lightlevel",
         value_fn=lambda device: device.scaled_light_level,
         instance_check=LightLevel,
@@ -163,6 +171,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Power](
         key="power",
+        supported_fn=lambda device: device.power is not None,
         update_key="power",
         value_fn=lambda device: device.power,
         instance_check=Power,
@@ -172,6 +181,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Pressure](
         key="pressure",
+        supported_fn=lambda device: device.pressure is not None,
         update_key="pressure",
         value_fn=lambda device: device.pressure,
         instance_check=Pressure,
@@ -181,6 +191,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Temperature](
         key="temperature",
+        supported_fn=lambda device: device.temperature is not None,
         update_key="temperature",
         value_fn=lambda device: device.scaled_temperature,
         instance_check=Temperature,
@@ -190,13 +201,15 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[Time](
         key="last_set",
+        supported_fn=lambda device: device.last_set is not None,
         update_key="lastset",
         value_fn=lambda device: dt_util.parse_datetime(device.last_set),
         instance_check=Time,
         device_class=SensorDeviceClass.TIMESTAMP,
     ),
     DeconzSensorDescription[SensorResources](
         key="battery",
+        supported_fn=lambda device: device.battery is not None,
         update_key="battery",
         value_fn=lambda device: device.battery,
         name_suffix="Battery",
@@ -208,6 +221,7 @@ class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMi
     ),
     DeconzSensorDescription[SensorResources](
         key="internal_temperature",
+        supported_fn=lambda device: device.internal_temperature is not None,
         update_key="temperature",
         value_fn=lambda device: device.internal_temperature,
         name_suffix="Temperature",
@@ -268,7 +282,7 @@ def async_add_sensor(_: EventType, sensor_id: str) -> None:
                 continue
 
             no_sensor_data = False
-            if description.value_fn(sensor) is None:
+            if not description.supported_fn(sensor):
                 no_sensor_data = True
 
             if description.instance_check is None:

homeassistant/components/dlna_dmr/manifest.json

@@ -3,7 +3,7 @@
   "name": "DLNA Digital Media Renderer",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/dlna_dmr",
-  "requirements": ["async-upnp-client==0.32.1"],
+  "requirements": ["async-upnp-client==0.32.2"],
   "dependencies": ["ssdp"],
   "after_dependencies": ["media_source"],
   "ssdp": [

homeassistant/components/dlna_dms/manifest.json

@@ -3,7 +3,7 @@
   "name": "DLNA Digital Media Server",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/dlna_dms",
-  "requirements": ["async-upnp-client==0.32.1"],
+  "requirements": ["async-upnp-client==0.32.2"],
   "dependencies": ["ssdp"],
   "after_dependencies": ["media_source"],
   "ssdp": [

homeassistant/components/elkm1/__init__.py

@@ -7,11 +7,11 @@
 import re
 from types import MappingProxyType
 from typing import Any, cast
-from urllib.parse import urlparse
 
 import async_timeout
 from elkm1_lib.elements import Element
 from elkm1_lib.elk import Elk
+from elkm1_lib.util import parse_url
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
@@ -96,6 +96,11 @@
 )
 
 
+def hostname_from_url(url: str) -> str:
+    """Return the hostname from a url."""
+    return parse_url(url)[1]
+
+
 def _host_validator(config: dict[str, str]) -> dict[str, str]:
     """Validate that a host is properly configured."""
     if config[CONF_HOST].startswith("elks://"):
@@ -231,7 +236,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Elk-M1 Control from a config entry."""
     conf: MappingProxyType[str, Any] = entry.data
 
-    host = urlparse(entry.data[CONF_HOST]).hostname
+    host = hostname_from_url(entry.data[CONF_HOST])
 
     _LOGGER.debug("Setting up elkm1 %s", conf["host"])
 

homeassistant/components/elkm1/config_flow.py

@@ -4,7 +4,6 @@
 import asyncio
 import logging
 from typing import Any
-from urllib.parse import urlparse
 
 from elkm1_lib.discovery import ElkSystem
 from elkm1_lib.elk import Elk
@@ -26,7 +25,7 @@
 from homeassistant.util import slugify
 from homeassistant.util.network import is_ip_address
 
-from . import async_wait_for_elk_to_sync
+from . import async_wait_for_elk_to_sync, hostname_from_url
 from .const import CONF_AUTO_CONFIGURE, DISCOVER_SCAN_TIMEOUT, DOMAIN, LOGIN_TIMEOUT
 from .discovery import (
     _short_mac,
@@ -170,7 +169,7 @@ async def _async_handle_discovery(self) -> FlowResult:
         for entry in self._async_current_entries(include_ignore=False):
             if (
                 entry.unique_id == mac
-                or urlparse(entry.data[CONF_HOST]).hostname == host
+                or hostname_from_url(entry.data[CONF_HOST]) == host
             ):
                 if async_update_entry_from_discovery(self.hass, entry, device):
                     self.hass.async_create_task(
@@ -214,7 +213,7 @@ async def async_step_user(
 
         current_unique_ids = self._async_current_ids()
         current_hosts = {
-            urlparse(entry.data[CONF_HOST]).hostname
+            hostname_from_url(entry.data[CONF_HOST])
             for entry in self._async_current_entries(include_ignore=False)
         }
         discovered_devices = await async_discover_devices(
@@ -344,7 +343,7 @@ async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
         if self._url_already_configured(url):
             return self.async_abort(reason="address_already_configured")
 
-        host = urlparse(url).hostname
+        host = hostname_from_url(url)
         _LOGGER.debug(
             "Importing is trying to fill unique id from discovery for %s", host
         )
@@ -367,10 +366,10 @@ async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
     def _url_already_configured(self, url: str) -> bool:
         """See if we already have a elkm1 matching user input configured."""
         existing_hosts = {
-            urlparse(entry.data[CONF_HOST]).hostname
+            hostname_from_url(entry.data[CONF_HOST])
             for entry in self._async_current_entries()
         }
-        return urlparse(url).hostname in existing_hosts
+        return hostname_from_url(url) in existing_hosts
 
 
 class InvalidAuth(exceptions.HomeAssistantError):

homeassistant/components/esphome/bluetooth/client.py

@@ -137,6 +137,7 @@ def _async_ble_device_disconnected(self) -> None:
         was_connected = self._is_connected
         self.services = BleakGATTServiceCollection()  # type: ignore[no-untyped-call]
         self._is_connected = False
+        self._notify_cancels.clear()
         if self._disconnected_event:
             self._disconnected_event.set()
             self._disconnected_event = None
@@ -463,12 +464,20 @@ def callback(sender: int, data: bytearray):
                 UUID or directly by the BleakGATTCharacteristic object representing it.
             callback (function): The function to be called on notification.
         """
+        ble_handle = characteristic.handle
+        if ble_handle in self._notify_cancels:
+            raise BleakError(
+                "Notifications are already enabled on "
+                f"service:{characteristic.service_uuid} "
+                f"characteristic:{characteristic.uuid} "
+                f"handle:{ble_handle}"
+            )
         cancel_coro = await self._client.bluetooth_gatt_start_notify(
             self._address_as_int,
-            characteristic.handle,
+            ble_handle,
             lambda handle, data: callback(data),
         )
-        self._notify_cancels[characteristic.handle] = cancel_coro
+        self._notify_cancels[ble_handle] = cancel_coro
 
     @api_error_as_bleak_error
     async def stop_notify(
@@ -483,5 +492,7 @@ async def stop_notify(
                 directly by the BleakGATTCharacteristic object representing it.
         """
         characteristic = self._resolve_characteristic(char_specifier)
-        coro = self._notify_cancels.pop(characteristic.handle)
-        await coro()
+        # Do not raise KeyError if notifications are not enabled on this characteristic
+        # to be consistent with the behavior of the BlueZ backend
+        if coro := self._notify_cancels.pop(characteristic.handle, None):
+            await coro()

homeassistant/components/esphome/manifest.json

@@ -3,7 +3,7 @@
   "name": "ESPHome",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/esphome",
-  "requirements": ["aioesphomeapi==11.4.2"],
+  "requirements": ["aioesphomeapi==11.4.3"],
   "zeroconf": ["_esphomelib._tcp.local."],
   "dhcp": [{ "registered_devices": true }],
   "codeowners": ["@OttoWinter", "@jesserockz"],

homeassistant/components/frontend/manifest.json

@@ -2,7 +2,7 @@
   "domain": "frontend",
   "name": "Home Assistant Frontend",
   "documentation": "https://www.home-assistant.io/integrations/frontend",
-  "requirements": ["home-assistant-frontend==20221102.1"],
+  "requirements": ["home-assistant-frontend==20221108.0"],
   "dependencies": [
     "api",
     "auth",