Handle request read timeout

oischinger · Aug 22, 2023 · 4bf63b4 · 4bf63b4 · github-actions · Aug 22, 2023
1 parent 7ec655e
commit 4bf63b4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/custom_components/vicare/__init__.py b/custom_components/vicare/__init__.py
@@ -132,7 +132,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady from err
     except PyViCareInternalServerError as err:
         raise ConfigEntryNotReady from err
-    except requests.exceptions.ConnectionError as err:
+    except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout) as err:
         raise ConfigEntryNotReady from err
 
 def vicare_login(hass, entry_data, scan_interval = DEFAULT_SCAN_INTERVAL):

diff --git a/custom_components/vicare/binary_sensor.py b/custom_components/vicare/binary_sensor.py
@@ -263,7 +263,7 @@ def update(self):
         try:
             with suppress(PyViCareNotSupportedFeatureError):
                 self._state = self.entity_description.value_getter(self._api)
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")

diff --git a/custom_components/vicare/button.py b/custom_components/vicare/button.py
@@ -125,7 +125,7 @@ def press(self) -> None:
         try:
             with suppress(PyViCareNotSupportedFeatureError):
                 self.entity_description.value_setter(self._api)
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")

diff --git a/custom_components/vicare/climate.py b/custom_components/vicare/climate.py
@@ -282,7 +282,7 @@ def update(self) -> None:
                         self._current_action or compressor.getActive()
                     )
 
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except PyViCareRateLimitError as limit_exception:
             _LOGGER.error("Vicare API rate limit exceeded: %s", limit_exception)
@@ -480,7 +480,7 @@ def update(self) -> None:
             self._attributes = {}
             self._attributes["room_temperature"] = _room_temperature
 
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except PyViCareRateLimitError as limit_exception:
             _LOGGER.error("Vicare API rate limit exceeded: %s", limit_exception)

diff --git a/custom_components/vicare/config_flow.py b/custom_components/vicare/config_flow.py
@@ -56,7 +56,7 @@ async def async_step_user(
             except PyViCareInternalServerError as err:
                 errors["base"] = "server_error"
                 description_placeholders = {"error": str(err)}   
-            except requests.exceptions.ConnectionError as err:
+            except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout) as err:
                 errors["base"] = "cannot_connect"
                 description_placeholders = {"error": str(err)}  
             except PyViCareRateLimitError as err:

diff --git a/custom_components/vicare/sensor.py b/custom_components/vicare/sensor.py
@@ -766,7 +766,7 @@ def update(self):
                         self._attr_native_unit_of_measurement = (
                             VICARE_UNIT_TO_UNIT_OF_MEASUREMENT.get(vicare_unit)
                         )
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")

diff --git a/custom_components/vicare/switch.py b/custom_components/vicare/switch.py
@@ -142,7 +142,7 @@ def update(self):
             with suppress(PyViCareNotSupportedFeatureError):
                 _LOGGER.debug("Fetching DHW One Time Charging Status")
                 self._state = self.entity_description.value_getter(self._api)
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")
@@ -161,7 +161,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:
                 self._ignore_update_until = datetime.datetime.utcnow() + TIMEDELTA_UPDATE
                 self._state = True
 
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")
@@ -179,7 +179,7 @@ async def async_turn_off(self, **kwargs: Any) -> None:
                 self._ignore_update_until = datetime.datetime.utcnow() + TIMEDELTA_UPDATE
                 self._state = False
 
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except ValueError:
             _LOGGER.error("Unable to decode data from ViCare server")

diff --git a/custom_components/vicare/water_heater.py b/custom_components/vicare/water_heater.py
@@ -117,7 +117,7 @@ def update(self) -> None:
             with suppress(PyViCareNotSupportedFeatureError):
                 self._current_mode = self._circuit.getActiveMode()
 
-        except requests.exceptions.ConnectionError:
+        except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout):
             _LOGGER.error("Unable to retrieve data from ViCare server")
         except PyViCareRateLimitError as limit_exception:
             _LOGGER.error("Vicare API rate limit exceeded: %s", limit_exception)
File	Stmts	Miss	Cover	Missing
__init__.py	93	20	78%	79, 83, 87, 96, 101–102, 111, 129–136, 140–142, 148, 158
binary_sensor.py	99	16	83%	114, 117, 186–187, 193–194, 206–207, 266–273
button.py	72	15	79%	58, 61, 63–64, 125–135
climate.py	284	84	70%	141, 146, 239, 243, 285–292, 316–317, 319–321, 323–324, 328–329, 331–335, 341, 356, 376–378, 392–394, 398–399, 401–405, 407, 416–417, 419, 423, 437–445, 450, 455, 470–474, 476–477, 480–481, 483–490, 495, 500, 505, 510, 515, 520, 524–526, 531
config_flow.py	15	0	100%
const.py	22	0	100%
diagnostics.py	19	19	0%	2, 4–5, 7–10, 12–13, 15, 18, 22, 24, 30, 32–36
helpers.py	31	6	80%	28–29, 37–38, 46–47
sensor.py	107	16	85%	608, 611, 680–681, 687–688, 700–701, 769–776
switch.py	115	42	63%	59, 62, 64–65, 138–139, 145–152, 156–157, 159–162, 164–171, 175–180, 182–189
water_heater.py	106	20	81%	106–108, 112–113, 117–118, 120–127, 172–174, 189, 199
TOTAL	963	238	75%