From 096e814929ebd05017a05685e191feb7bab6494e Mon Sep 17 00:00:00 2001
From: mkmer <m_kasper@sbcglobal.net>
Date: Thu, 6 Apr 2023 04:44:13 -0400
Subject: [PATCH 01/27] Handle Uncaught exceptions in async_update Honeywell
 (#90746)

---
 homeassistant/components/honeywell/climate.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/honeywell/climate.py b/homeassistant/components/honeywell/climate.py
index e9dae1e2074..bde70e6bb0c 100644
--- a/homeassistant/components/honeywell/climate.py
+++ b/homeassistant/components/honeywell/climate.py
@@ -1,9 +1,11 @@
 """Support for Honeywell (US) Total Connect Comfort climate systems."""
 from __future__ import annotations
 
+import asyncio
 import datetime
 from typing import Any
 
+from aiohttp import ClientConnectionError
 import aiosomecomfort
 
 from homeassistant.components.climate import (
@@ -421,10 +423,7 @@ class HoneywellUSThermostat(ClimateEntity):
         try:
             await self._device.refresh()
             self._attr_available = True
-        except (
-            aiosomecomfort.SomeComfortError,
-            OSError,
-        ):
+        except aiosomecomfort.SomeComfortError:
             try:
                 await self._data.client.login()
 
@@ -433,5 +432,12 @@ class HoneywellUSThermostat(ClimateEntity):
                 await self.hass.async_create_task(
                     self.hass.config_entries.async_reload(self._data.entry_id)
                 )
-            except aiosomecomfort.SomeComfortError:
+            except (
+                aiosomecomfort.SomeComfortError,
+                ClientConnectionError,
+                asyncio.TimeoutError,
+            ):
                 self._attr_available = False
+
+        except (ClientConnectionError, asyncio.TimeoutError):
+            self._attr_available = False

From 833b95722e5255091ec0b9f2d0ce0b44f3064579 Mon Sep 17 00:00:00 2001
From: saschaabraham <34794615+saschaabraham@users.noreply.github.com>
Date: Thu, 6 Apr 2023 10:31:43 +0200
Subject: [PATCH 02/27] Bump fritzconnection to 1.12.0 (#90799)

---
 homeassistant/components/fritz/manifest.json                | 2 +-
 homeassistant/components/fritzbox_callmonitor/manifest.json | 2 +-
 requirements_all.txt                                        | 2 +-
 requirements_test_all.txt                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json
index 1008426558f..b117218e23d 100644
--- a/homeassistant/components/fritz/manifest.json
+++ b/homeassistant/components/fritz/manifest.json
@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/fritz",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.11.0", "xmltodict==0.13.0"],
+  "requirements": ["fritzconnection==1.12.0", "xmltodict==0.13.0"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"
diff --git a/homeassistant/components/fritzbox_callmonitor/manifest.json b/homeassistant/components/fritzbox_callmonitor/manifest.json
index 9f1078b9b9d..cde955caa1e 100644
--- a/homeassistant/components/fritzbox_callmonitor/manifest.json
+++ b/homeassistant/components/fritzbox_callmonitor/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection==1.11.0"]
+  "requirements": ["fritzconnection==1.12.0"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index b92bf742c93..6738ca09cd1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -748,7 +748,7 @@ freesms==0.2.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.11.0
+fritzconnection==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6ce0b64e691..186cb7fb93f 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -570,7 +570,7 @@ freebox-api==1.1.0
 
 # homeassistant.components.fritz
 # homeassistant.components.fritzbox_callmonitor
-fritzconnection==1.11.0
+fritzconnection==1.12.0
 
 # homeassistant.components.google_translate
 gTTS==2.2.4

From 968a4e48185a108984544bd6f809b0456e6b23c9 Mon Sep 17 00:00:00 2001
From: Tom Harris <tomharris@harrisnj.net>
Date: Wed, 5 Apr 2023 20:53:44 -0400
Subject: [PATCH 03/27] Fix issue with Insteon All-Link Database loading
 (#90858)

Bump to 1.4.1
---
 homeassistant/components/insteon/manifest.json | 2 +-
 requirements_all.txt                           | 2 +-
 requirements_test_all.txt                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/insteon/manifest.json b/homeassistant/components/insteon/manifest.json
index af9396399af..d9c2380de0f 100644
--- a/homeassistant/components/insteon/manifest.json
+++ b/homeassistant/components/insteon/manifest.json
@@ -17,7 +17,7 @@
   "iot_class": "local_push",
   "loggers": ["pyinsteon", "pypubsub"],
   "requirements": [
-    "pyinsteon==1.4.0",
+    "pyinsteon==1.4.1",
     "insteon-frontend-home-assistant==0.3.4"
   ],
   "usb": [
diff --git a/requirements_all.txt b/requirements_all.txt
index 6738ca09cd1..56723565570 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1684,7 +1684,7 @@ pyialarm==2.2.0
 pyicloud==1.0.0
 
 # homeassistant.components.insteon
-pyinsteon==1.4.0
+pyinsteon==1.4.1
 
 # homeassistant.components.intesishome
 pyintesishome==1.8.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 186cb7fb93f..985a1c628f6 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1218,7 +1218,7 @@ pyialarm==2.2.0
 pyicloud==1.0.0
 
 # homeassistant.components.insteon
-pyinsteon==1.4.0
+pyinsteon==1.4.1
 
 # homeassistant.components.ipma
 pyipma==3.0.6

From c663d8754b2a44c2282c505ddddc262b78784ca3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 14:53:19 -1000
Subject: [PATCH 04/27] Generate a seperate log message per dumped object for
 profiler.dump_log_objects (#90867)

Since some objects are very large we can generate overly large log messages
```
Event data for system_log_event exceed maximum size of 32768 bytes. This can cause database performance issues; Event data will not be stored
```

Reported in https://ptb.discord.com/channels/330944238910963714/427516175237382144/1093069996101472306
---
 homeassistant/components/profiler/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py
index 95ce69aed4a..f558b7301c5 100644
--- a/homeassistant/components/profiler/__init__.py
+++ b/homeassistant/components/profiler/__init__.py
@@ -164,11 +164,12 @@ async def async_setup_entry(  # noqa: C901
 
         obj_type = call.data[CONF_TYPE]
 
-        _LOGGER.critical(
-            "%s objects in memory: %s",
-            obj_type,
-            [_safe_repr(obj) for obj in objgraph.by_type(obj_type)],
-        )
+        for obj in objgraph.by_type(obj_type):
+            _LOGGER.critical(
+                "%s object in memory: %s",
+                obj_type,
+                _safe_repr(obj),
+            )
 
         persistent_notification.create(
             hass,

From b4e2dd4e063549da5cdfe940e0dafc7cae17bdd9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 08:03:47 -1000
Subject: [PATCH 05/27] Add constraint for websockets to <11.0 (#90868)

---
 homeassistant/package_constraints.txt | 5 +++++
 script/gen_requirements_all.py        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 731b57e4cf6..a1867bef133 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -157,3 +157,8 @@ uamqp==1.6.0;python_version<'3.11'
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
 faust-cchardet>=2.1.18
+
+# websockets 11.0 is missing files in the source distribution
+# which break wheel builds
+# https://github.com/aaugustin/websockets/issues/1329
+websockets<11.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 564d0e2eb00..b31674d04e8 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -162,6 +162,11 @@ uamqp==1.6.0;python_version<'3.11'
 # faust-cchardet: Ensure we have a version we can build wheels
 # 2.1.18 is the first version that works with our wheel builder
 faust-cchardet>=2.1.18
+
+# websockets 11.0 is missing files in the source distribution
+# which break wheel builds
+# https://github.com/aaugustin/websockets/issues/1329
+websockets<11.0
 """
 
 IGNORE_PRE_COMMIT_HOOK_ID = (

From c8ee45b53ca1a048fcb6e36a20318d1d0c7d0d6a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 14:46:56 -1000
Subject: [PATCH 06/27] Add MariaDB deadlock retry wrapper to database
 timestamp column migrations (#90880)

Add deadlock retry wrapper to timestamp column migrations

fixes #90819
---
 homeassistant/components/recorder/migration.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/recorder/migration.py b/homeassistant/components/recorder/migration.py
index 23382a9aeb3..7fee3d16e8d 100644
--- a/homeassistant/components/recorder/migration.py
+++ b/homeassistant/components/recorder/migration.py
@@ -913,7 +913,7 @@ def _apply_update(  # noqa: C901
         _create_index(session_maker, "events", "ix_events_event_type_time_fired_ts")
         _create_index(session_maker, "states", "ix_states_entity_id_last_updated_ts")
         _create_index(session_maker, "states", "ix_states_last_updated_ts")
-        _migrate_columns_to_timestamp(session_maker, engine)
+        _migrate_columns_to_timestamp(instance, session_maker, engine)
     elif new_version == 32:
         # Migration is done in two steps to ensure we can start using
         # the new columns before we wipe the old ones.
@@ -966,7 +966,7 @@ def _apply_update(  # noqa: C901
             "ix_statistics_short_term_statistic_id_start_ts",
         )
         try:
-            _migrate_statistics_columns_to_timestamp(session_maker, engine)
+            _migrate_statistics_columns_to_timestamp(instance, session_maker, engine)
         except IntegrityError as ex:
             _LOGGER.error(
                 "Statistics table contains duplicate entries: %s; "
@@ -979,7 +979,7 @@ def _apply_update(  # noqa: C901
             # and try again
             with session_scope(session=session_maker()) as session:
                 delete_statistics_duplicates(instance, hass, session)
-            _migrate_statistics_columns_to_timestamp(session_maker, engine)
+            _migrate_statistics_columns_to_timestamp(instance, session_maker, engine)
             # Log at error level to ensure the user sees this message in the log
             # since we logged the error above.
             _LOGGER.error(
@@ -1195,8 +1195,9 @@ def _wipe_old_string_time_columns(
         session.commit()
 
 
+@database_job_retry_wrapper("Migrate columns to timestamp", 3)
 def _migrate_columns_to_timestamp(
-    session_maker: Callable[[], Session], engine: Engine
+    instance: Recorder, session_maker: Callable[[], Session], engine: Engine
 ) -> None:
     """Migrate columns to use timestamp."""
     # Migrate all data in Events.time_fired to Events.time_fired_ts
@@ -1283,8 +1284,9 @@ def _migrate_columns_to_timestamp(
                 )
 
 
+@database_job_retry_wrapper("Migrate statistics columns to timestamp", 3)
 def _migrate_statistics_columns_to_timestamp(
-    session_maker: Callable[[], Session], engine: Engine
+    instance: Recorder, session_maker: Callable[[], Session], engine: Engine
 ) -> None:
     """Migrate statistics columns to use timestamp."""
     # Migrate all data in statistics.start to statistics.start_ts

From f341d0787e4626092b4d19547f633776aabb9287 Mon Sep 17 00:00:00 2001
From: Michael <35783820+mib1185@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:52:37 +0200
Subject: [PATCH 07/27] Migrate entity unique ids in PI-Hole (#90883)

* migrate entity unique ids

* Update homeassistant/components/pi_hole/__init__.py

---------

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
---
 homeassistant/components/pi_hole/__init__.py | 36 ++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/pi_hole/__init__.py b/homeassistant/components/pi_hole/__init__.py
index 49f1697adc6..96cdd7ab105 100644
--- a/homeassistant/components/pi_hole/__init__.py
+++ b/homeassistant/components/pi_hole/__init__.py
@@ -16,9 +16,9 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
     Platform,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import (
@@ -64,6 +64,38 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     _LOGGER.debug("Setting up %s integration with host %s", DOMAIN, host)
 
+    name_to_key = {
+        "Core Update Available": "core_update_available",
+        "Web Update Available": "web_update_available",
+        "FTL Update Available": "ftl_update_available",
+        "Status": "status",
+        "Ads Blocked Today": "ads_blocked_today",
+        "Ads Percentage Blocked Today": "ads_percentage_today",
+        "Seen Clients": "clients_ever_seen",
+        "DNS Queries Today": "dns_queries_today",
+        "Domains Blocked": "domains_being_blocked",
+        "DNS Queries Cached": "queries_cached",
+        "DNS Queries Forwarded": "queries_forwarded",
+        "DNS Unique Clients": "unique_clients",
+        "DNS Unique Domains": "unique_domains",
+    }
+
+    @callback
+    def update_unique_id(
+        entity_entry: er.RegistryEntry,
+    ) -> dict[str, str] | None:
+        """Update unique ID of entity entry."""
+        unique_id_parts = entity_entry.unique_id.split("/")
+        if len(unique_id_parts) == 2 and unique_id_parts[1] in name_to_key:
+            name = unique_id_parts[1]
+            new_unique_id = entity_entry.unique_id.replace(name, name_to_key[name])
+            _LOGGER.debug("Migrate %s to %s", entity_entry.unique_id, new_unique_id)
+            return {"new_unique_id": new_unique_id}
+
+        return None
+
+    await er.async_migrate_entries(hass, entry.entry_id, update_unique_id)
+
     session = async_get_clientsession(hass, verify_tls)
     api = Hole(
         host,

From 513a13f36907b669793712b4710c265efe985caa Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 22:33:00 -1000
Subject: [PATCH 08/27] Fix missing bluetooth client wrapper in
 bleak_retry_connector (#90885)

---
 homeassistant/components/bluetooth/usage.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/bluetooth/usage.py b/homeassistant/components/bluetooth/usage.py
index b751559e7a4..d89f0b5b684 100644
--- a/homeassistant/components/bluetooth/usage.py
+++ b/homeassistant/components/bluetooth/usage.py
@@ -10,9 +10,10 @@ from .wrappers import HaBleakClientWrapper, HaBleakScannerWrapper
 
 ORIGINAL_BLEAK_SCANNER = bleak.BleakScanner
 ORIGINAL_BLEAK_CLIENT = bleak.BleakClient
-ORIGINAL_BLEAK_RETRY_CONNECTOR_CLIENT = (
+ORIGINAL_BLEAK_RETRY_CONNECTOR_CLIENT_WITH_SERVICE_CACHE = (
     bleak_retry_connector.BleakClientWithServiceCache
 )
+ORIGINAL_BLEAK_RETRY_CONNECTOR_CLIENT = bleak_retry_connector.BleakClient
 
 
 def install_multiple_bleak_catcher() -> None:
@@ -23,6 +24,7 @@ def install_multiple_bleak_catcher() -> None:
     bleak.BleakScanner = HaBleakScannerWrapper  # type: ignore[misc, assignment]
     bleak.BleakClient = HaBleakClientWrapper  # type: ignore[misc]
     bleak_retry_connector.BleakClientWithServiceCache = HaBleakClientWithServiceCache  # type: ignore[misc,assignment] # noqa: E501
+    bleak_retry_connector.BleakClient = HaBleakClientWrapper  # type: ignore[misc] # noqa: E501
 
 
 def uninstall_multiple_bleak_catcher() -> None:
@@ -30,6 +32,9 @@ def uninstall_multiple_bleak_catcher() -> None:
     bleak.BleakScanner = ORIGINAL_BLEAK_SCANNER  # type: ignore[misc]
     bleak.BleakClient = ORIGINAL_BLEAK_CLIENT  # type: ignore[misc]
     bleak_retry_connector.BleakClientWithServiceCache = (  # type: ignore[misc]
+        ORIGINAL_BLEAK_RETRY_CONNECTOR_CLIENT_WITH_SERVICE_CACHE
+    )
+    bleak_retry_connector.BleakClient = (  # type: ignore[misc]
         ORIGINAL_BLEAK_RETRY_CONNECTOR_CLIENT
     )
 

From 42b7ed115fd8ebb0dd96827ce32e6e4766d93fa9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 16:19:43 -1000
Subject: [PATCH 09/27] Bump ulid-transform 0.6.0 (#90888)

* Bump ulid-transform 0.6.0

changelog: https://github.com/bdraco/ulid-transform/compare/v0.5.1...v0.6.0

to find the source of the invalid ulids in https://github.com/home-assistant/core/issues/90887
---
 homeassistant/package_constraints.txt | 2 +-
 pyproject.toml                        | 2 +-
 requirements.txt                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index a1867bef133..69f46be2fac 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -46,7 +46,7 @@ requests==2.28.2
 scapy==2.5.0
 sqlalchemy==2.0.7
 typing-extensions>=4.5.0,<5.0
-ulid-transform==0.5.1
+ulid-transform==0.6.0
 voluptuous-serialize==2.6.0
 voluptuous==0.13.1
 yarl==1.8.1
diff --git a/pyproject.toml b/pyproject.toml
index fecbea62be9..36e36872bcc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,7 @@ dependencies    = [
     "pyyaml==6.0",
     "requests==2.28.2",
     "typing-extensions>=4.5.0,<5.0",
-    "ulid-transform==0.5.1",
+    "ulid-transform==0.6.0",
     "voluptuous==0.13.1",
     "voluptuous-serialize==2.6.0",
     "yarl==1.8.1",
diff --git a/requirements.txt b/requirements.txt
index 84726cb49d9..43bb2d6d37c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,7 +24,7 @@ python-slugify==4.0.1
 pyyaml==6.0
 requests==2.28.2
 typing-extensions>=4.5.0,<5.0
-ulid-transform==0.5.1
+ulid-transform==0.6.0
 voluptuous==0.13.1
 voluptuous-serialize==2.6.0
 yarl==1.8.1

From 0b3012071e5dc722c733f542f32f4bbfc33263f6 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 22:34:54 -1000
Subject: [PATCH 10/27] Guard against invalid ULIDs in contexts while recording
 events (#90889)

---
 .../components/recorder/models/context.py     | 17 ++++++++++--
 tests/components/recorder/test_init.py        | 27 ++++++++++++++++++-
 tests/components/recorder/test_models.py      | 26 ++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/recorder/models/context.py b/homeassistant/components/recorder/models/context.py
index dbd9383bdeb..f722c519833 100644
--- a/homeassistant/components/recorder/models/context.py
+++ b/homeassistant/components/recorder/models/context.py
@@ -3,23 +3,36 @@ from __future__ import annotations
 
 from contextlib import suppress
 from functools import lru_cache
+import logging
 from uuid import UUID
 
 from homeassistant.util.ulid import bytes_to_ulid, ulid_to_bytes
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def ulid_to_bytes_or_none(ulid: str | None) -> bytes | None:
     """Convert an ulid to bytes."""
     if ulid is None:
         return None
-    return ulid_to_bytes(ulid)
+    try:
+        return ulid_to_bytes(ulid)
+    except ValueError as ex:
+        _LOGGER.error("Error converting ulid %s to bytes: %s", ulid, ex, exc_info=True)
+        return None
 
 
 def bytes_to_ulid_or_none(_bytes: bytes | None) -> str | None:
     """Convert bytes to a ulid."""
     if _bytes is None:
         return None
-    return bytes_to_ulid(_bytes)
+    try:
+        return bytes_to_ulid(_bytes)
+    except ValueError as ex:
+        _LOGGER.error(
+            "Error converting bytes %s to ulid: %s", _bytes, ex, exc_info=True
+        )
+        return None
 
 
 @lru_cache(maxsize=16)
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index 2bad346b937..337aced4880 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -66,7 +66,7 @@ from homeassistant.const import (
     STATE_LOCKED,
     STATE_UNLOCKED,
 )
-from homeassistant.core import CoreState, Event, HomeAssistant, callback
+from homeassistant.core import Context, CoreState, Event, HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er, recorder as recorder_helper
 from homeassistant.setup import async_setup_component, setup_component
 from homeassistant.util import dt as dt_util
@@ -854,6 +854,31 @@ def test_saving_event_with_oversized_data(
     assert json_loads(events["test_event_too_big"]) == {}
 
 
+def test_saving_event_invalid_context_ulid(
+    hass_recorder: Callable[..., HomeAssistant], caplog: pytest.LogCaptureFixture
+) -> None:
+    """Test we handle invalid manually injected context ids."""
+    hass = hass_recorder()
+    event_data = {"test_attr": 5, "test_attr_10": "nice"}
+    hass.bus.fire("test_event", event_data, context=Context(id="invalid"))
+    wait_recording_done(hass)
+    events = {}
+
+    with session_scope(hass=hass) as session:
+        for _, data, event_type in (
+            session.query(Events.event_id, EventData.shared_data, EventTypes.event_type)
+            .outerjoin(EventData, Events.data_id == EventData.data_id)
+            .outerjoin(EventTypes, Events.event_type_id == EventTypes.event_type_id)
+            .where(EventTypes.event_type.in_(["test_event"]))
+        ):
+            events[event_type] = data
+
+    assert "invalid" in caplog.text
+
+    assert len(events) == 1
+    assert json_loads(events["test_event"]) == event_data
+
+
 def test_recorder_setup_failure(hass: HomeAssistant) -> None:
     """Test some exceptions."""
     recorder_helper.async_initialize_recorder(hass)
diff --git a/tests/components/recorder/test_models.py b/tests/components/recorder/test_models.py
index df8ffa0d348..f1162815b9e 100644
--- a/tests/components/recorder/test_models.py
+++ b/tests/components/recorder/test_models.py
@@ -14,9 +14,11 @@ from homeassistant.components.recorder.db_schema import (
 )
 from homeassistant.components.recorder.models import (
     LazyState,
+    bytes_to_ulid_or_none,
     process_datetime_to_timestamp,
     process_timestamp,
     process_timestamp_to_utc_isoformat,
+    ulid_to_bytes_or_none,
 )
 from homeassistant.const import EVENT_STATE_CHANGED
 import homeassistant.core as ha
@@ -415,3 +417,27 @@ async def test_process_datetime_to_timestamp_mirrors_utc_isoformat_behavior(
         process_datetime_to_timestamp(datetime_hst_timezone)
         == dt_util.parse_datetime("2016-07-09T21:00:00+00:00").timestamp()
     )
+
+
+def test_ulid_to_bytes_or_none(caplog: pytest.LogCaptureFixture) -> None:
+    """Test ulid_to_bytes_or_none."""
+
+    assert (
+        ulid_to_bytes_or_none("01EYQZJXZ5Z1Z1Z1Z1Z1Z1Z1Z1")
+        == b"\x01w\xaf\xf9w\xe5\xf8~\x1f\x87\xe1\xf8~\x1f\x87\xe1"
+    )
+    assert ulid_to_bytes_or_none("invalid") is None
+    assert "invalid" in caplog.text
+    assert ulid_to_bytes_or_none(None) is None
+
+
+def test_bytes_to_ulid_or_none(caplog: pytest.LogCaptureFixture) -> None:
+    """Test bytes_to_ulid_or_none."""
+
+    assert (
+        bytes_to_ulid_or_none(b"\x01w\xaf\xf9w\xe5\xf8~\x1f\x87\xe1\xf8~\x1f\x87\xe1")
+        == "01EYQZJXZ5Z1Z1Z1Z1Z1Z1Z1Z1"
+    )
+    assert bytes_to_ulid_or_none(b"invalid") is None
+    assert "invalid" in caplog.text
+    assert bytes_to_ulid_or_none(None) is None

From 70d1e733f6be4bcee90372e8cf3649c7a85cd95c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 22:34:13 -1000
Subject: [PATCH 11/27] Fix entity_id migration query failing with MySQL 8.0.30
 (#90895)

---
 homeassistant/components/recorder/queries.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/recorder/queries.py b/homeassistant/components/recorder/queries.py
index f983224e212..454c71f6dc5 100644
--- a/homeassistant/components/recorder/queries.py
+++ b/homeassistant/components/recorder/queries.py
@@ -730,7 +730,8 @@ def batch_cleanup_entity_ids() -> StatementLambdaElement:
         lambda: update(States)
         .where(
             States.state_id.in_(
-                select(States.state_id).join(
+                select(States.state_id)
+                .join(
                     states_with_entity_ids := select(
                         States.state_id.label("state_id_with_entity_id")
                     )
@@ -739,6 +740,8 @@ def batch_cleanup_entity_ids() -> StatementLambdaElement:
                     .subquery(),
                     States.state_id == states_with_entity_ids.c.state_id_with_entity_id,
                 )
+                .alias("states_with_entity_ids")
+                .select()
             )
         )
         .values(entity_id=None)

From cb06541fda0ead3a0c845468e927a6e94e0fa60d Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Thu, 6 Apr 2023 02:32:35 -0600
Subject: [PATCH 12/27] Bump `simplisafe-python` to 2023.04.0 (#90896)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 homeassistant/components/simplisafe/manifest.json | 2 +-
 requirements_all.txt                              | 2 +-
 requirements_test_all.txt                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/simplisafe/manifest.json b/homeassistant/components/simplisafe/manifest.json
index 9a5a391240a..184e1f306e0 100644
--- a/homeassistant/components/simplisafe/manifest.json
+++ b/homeassistant/components/simplisafe/manifest.json
@@ -13,5 +13,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["simplipy"],
-  "requirements": ["simplisafe-python==2022.12.0"]
+  "requirements": ["simplisafe-python==2023.04.0"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 56723565570..f58036f2c7e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2343,7 +2343,7 @@ simplehound==0.3
 simplepush==2.1.1
 
 # homeassistant.components.simplisafe
-simplisafe-python==2022.12.0
+simplisafe-python==2023.04.0
 
 # homeassistant.components.sisyphus
 sisyphus-control==3.1.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 985a1c628f6..3bf69ae4935 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1670,7 +1670,7 @@ simplehound==0.3
 simplepush==2.1.1
 
 # homeassistant.components.simplisafe
-simplisafe-python==2022.12.0
+simplisafe-python==2023.04.0
 
 # homeassistant.components.slack
 slackclient==2.5.0

From 849000d5ac43db7d16f8f413fbb8eddc3ce96f86 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 5 Apr 2023 22:30:29 -1000
Subject: [PATCH 13/27] Bump aiodiscover to 1.4.16 (#90903)

---
 homeassistant/components/dhcp/manifest.json | 2 +-
 homeassistant/package_constraints.txt       | 2 +-
 requirements_all.txt                        | 2 +-
 requirements_test_all.txt                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/dhcp/manifest.json b/homeassistant/components/dhcp/manifest.json
index 2e1d758746d..e65966fbaa2 100644
--- a/homeassistant/components/dhcp/manifest.json
+++ b/homeassistant/components/dhcp/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_push",
   "loggers": ["aiodiscover", "dnspython", "pyroute2", "scapy"],
   "quality_scale": "internal",
-  "requirements": ["scapy==2.5.0", "aiodiscover==1.4.15"]
+  "requirements": ["scapy==2.5.0", "aiodiscover==1.4.16"]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 69f46be2fac..8d8f65b584b 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,7 +1,7 @@
 PyJWT==2.6.0
 PyNaCl==1.5.0
 PyTurboJPEG==1.6.7
-aiodiscover==1.4.15
+aiodiscover==1.4.16
 aiohttp==3.8.4
 aiohttp_cors==0.7.0
 astral==2.2
diff --git a/requirements_all.txt b/requirements_all.txt
index f58036f2c7e..affc7c8156d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -137,7 +137,7 @@ aiobafi6==0.8.0
 aiobotocore==2.1.0
 
 # homeassistant.components.dhcp
-aiodiscover==1.4.15
+aiodiscover==1.4.16
 
 # homeassistant.components.dnsip
 # homeassistant.components.minecraft_server
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 3bf69ae4935..98584ae7d3e 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -127,7 +127,7 @@ aiobafi6==0.8.0
 aiobotocore==2.1.0
 
 # homeassistant.components.dhcp
-aiodiscover==1.4.15
+aiodiscover==1.4.16
 
 # homeassistant.components.dnsip
 # homeassistant.components.minecraft_server

From e25edea815ed24567685c4b159fbf34b754befdd Mon Sep 17 00:00:00 2001
From: stickpin <630000+stickpin@users.noreply.github.com>
Date: Thu, 6 Apr 2023 10:38:09 +0200
Subject: [PATCH 14/27] Return empty available programs list if an appliance is
 off during initial configuration (#90905)

---
 homeassistant/components/home_connect/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/home_connect/api.py b/homeassistant/components/home_connect/api.py
index 85d8abd1cba..d0464968d4e 100644
--- a/homeassistant/components/home_connect/api.py
+++ b/homeassistant/components/home_connect/api.py
@@ -151,7 +151,7 @@ class DeviceWithPrograms(HomeConnectDevice):
             programs_available = self.appliance.get_programs_available()
         except (HomeConnectError, ValueError):
             _LOGGER.debug("Unable to fetch available programs. Probably offline")
-            programs_available = None
+            programs_available = []
         return programs_available
 
     def get_program_switches(self):

From 9b2e26c27092ed6d0aef7f2bd73e8acb1b32df16 Mon Sep 17 00:00:00 2001
From: Pascal Reeb <pascal@reeb.io>
Date: Thu, 6 Apr 2023 13:51:37 +0200
Subject: [PATCH 15/27] Handle NoURLAvailableError in Nuki component (#90927)

* fix(nuki): handle NoURLAvailableError

* only try internal URLs
---
 homeassistant/components/nuki/__init__.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/nuki/__init__.py b/homeassistant/components/nuki/__init__.py
index ee8cc4e7e97..ef168374bd8 100644
--- a/homeassistant/components/nuki/__init__.py
+++ b/homeassistant/components/nuki/__init__.py
@@ -31,7 +31,7 @@ from homeassistant.helpers import (
     entity_registry as er,
     issue_registry as ir,
 )
-from homeassistant.helpers.network import get_url
+from homeassistant.helpers.network import NoURLAvailableError, get_url
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -152,9 +152,22 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
     webhook_url = webhook.async_generate_path(entry.entry_id)
-    hass_url = get_url(
-        hass, allow_cloud=False, allow_external=False, allow_ip=True, require_ssl=False
-    )
+
+    try:
+        hass_url = get_url(
+            hass,
+            allow_cloud=False,
+            allow_external=False,
+            allow_ip=True,
+            require_ssl=False,
+        )
+    except NoURLAvailableError:
+        webhook.async_unregister(hass, entry.entry_id)
+        raise ConfigEntryNotReady(
+            f"Error registering URL for webhook {entry.entry_id}: "
+            "HomeAssistant URL is not available"
+        ) from None
+
     url = f"{hass_url}{webhook_url}"
 
     if hass_url.startswith("https"):

From f5be60038326a1830996fa68d261bb3484406cb9 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 6 Apr 2023 19:08:52 +0200
Subject: [PATCH 16/27] Update frontend to 20230406.1 (#90951)

---
 homeassistant/components/frontend/manifest.json | 2 +-
 homeassistant/package_constraints.txt           | 2 +-
 requirements_all.txt                            | 2 +-
 requirements_test_all.txt                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 8417870eb0a..b1fd062032f 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20230405.0"]
+  "requirements": ["home-assistant-frontend==20230406.1"]
 }
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 8d8f65b584b..89159448a71 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -25,7 +25,7 @@ ha-av==10.0.0
 hass-nabucasa==0.63.1
 hassil==1.0.6
 home-assistant-bluetooth==1.9.3
-home-assistant-frontend==20230405.0
+home-assistant-frontend==20230406.1
 home-assistant-intents==2023.3.29
 httpx==0.23.3
 ifaddr==0.1.7
diff --git a/requirements_all.txt b/requirements_all.txt
index affc7c8156d..96ace3d4527 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -907,7 +907,7 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230405.0
+home-assistant-frontend==20230406.1
 
 # homeassistant.components.conversation
 home-assistant-intents==2023.3.29
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 98584ae7d3e..f15598bb557 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -693,7 +693,7 @@ hole==0.8.0
 holidays==0.21.13
 
 # homeassistant.components.frontend
-home-assistant-frontend==20230405.0
+home-assistant-frontend==20230406.1
 
 # homeassistant.components.conversation
 home-assistant-intents==2023.3.29

From 5ffa0cba39100bedbe674c3ce2b72a5a56f6a216 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 6 Apr 2023 13:21:13 -0400
Subject: [PATCH 17/27] Bumped version to 2023.4.1

---
 homeassistant/const.py | 2 +-
 pyproject.toml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/homeassistant/const.py b/homeassistant/const.py
index 52a07324b7c..345a2a0a45f 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -8,7 +8,7 @@ from .backports.enum import StrEnum
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2023
 MINOR_VERSION: Final = 4
-PATCH_VERSION: Final = "0"
+PATCH_VERSION: Final = "1"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 10, 0)
diff --git a/pyproject.toml b/pyproject.toml
index 36e36872bcc..d3f7c2ef15b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2023.4.0"
+version     = "2023.4.1"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"

From d65791027fdeb98c377373e864aa243dc9673cbe Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 6 Apr 2023 18:51:02 +0200
Subject: [PATCH 18/27] Fix flaky test in vesync (#90921)

* Fix flaky test in vesync

* Move sorting to the test
---
 .../vesync/snapshots/test_diagnostics.ambr    | 46 +++++++++----------
 tests/components/vesync/test_diagnostics.py   |  3 ++
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/tests/components/vesync/snapshots/test_diagnostics.ambr b/tests/components/vesync/snapshots/test_diagnostics.ambr
index 33378d7ccde..2c12f9bc5f6 100644
--- a/tests/components/vesync/snapshots/test_diagnostics.ambr
+++ b/tests/components/vesync/snapshots/test_diagnostics.ambr
@@ -209,6 +209,29 @@
           }),
           'unit_of_measurement': None,
         }),
+        dict({
+          'device_class': None,
+          'disabled': False,
+          'disabled_by': None,
+          'domain': 'sensor',
+          'entity_category': None,
+          'entity_id': 'sensor.fan_air_quality',
+          'icon': None,
+          'name': None,
+          'original_device_class': None,
+          'original_icon': None,
+          'original_name': 'Fan Air Quality',
+          'state': dict({
+            'attributes': dict({
+              'friendly_name': 'Fan Air Quality',
+            }),
+            'entity_id': 'sensor.fan_air_quality',
+            'last_changed': str,
+            'last_updated': str,
+            'state': 'unavailable',
+          }),
+          'unit_of_measurement': None,
+        }),
         dict({
           'device_class': None,
           'disabled': False,
@@ -234,29 +257,6 @@
           }),
           'unit_of_measurement': '%',
         }),
-        dict({
-          'device_class': None,
-          'disabled': False,
-          'disabled_by': None,
-          'domain': 'sensor',
-          'entity_category': None,
-          'entity_id': 'sensor.fan_air_quality',
-          'icon': None,
-          'name': None,
-          'original_device_class': None,
-          'original_icon': None,
-          'original_name': 'Fan Air Quality',
-          'state': dict({
-            'attributes': dict({
-              'friendly_name': 'Fan Air Quality',
-            }),
-            'entity_id': 'sensor.fan_air_quality',
-            'last_changed': str,
-            'last_updated': str,
-            'state': 'unavailable',
-          }),
-          'unit_of_measurement': None,
-        }),
       ]),
       'name': 'Fan',
       'name_by_user': None,
diff --git a/tests/components/vesync/test_diagnostics.py b/tests/components/vesync/test_diagnostics.py
index eb802bb41b8..62365189064 100644
--- a/tests/components/vesync/test_diagnostics.py
+++ b/tests/components/vesync/test_diagnostics.py
@@ -85,6 +85,9 @@ async def test_async_get_device_diagnostics__single_fan(
     diag = await get_diagnostics_for_device(hass, hass_client, config_entry, device)
 
     assert isinstance(diag, dict)
+    diag["home_assistant"]["entities"] = sorted(
+        diag["home_assistant"]["entities"], key=lambda ent: ent["entity_id"]
+    )
     assert diag == snapshot(
         matcher=path_type(
             {

From a1c71593049688af581f7004ae6107ce13c15b24 Mon Sep 17 00:00:00 2001
From: Aaron Bach <bachya1208@gmail.com>
Date: Thu, 6 Apr 2023 12:33:41 -0600
Subject: [PATCH 19/27] Bump `aioambient` to 2022.10.0 (#90940)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 homeassistant/components/ambient_station/manifest.json | 2 +-
 requirements_all.txt                                   | 2 +-
 requirements_test_all.txt                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/ambient_station/manifest.json b/homeassistant/components/ambient_station/manifest.json
index bd07303df3e..9dbd4507774 100644
--- a/homeassistant/components/ambient_station/manifest.json
+++ b/homeassistant/components/ambient_station/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["aioambient"],
-  "requirements": ["aioambient==2021.11.0"]
+  "requirements": ["aioambient==2022.10.0"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 96ace3d4527..a70330dec63 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -119,7 +119,7 @@ aioairq==0.2.4
 aioairzone==0.5.2
 
 # homeassistant.components.ambient_station
-aioambient==2021.11.0
+aioambient==2022.10.0
 
 # homeassistant.components.aseko_pool_live
 aioaseko==0.0.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index f15598bb557..29ec27a274b 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -109,7 +109,7 @@ aioairq==0.2.4
 aioairzone==0.5.2
 
 # homeassistant.components.ambient_station
-aioambient==2021.11.0
+aioambient==2022.10.0
 
 # homeassistant.components.aseko_pool_live
 aioaseko==0.0.2

From 6884b0a421790897bd006f1a2a6dd717ad677801 Mon Sep 17 00:00:00 2001
From: starkillerOG <starkiller.og@gmail.com>
Date: Thu, 6 Apr 2023 20:35:22 +0200
Subject: [PATCH 20/27] Bump reolink-aio to 0.5.10 (#90963)

* use is_doorbell instead of is_doorbell_enabled

* Bump reolink-aio to 0.5.10
---
 homeassistant/components/reolink/binary_sensor.py | 2 +-
 homeassistant/components/reolink/manifest.json    | 2 +-
 requirements_all.txt                              | 2 +-
 requirements_test_all.txt                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/reolink/binary_sensor.py b/homeassistant/components/reolink/binary_sensor.py
index 1a7649f367a..850aa110171 100644
--- a/homeassistant/components/reolink/binary_sensor.py
+++ b/homeassistant/components/reolink/binary_sensor.py
@@ -87,7 +87,7 @@ BINARY_SENSORS = (
         icon="mdi:bell-ring-outline",
         icon_off="mdi:doorbell",
         value=lambda api, ch: api.visitor_detected(ch),
-        supported=lambda api, ch: api.is_doorbell_enabled(ch),
+        supported=lambda api, ch: api.is_doorbell(ch),
     ),
 )
 
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index b8de6cd8399..73318f12be1 100644
--- a/homeassistant/components/reolink/manifest.json
+++ b/homeassistant/components/reolink/manifest.json
@@ -18,5 +18,5 @@
   "documentation": "https://www.home-assistant.io/integrations/reolink",
   "iot_class": "local_push",
   "loggers": ["reolink_aio"],
-  "requirements": ["reolink-aio==0.5.9"]
+  "requirements": ["reolink-aio==0.5.10"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index a70330dec63..e00d154d7c8 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2231,7 +2231,7 @@ regenmaschine==2022.11.0
 renault-api==0.1.12
 
 # homeassistant.components.reolink
-reolink-aio==0.5.9
+reolink-aio==0.5.10
 
 # homeassistant.components.python_script
 restrictedpython==6.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 29ec27a274b..7d8564da8bc 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1594,7 +1594,7 @@ regenmaschine==2022.11.0
 renault-api==0.1.12
 
 # homeassistant.components.reolink
-reolink-aio==0.5.9
+reolink-aio==0.5.10
 
 # homeassistant.components.python_script
 restrictedpython==6.0

From 5e903e04cf5fcce4fd0d575416b9fe67e18849b8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 31 Mar 2023 06:23:05 -1000
Subject: [PATCH 21/27] Avoid writing state to all esphome entities at shutdown
 (#90555)

---
 homeassistant/components/esphome/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 192a19e480b..58659a671f0 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -349,7 +349,12 @@ async def async_setup_entry(  # noqa: C901
         # the next state update of that type when the device reconnects
         for state_keys in entry_data.state.values():
             state_keys.clear()
-        entry_data.async_update_device_state(hass)
+        if not hass.is_stopping:
+            # Avoid marking every esphome entity as unavailable on shutdown
+            # since it generates a lot of state changed events and database
+            # writes when we already know we're shutting down and the state
+            # will be cleared anyway.
+            entry_data.async_update_device_state(hass)
 
     async def on_connect_error(err: Exception) -> None:
         """Start reauth flow if appropriate connect error type."""

From c944be8215420ede2b502ef51a807ac1e106f21c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 6 Apr 2023 10:32:02 -1000
Subject: [PATCH 22/27] Fix state being cleared on disconnect with deep sleep
 esphome devices (#90925)

* Fix state being cleared on disconnect with deep sleep esphome devices

fixes #90923

* fix logic
---
 homeassistant/components/esphome/__init__.py   |  9 ++++++---
 homeassistant/components/esphome/entry_data.py | 10 ++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
index 58659a671f0..4658893d375 100644
--- a/homeassistant/components/esphome/__init__.py
+++ b/homeassistant/components/esphome/__init__.py
@@ -345,10 +345,13 @@ async def async_setup_entry(  # noqa: C901
             disconnect_cb()
         entry_data.disconnect_callbacks = []
         entry_data.available = False
-        # Clear out the states so that we will always dispatch
+        # Mark state as stale so that we will always dispatch
         # the next state update of that type when the device reconnects
-        for state_keys in entry_data.state.values():
-            state_keys.clear()
+        entry_data.stale_state = {
+            (type(entity_state), key)
+            for state_dict in entry_data.state.values()
+            for key, entity_state in state_dict.items()
+        }
         if not hass.is_stopping:
             # Avoid marking every esphome entity as unavailable on shutdown
             # since it generates a lot of state changed events and database
diff --git a/homeassistant/components/esphome/entry_data.py b/homeassistant/components/esphome/entry_data.py
index d7f25f319ac..7a6027f946b 100644
--- a/homeassistant/components/esphome/entry_data.py
+++ b/homeassistant/components/esphome/entry_data.py
@@ -70,6 +70,10 @@ class RuntimeEntryData:
     client: APIClient
     store: Store
     state: dict[type[EntityState], dict[int, EntityState]] = field(default_factory=dict)
+    # When the disconnect callback is called, we mark all states
+    # as stale so we will always dispatch a state update when the
+    # device reconnects. This is the same format as state_subscriptions.
+    stale_state: set[tuple[type[EntityState], int]] = field(default_factory=set)
     info: dict[str, dict[int, EntityInfo]] = field(default_factory=dict)
 
     # A second list of EntityInfo objects
@@ -206,9 +210,11 @@ class RuntimeEntryData:
         """Distribute an update of state information to the target."""
         key = state.key
         state_type = type(state)
+        stale_state = self.stale_state
         current_state_by_type = self.state[state_type]
         current_state = current_state_by_type.get(key, _SENTINEL)
-        if current_state == state:
+        subscription_key = (state_type, key)
+        if current_state == state and subscription_key not in stale_state:
             _LOGGER.debug(
                 "%s: ignoring duplicate update with and key %s: %s",
                 self.name,
@@ -222,8 +228,8 @@ class RuntimeEntryData:
             key,
             state,
         )
+        stale_state.discard(subscription_key)
         current_state_by_type[key] = state
-        subscription_key = (state_type, key)
         if subscription_key in self.state_subscriptions:
             self.state_subscriptions[subscription_key]()
 

From bbb571fdf8d436bdc2efc54a90a68c9f4bd9f92d Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Thu, 6 Apr 2023 13:41:38 -0700
Subject: [PATCH 23/27] Coerce previously persisted local calendars to have
 valid durations (#90970)

---
 .../components/local_calendar/calendar.py     | 23 +++--
 tests/components/local_calendar/conftest.py   | 14 ++-
 .../local_calendar/test_calendar.py           | 89 +++++++++++++++++++
 3 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/local_calendar/calendar.py b/homeassistant/components/local_calendar/calendar.py
index 4b6d9444fd8..6cfcaec61d0 100644
--- a/homeassistant/components/local_calendar/calendar.py
+++ b/homeassistant/components/local_calendar/calendar.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+from datetime import date, datetime, timedelta
 import logging
 from typing import Any
 
@@ -186,14 +186,23 @@ def _parse_event(event: dict[str, Any]) -> Event:
 
 def _get_calendar_event(event: Event) -> CalendarEvent:
     """Return a CalendarEvent from an API event."""
+    start: datetime | date
+    end: datetime | date
+    if isinstance(event.start, datetime) and isinstance(event.end, datetime):
+        start = dt_util.as_local(event.start)
+        end = dt_util.as_local(event.end)
+        if (end - start) <= timedelta(seconds=0):
+            end = start + timedelta(minutes=30)
+    else:
+        start = event.start
+        end = event.end
+        if (end - start) <= timedelta(days=0):
+            end = start + timedelta(days=1)
+
     return CalendarEvent(
         summary=event.summary,
-        start=dt_util.as_local(event.start)
-        if isinstance(event.start, datetime)
-        else event.start,
-        end=dt_util.as_local(event.end)
-        if isinstance(event.end, datetime)
-        else event.end,
+        start=start,
+        end=end,
         description=event.description,
         uid=event.uid,
         rrule=event.rrule.as_rrule_str() if event.rrule else None,
diff --git a/tests/components/local_calendar/conftest.py b/tests/components/local_calendar/conftest.py
index b083bbac78a..7dc294087bd 100644
--- a/tests/components/local_calendar/conftest.py
+++ b/tests/components/local_calendar/conftest.py
@@ -26,10 +26,10 @@ TEST_ENTITY = "calendar.light_schedule"
 class FakeStore(LocalCalendarStore):
     """Mock storage implementation."""
 
-    def __init__(self, hass: HomeAssistant, path: Path) -> None:
+    def __init__(self, hass: HomeAssistant, path: Path, ics_content: str) -> None:
         """Initialize FakeStore."""
         super().__init__(hass, path)
-        self._content = ""
+        self._content = ics_content
 
     def _load(self) -> str:
         """Read from calendar storage."""
@@ -40,15 +40,21 @@ class FakeStore(LocalCalendarStore):
         self._content = ics_content
 
 
+@pytest.fixture(name="ics_content", autouse=True)
+def mock_ics_content() -> str:
+    """Fixture to allow tests to set initial ics content for the calendar store."""
+    return ""
+
+
 @pytest.fixture(name="store", autouse=True)
-def mock_store() -> Generator[None, None, None]:
+def mock_store(ics_content: str) -> Generator[None, None, None]:
     """Test cleanup, remove any media storage persisted during the test."""
 
     stores: dict[Path, FakeStore] = {}
 
     def new_store(hass: HomeAssistant, path: Path) -> FakeStore:
         if path not in stores:
-            stores[path] = FakeStore(hass, path)
+            stores[path] = FakeStore(hass, path, ics_content)
         return stores[path]
 
     with patch(
diff --git a/tests/components/local_calendar/test_calendar.py b/tests/components/local_calendar/test_calendar.py
index a2f13ea289d..559a2af38b3 100644
--- a/tests/components/local_calendar/test_calendar.py
+++ b/tests/components/local_calendar/test_calendar.py
@@ -1,6 +1,7 @@
 """Tests for calendar platform of local calendar."""
 
 import datetime
+import textwrap
 
 import pytest
 
@@ -940,3 +941,91 @@ async def test_create_event_service(
             "location": "Test Location",
         }
     ]
+
+
+@pytest.mark.parametrize(
+    "ics_content",
+    [
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART:19970714
+            DTEND:19970714
+            END:VEVENT
+            END:VCALENDAR
+        """
+        ),
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART:19970714
+            DTEND:19970710
+            END:VEVENT
+            END:VCALENDAR
+        """
+        ),
+    ],
+    ids=["no_duration", "negative"],
+)
+async def test_invalid_all_day_event(
+    ws_client: ClientFixture,
+    setup_integration: None,
+    get_events: GetEventsFn,
+) -> None:
+    """Test all day events with invalid durations, which are coerced to be valid."""
+    events = await get_events("1997-07-14T00:00:00Z", "1997-07-16T00:00:00Z")
+    assert list(map(event_fields, events)) == [
+        {
+            "summary": "Bastille Day Party",
+            "start": {"date": "1997-07-14"},
+            "end": {"date": "1997-07-15"},
+        }
+    ]
+
+
+@pytest.mark.parametrize(
+    "ics_content",
+    [
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART:19970714T110000
+            DTEND:19970714T110000
+            END:VEVENT
+            END:VCALENDAR
+        """
+        ),
+        textwrap.dedent(
+            """\
+            BEGIN:VCALENDAR
+            BEGIN:VEVENT
+            SUMMARY:Bastille Day Party
+            DTSTART:19970714T110000
+            DTEND:19970710T100000
+            END:VEVENT
+            END:VCALENDAR
+        """
+        ),
+    ],
+    ids=["no_duration", "negative"],
+)
+async def test_invalid_event_duration(
+    ws_client: ClientFixture,
+    setup_integration: None,
+    get_events: GetEventsFn,
+) -> None:
+    """Test events with invalid durations, which are coerced to be valid."""
+    events = await get_events("1997-07-14T00:00:00Z", "1997-07-16T00:00:00Z")
+    assert list(map(event_fields, events)) == [
+        {
+            "summary": "Bastille Day Party",
+            "start": {"dateTime": "1997-07-14T11:00:00-06:00"},
+            "end": {"dateTime": "1997-07-14T11:30:00-06:00"},
+        }
+    ]

From 73a960af3426182057473c29c54db2f4281f3d08 Mon Sep 17 00:00:00 2001
From: Allen Porter <allen@thebends.org>
Date: Thu, 6 Apr 2023 13:44:34 -0700
Subject: [PATCH 24/27] Bump gcal_sync to 4.1.3 (#90968)

---
 homeassistant/components/google/manifest.json | 2 +-
 requirements_all.txt                          | 2 +-
 requirements_test_all.txt                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/google/manifest.json b/homeassistant/components/google/manifest.json
index d79cd105c83..8c5df8648e7 100644
--- a/homeassistant/components/google/manifest.json
+++ b/homeassistant/components/google/manifest.json
@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/calendar.google/",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==4.1.2", "oauth2client==4.1.3"]
+  "requirements": ["gcal-sync==4.1.3", "oauth2client==4.1.3"]
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index e00d154d7c8..e749d8240af 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -757,7 +757,7 @@ gTTS==2.2.4
 gassist-text==0.0.10
 
 # homeassistant.components.google
-gcal-sync==4.1.2
+gcal-sync==4.1.3
 
 # homeassistant.components.geniushub
 geniushub-client==0.7.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 7d8564da8bc..4650a036aed 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -579,7 +579,7 @@ gTTS==2.2.4
 gassist-text==0.0.10
 
 # homeassistant.components.google
-gcal-sync==4.1.2
+gcal-sync==4.1.3
 
 # homeassistant.components.geocaching
 geocachingapi==0.2.1

From e8a6a2e1056c431d32744e0ffc823cbe684a28a8 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Thu, 6 Apr 2023 22:46:32 +0200
Subject: [PATCH 25/27] Fix error after losing an imap connection (#90966)

Cleanup first after losing an imap connection
---
 homeassistant/components/imap/coordinator.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/imap/coordinator.py b/homeassistant/components/imap/coordinator.py
index 421cedad149..e11cf1e0baf 100644
--- a/homeassistant/components/imap/coordinator.py
+++ b/homeassistant/components/imap/coordinator.py
@@ -194,7 +194,11 @@ class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
             if count
             else None
         )
-        if count and last_message_id is not None:
+        if (
+            count
+            and last_message_id is not None
+            and self._last_message_id != last_message_id
+        ):
             self._last_message_id = last_message_id
             await self._async_process_event(last_message_id)
 
@@ -235,18 +239,18 @@ class ImapPollingDataUpdateCoordinator(ImapDataUpdateCoordinator):
             UpdateFailed,
             asyncio.TimeoutError,
         ) as ex:
-            self.async_set_update_error(ex)
             await self._cleanup()
+            self.async_set_update_error(ex)
             raise UpdateFailed() from ex
         except InvalidFolder as ex:
             _LOGGER.warning("Selected mailbox folder is invalid")
-            self.async_set_update_error(ex)
             await self._cleanup()
+            self.async_set_update_error(ex)
             raise ConfigEntryError("Selected mailbox folder is invalid.") from ex
         except InvalidAuth as ex:
             _LOGGER.warning("Username or password incorrect, starting reauthentication")
-            self.async_set_update_error(ex)
             await self._cleanup()
+            self.async_set_update_error(ex)
             raise ConfigEntryAuthFailed() from ex
 
 
@@ -316,6 +320,7 @@ class ImapPushDataUpdateCoordinator(ImapDataUpdateCoordinator):
                     self.config_entry.data[CONF_SERVER],
                     BACKOFF_TIME,
                 )
+                await self._cleanup()
                 await asyncio.sleep(BACKOFF_TIME)
 
     async def shutdown(self, *_) -> None:

From cfd8695aaa2b9b41a1207a1d8d956cae4e2aebda Mon Sep 17 00:00:00 2001
From: Steven Rollason <2099542+gadgetchnnel@users.noreply.github.com>
Date: Thu, 6 Apr 2023 20:06:31 +0100
Subject: [PATCH 26/27] Fix command_template sensor value_template not being
 used if json_attributes set (#90603)

* Allow value_template to be used if json_attributes set

* Set state to None if no value_template and json_attributes used

* Refactor check for no value_template when json_attributes used

* Updated and additional unit test

* Updated to set _attr_native_value and return if value_template is None

* Update unit test docstring

* Updated test docstring based on feedback
---
 .../components/command_line/sensor.py         |  5 ++++-
 tests/components/command_line/test_sensor.py  | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/command_line/sensor.py b/homeassistant/components/command_line/sensor.py
index f459e415661..b6a2b8d83fa 100644
--- a/homeassistant/components/command_line/sensor.py
+++ b/homeassistant/components/command_line/sensor.py
@@ -137,8 +137,11 @@ class CommandSensor(SensorEntity):
                     _LOGGER.warning("Unable to parse output as JSON: %s", value)
             else:
                 _LOGGER.warning("Empty reply found when expecting JSON data")
+            if self._value_template is None:
+                self._attr_native_value = None
+                return
 
-        elif self._value_template is not None:
+        if self._value_template is not None:
             self._attr_native_value = (
                 self._value_template.async_render_with_possible_json_value(
                     value,
diff --git a/tests/components/command_line/test_sensor.py b/tests/components/command_line/test_sensor.py
index 4643891691f..188f4aac062 100644
--- a/tests/components/command_line/test_sensor.py
+++ b/tests/components/command_line/test_sensor.py
@@ -169,6 +169,28 @@ async def test_update_with_json_attrs(hass: HomeAssistant) -> None:
     )
     entity_state = hass.states.get("sensor.test")
     assert entity_state
+    assert entity_state.state == "unknown"
+    assert entity_state.attributes["key"] == "some_json_value"
+    assert entity_state.attributes["another_key"] == "another_json_value"
+    assert entity_state.attributes["key_three"] == "value_three"
+
+
+async def test_update_with_json_attrs_and_value_template(hass: HomeAssistant) -> None:
+    """Test json_attributes can be used together with value_template."""
+    await setup_test_entities(
+        hass,
+        {
+            "command": (
+                'echo { \\"key\\": \\"some_json_value\\", \\"another_key\\": '
+                '\\"another_json_value\\", \\"key_three\\": \\"value_three\\" }'
+            ),
+            "json_attributes": ["key", "another_key", "key_three"],
+            "value_template": '{{ value_json["key"] }}',
+        },
+    )
+    entity_state = hass.states.get("sensor.test")
+    assert entity_state
+    assert entity_state.state == "some_json_value"
     assert entity_state.attributes["key"] == "some_json_value"
     assert entity_state.attributes["another_key"] == "another_json_value"
     assert entity_state.attributes["key_three"] == "value_three"

From 2bf51a033b577094418c0340913357118f8d6e22 Mon Sep 17 00:00:00 2001
From: Heikki Partanen <heiparta@users.noreply.github.com>
Date: Thu, 6 Apr 2023 23:54:18 +0300
Subject: [PATCH 27/27] Fix verisure autolock (#90960)

Fix verisure autolock #90959
---
 homeassistant/components/verisure/lock.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/verisure/lock.py b/homeassistant/components/verisure/lock.py
index d13005b265d..53646c1e435 100644
--- a/homeassistant/components/verisure/lock.py
+++ b/homeassistant/components/verisure/lock.py
@@ -188,9 +188,10 @@ class VerisureDoorlock(CoordinatorEntity[VerisureDataUpdateCoordinator], LockEnt
     def disable_autolock(self) -> None:
         """Disable autolock on a doorlock."""
         try:
-            self.coordinator.verisure.set_lock_config(
+            command = self.coordinator.verisure.set_autolock_enabled(
                 self.serial_number, auto_lock_enabled=False
             )
+            self.coordinator.verisure.request(command)
             LOGGER.debug("Disabling autolock on %s", self.serial_number)
         except VerisureError as ex:
             LOGGER.error("Could not disable autolock, %s", ex)
@@ -198,9 +199,10 @@ class VerisureDoorlock(CoordinatorEntity[VerisureDataUpdateCoordinator], LockEnt
     def enable_autolock(self) -> None:
         """Enable autolock on a doorlock."""
         try:
-            self.coordinator.verisure.set_lock_config(
+            command = self.coordinator.verisure.set_autolock_enabled(
                 self.serial_number, auto_lock_enabled=True
             )
+            self.coordinator.verisure.request(command)
             LOGGER.debug("Enabling autolock on %s", self.serial_number)
         except VerisureError as ex:
             LOGGER.error("Could not enable autolock, %s", ex)