From 164cfa85da6e5c1a85e004533da689982c053230 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:12:31 +1200
Subject: [PATCH] Add support for ESPHome update entities to be checked on
 demand (#123161)

---
 homeassistant/components/esphome/manifest.json |  2 +-
 homeassistant/components/esphome/update.py     | 11 +++++++++--
 requirements_all.txt                           |  2 +-
 requirements_test_all.txt                      |  2 +-
 tests/components/esphome/test_update.py        | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json
index ff7569bbc5f..97724a12203 100644
--- a/homeassistant/components/esphome/manifest.json
+++ b/homeassistant/components/esphome/manifest.json
@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==24.6.2",
+    "aioesphomeapi==25.0.0",
     "esphome-dashboard-api==1.2.3",
     "bleak-esphome==1.0.0"
   ],
diff --git a/homeassistant/components/esphome/update.py b/homeassistant/components/esphome/update.py
index e86c88ddf5b..b7905fb4fdb 100644
--- a/homeassistant/components/esphome/update.py
+++ b/homeassistant/components/esphome/update.py
@@ -8,6 +8,7 @@ from typing import Any
 from aioesphomeapi import (
     DeviceInfo as ESPHomeDeviceInfo,
     EntityInfo,
+    UpdateCommand,
     UpdateInfo,
     UpdateState,
 )
@@ -259,9 +260,15 @@ class ESPHomeUpdateEntity(EsphomeEntity[UpdateInfo, UpdateState], UpdateEntity):
         """Return the title of the update."""
         return self._state.title
 
+    @convert_api_error_ha_error
+    async def async_update(self) -> None:
+        """Command device to check for update."""
+        if self.available:
+            self._client.update_command(key=self._key, command=UpdateCommand.CHECK)
+
     @convert_api_error_ha_error
     async def async_install(
         self, version: str | None, backup: bool, **kwargs: Any
     ) -> None:
-        """Update the current value."""
-        self._client.update_command(key=self._key, install=True)
+        """Command device to install update."""
+        self._client.update_command(key=self._key, command=UpdateCommand.INSTALL)
diff --git a/requirements_all.txt b/requirements_all.txt
index d0d388e194a..927b3d45310 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -237,7 +237,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==24.6.2
+aioesphomeapi==25.0.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 4953419fe6d..a75a4b6cec8 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -225,7 +225,7 @@ aioelectricitymaps==0.4.0
 aioemonitor==1.0.5
 
 # homeassistant.components.esphome
-aioesphomeapi==24.6.2
+aioesphomeapi==25.0.0
 
 # homeassistant.components.flo
 aioflo==2021.11.0
diff --git a/tests/components/esphome/test_update.py b/tests/components/esphome/test_update.py
index c9826c3f347..83e89b1de00 100644
--- a/tests/components/esphome/test_update.py
+++ b/tests/components/esphome/test_update.py
@@ -8,6 +8,7 @@ from aioesphomeapi import (
     APIClient,
     EntityInfo,
     EntityState,
+    UpdateCommand,
     UpdateInfo,
     UpdateState,
     UserService,
@@ -15,6 +16,10 @@ from aioesphomeapi import (
 import pytest
 
 from homeassistant.components.esphome.dashboard import async_get_dashboard
+from homeassistant.components.homeassistant import (
+    DOMAIN as HOMEASSISTANT_DOMAIN,
+    SERVICE_UPDATE_ENTITY,
+)
 from homeassistant.components.update import (
     DOMAIN as UPDATE_DOMAIN,
     SERVICE_INSTALL,
@@ -527,3 +532,12 @@ async def test_generic_device_update_entity_has_update(
     assert state is not None
     assert state.state == STATE_ON
     assert state.attributes["in_progress"] == 50
+
+    await hass.services.async_call(
+        HOMEASSISTANT_DOMAIN,
+        SERVICE_UPDATE_ENTITY,
+        {ATTR_ENTITY_ID: "update.test_myupdate"},
+        blocking=True,
+    )
+
+    mock_client.update_command.assert_called_with(key=1, command=UpdateCommand.CHECK)