Simplified async_update_callback() processing for Climate, Fan

custom_components/echonetlite/__init__.py

@@ -664,7 +664,7 @@ async def async_update_data(self, kwargs):
             self._update_data.update(update_data)
             return self._update_data
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         await self.async_update_data(kwargs={"no_request": True})
         for update_func in self._update_callbacks:
             await update_func(isPush)

custom_components/echonetlite/climate.py

@@ -355,7 +355,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         changed = (
             self._olddata != self._connector._update_data
             or self._attr_available != self._server_state["available"]
@@ -368,12 +368,7 @@ async def async_update_callback(self, isPush=False):
             self._olddata = self._connector._update_data.copy()
             self._attr_available = self._server_state["available"]
             self._set_attrs()
-            self.async_schedule_update_ha_state(_force)
-            if isPush:
-                try:
-                    await self._connector.async_update()
-                except TimeoutError:
-                    pass
+            self.async_schedule_update_ha_state(_force | isPush)
 
     def update_option_listener(self):
         """list of available fan modes."""

custom_components/echonetlite/fan.py

@@ -188,21 +188,17 @@ async def async_added_to_hass(self):
         self._connector.register_async_update_callbacks(self.async_update_callback)
         self._connector.add_update_option_listener(self.update_option_listener)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         changed = (
             self._olddata != self._connector._update_data
             or self._attr_available != self._server_state["available"]
         )
         if changed:
+            _force = bool(not self._attr_available and self._server_state["available"])
             self._olddata = self._connector._update_data.copy()
             self._attr_available = self._server_state["available"]
             self._set_attrs()
-            self.async_schedule_update_ha_state()
-            if isPush:
-                try:
-                    await self._connector.async_update()
-                except TimeoutError:
-                    pass
+            self.async_schedule_update_ha_state(_force | isPush)
 
     def update_option_listener(self):
         _should_poll = (

custom_components/echonetlite/light.py

@@ -211,7 +211,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         changed = (
             self._olddata != self._connector._update_data
             or self._attr_available != self._server_state["available"]

custom_components/echonetlite/number.py

@@ -155,7 +155,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         new_val = self.get_value()
         changed = (
             self._attr_native_value != new_val

custom_components/echonetlite/select.py

@@ -143,7 +143,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         new_val = self._connector._update_data.get(self._code)
         changed = (
             new_val is not None and self._attr_current_option != new_val

custom_components/echonetlite/sensor.py

@@ -450,7 +450,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         new_val = self._connector._update_data.get(self._op_code)
         if "dict_key" in self._sensor_attributes:
             if hasattr(new_val, "get"):

custom_components/echonetlite/switch.py

@@ -205,7 +205,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         new_val = self._connector._update_data[self._code] in self._on_vals
         changed = (
             self._attr_is_on != new_val

custom_components/echonetlite/time.py

@@ -125,7 +125,7 @@ async def async_added_to_hass(self):
         self._connector.add_update_option_listener(self.update_option_listener)
         self._connector.register_async_update_callbacks(self.async_update_callback)
 
-    async def async_update_callback(self, isPush=False):
+    async def async_update_callback(self, isPush: bool = False):
         new_val = self.get_time()
         changed = (
             self._attr_native_value != new_val