From 426e33a024d7255b7df337678a5351a6784e9b1f Mon Sep 17 00:00:00 2001 From: Younes Belkada <49240599+younesbelkada@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:47:15 +0200 Subject: [PATCH 1/3] Update hub.py --- src/transformers/utils/hub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transformers/utils/hub.py b/src/transformers/utils/hub.py index a4065dbf83b7..f336321140ae 100644 --- a/src/transformers/utils/hub.py +++ b/src/transformers/utils/hub.py @@ -686,7 +686,7 @@ def has_file( ) from e except EntryNotFoundError: return False # File does not exist - except requests.HTTPError: + except (requests.HTTPError, requests.exceptions.ConnectionError): # Any authentication/authorization error will be caught here => default to cache return has_file_in_cache From 35d75685670cdd0f540fc2f16578c3ab11e5c4f3 Mon Sep 17 00:00:00 2001 From: Amy Roberts <22614925+amyeroberts@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:33:13 +0000 Subject: [PATCH 2/3] Update errors --- src/transformers/utils/hub.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/transformers/utils/hub.py b/src/transformers/utils/hub.py index f336321140ae..f7405181563b 100644 --- a/src/transformers/utils/hub.py +++ b/src/transformers/utils/hub.py @@ -660,7 +660,7 @@ def has_file( proxies=proxies, timeout=10, ) - except OfflineModeIsEnabled: + except (OfflineModeIsEnabled, requests.exceptions.ConnectionError): return has_file_in_cache try: @@ -686,7 +686,16 @@ def has_file( ) from e except EntryNotFoundError: return False # File does not exist - except (requests.HTTPError, requests.exceptions.ConnectionError): + except (requests.exceptions.SSLError, requests.exceptions.ProxyError) as e: + logger.error(e) + # Actually raise for those subclasses of ConnectionError + raise e + except ( + requests.HTTPError, + requests.exceptions.ConnectionError, + requests.exceptions.Timeout, + OfflineModeIsEnabled, + ): # Any authentication/authorization error will be caught here => default to cache return has_file_in_cache From 1938458f58fa15c4f933fd7da4f957540c76a8ca Mon Sep 17 00:00:00 2001 From: amyeroberts <22614925+amyeroberts@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:44:36 +0100 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Lucain --- src/transformers/utils/hub.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/transformers/utils/hub.py b/src/transformers/utils/hub.py index f7405181563b..8a75e4c2e852 100644 --- a/src/transformers/utils/hub.py +++ b/src/transformers/utils/hub.py @@ -660,7 +660,14 @@ def has_file( proxies=proxies, timeout=10, ) - except (OfflineModeIsEnabled, requests.exceptions.ConnectionError): + except (requests.exceptions.SSLError, requests.exceptions.ProxyError): + # Actually raise for those subclasses of ConnectionError + raise + except ( + requests.exceptions.ConnectionError, + requests.exceptions.Timeout, + OfflineModeIsEnabled, + ): return has_file_in_cache try: @@ -686,16 +693,7 @@ def has_file( ) from e except EntryNotFoundError: return False # File does not exist - except (requests.exceptions.SSLError, requests.exceptions.ProxyError) as e: - logger.error(e) - # Actually raise for those subclasses of ConnectionError - raise e - except ( - requests.HTTPError, - requests.exceptions.ConnectionError, - requests.exceptions.Timeout, - OfflineModeIsEnabled, - ): + except requests.HTTPError: # Any authentication/authorization error will be caught here => default to cache return has_file_in_cache