Merge pull request #1328 from JurajNyiri/v7.1.15

Fix #484: Remember presets on failure of retrieval, and force refresh on privacy change

Author: JurajNyiri

custom_components/tapo_control/camera.py

@@ -38,7 +38,11 @@
     CONF_CUSTOM_STREAM_6,
     CONF_CUSTOM_STREAM_7,
 )
-from .utils import build_device_info, getStreamSource
+from .utils import (
+    async_force_entry_refresh,
+    build_device_info,
+    getStreamSource,
+)
 
 
 async def async_setup_entry(
@@ -390,15 +394,15 @@ async def async_turn_on(self):
             self._controller.setPrivacyMode,
             False,
         )
-        await self._coordinator.async_request_refresh()
+        await async_force_entry_refresh(self._hass, self._entry)
 
     async def async_turn_off(self):
         LOGGER.debug("async_turn_off - camera")
         await self._hass.async_add_executor_job(
             self._controller.setPrivacyMode,
             True,
         )
-        await self._coordinator.async_request_refresh()
+        await async_force_entry_refresh(self._hass, self._entry)
 
     async def save_preset(self, name):
         LOGGER.debug("save_preset - camera")

custom_components/tapo_control/manifest.json

@@ -6,7 +6,7 @@
   "codeowners": [
     "@JurajNyiri"
   ],
-  "version": "7.1.14",
+  "version": "7.1.15",
   "requirements": [
     "pytapo==3.4.14",
     "python-kasa[speedups]==0.10.2"

custom_components/tapo_control/select.py

@@ -1611,17 +1611,20 @@ async def async_update(self) -> None:
         await self._coordinator.async_request_refresh()
 
     def updateTapo(self, camData):
-        if not camData or camData["privacy_mode"] == "on":
+        if not camData:
             self._attr_state = STATE_UNAVAILABLE
+            return
+
+        self._presets = camData["presets"]
+        self._attr_options = list(camData["presets"].values())
+
+        if camData["privacy_mode"] == "on":
+            self._attr_state = STATE_UNAVAILABLE
+        elif self._presets:
+            self._attr_current_option = None
+            self._attr_state = self._attr_current_option
         else:
-            self._presets = camData["presets"]
-            presetsConvertedToList = list(camData["presets"].values())
-            if presetsConvertedToList:
-                self._attr_options = list(camData["presets"].values())
-                self._attr_current_option = None
-                self._attr_state = self._attr_current_option
-            else:
-                self._attr_state = STATE_UNAVAILABLE
+            self._attr_state = STATE_UNAVAILABLE
 
     async def async_select_option(self, option: str) -> None:
         foundKey = False

custom_components/tapo_control/switch.py

@@ -8,6 +8,7 @@
 from .const import DOMAIN, LOGGER, ENABLE_MEDIA_SYNC, MEDIA_SYNC_HOURS
 from .tapo.entities import TapoSwitchEntity
 from .utils import (
+    async_force_entry_refresh,
     check_and_create,
     check_functionality,
     getColdDirPathForEntry,
@@ -959,7 +960,7 @@ async def async_turn_on(self) -> None:
         if "error_code" not in result or result["error_code"] == 0:
             self._attr_state = "on"
         self.async_write_ha_state()
-        await self._coordinator.async_request_refresh()
+        await async_force_entry_refresh(self._hass, self._entry)
 
     async def async_turn_off(self) -> None:
         result = await self._hass.async_add_executor_job(
@@ -969,7 +970,7 @@ async def async_turn_off(self) -> None:
         if "error_code" not in result or result["error_code"] == 0:
             self._attr_state = "off"
         self.async_write_ha_state()
-        await self._coordinator.async_request_refresh()
+        await async_force_entry_refresh(self._hass, self._entry)
 
     def updateTapo(self, camData):
         if not camData:

custom_components/tapo_control/utils.py

@@ -26,6 +26,7 @@
 
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.components.ffmpeg import DATA_FFMPEG
+
 try:
     # Home Assistant moved EventManager from `event` to `event_manager` in 2026.5.
     from homeassistant.components.onvif.event_manager import EventManager
@@ -88,6 +89,24 @@ def isUsingHTTPS(hass):
     return URL(base_url).scheme == "https"
 
 
+def mark_entry_data_for_refresh(hass: HomeAssistant, entry: dict) -> None:
+    config_entry = entry.get("entry")
+    root_entry = (
+        hass.data.get(DOMAIN, {}).get(config_entry.entry_id) if config_entry else None
+    )
+    if root_entry is None:
+        root_entry = entry
+
+    root_entry["lastUpdate"] = 0
+    for child in root_entry.get("childDevices", []):
+        child["lastUpdate"] = 0
+
+
+async def async_force_entry_refresh(hass: HomeAssistant, entry: dict) -> None:
+    mark_entry_data_for_refresh(hass, entry)
+    await entry["coordinator"].async_request_refresh()
+
+
 def getStreamSource(entry, stream):
     custom_stream_hd = entry.data.get(CONF_CUSTOM_STREAM_HD, "")
     custom_stream_sd = entry.data.get(CONF_CUSTOM_STREAM_SD, "")