Retry all requests timeouts (#7256)

retry all requests timeouts
huggingface · Oct 28, 2024 · 444ce83 · 444ce83
1 parent a9c610f
commit 444ce83
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/datasets/load.py b/src/datasets/load.py
@@ -1609,7 +1609,7 @@ def dataset_module_factory(
                     e.__cause__,
                     (
                         OfflineModeIsEnabled,
-                        requests.exceptions.ConnectTimeout,
+                        requests.exceptions.Timeout,
                         requests.exceptions.ConnectionError,
                     ),
                 ):
@@ -1624,7 +1624,7 @@ def dataset_module_factory(
                 ).sha
             except (
                 OfflineModeIsEnabled,
-                requests.exceptions.ConnectTimeout,
+                requests.exceptions.Timeout,
                 requests.exceptions.ConnectionError,
             ) as e:
                 raise ConnectionError(f"Couldn't reach '{path}' on the Hub ({e.__class__.__name__})") from e

diff --git a/src/datasets/utils/file_utils.py b/src/datasets/utils/file_utils.py
@@ -828,8 +828,8 @@ def read_with_retries(*args, **kwargs):
             except (
                 aiohttp.client_exceptions.ClientError,
                 asyncio.TimeoutError,
-                requests.exceptions.ConnectTimeout,
                 requests.exceptions.ConnectionError,
+                requests.exceptions.Timeout,
             ) as err:
                 disconnect_err = err
                 logger.warning(

diff --git a/tests/test_offline_util.py b/tests/test_offline_util.py
@@ -16,11 +16,11 @@ def test_offline_with_timeout():
     with offline(OfflineSimulationMode.CONNECTION_TIMES_OUT):
         with pytest.raises(RequestWouldHangIndefinitelyError):
             requests.request("GET", "https://huggingface.co")
-        with pytest.raises(requests.exceptions.ConnectTimeout):
+        with pytest.raises(requests.exceptions.Timeout):
             requests.request("GET", "https://huggingface.co", timeout=1.0)
         # old versions of `huggingface_hub` don't have timeouts by default and don't allow to set timeouts in HfFileSystem
         if version.parse(huggingface_hub.__version__) >= version.parse("0.23.0"):
-            with pytest.raises(requests.exceptions.ConnectTimeout), NamedTemporaryFile() as temp_file:
+            with pytest.raises(requests.exceptions.Timeout), NamedTemporaryFile() as temp_file:
                 fsspec_get("hf://dummy", temp_file=temp_file)