Fix error message if invalid token on file download (#2847)

src/huggingface_hub/file_download.py

@@ -29,6 +29,7 @@
     EntryNotFoundError,
     FileMetadataError,
     GatedRepoError,
+    HfHubHTTPError,
     LocalEntryNotFoundError,
     RepositoryNotFoundError,
     RevisionNotFoundError,
@@ -1461,7 +1462,6 @@ def _get_metadata_or_catch_error(
 
 def _raise_on_head_call_error(head_call_error: Exception, force_download: bool, local_files_only: bool) -> NoReturn:
     """Raise an appropriate error when the HEAD call failed and we cannot locate a local file."""
-
     # No head call => we cannot force download.
     if force_download:
         if local_files_only:
@@ -1477,8 +1477,11 @@ def _raise_on_head_call_error(head_call_error: Exception, force_download: bool,
             "Cannot find the requested files in the disk cache and outgoing traffic has been disabled. To enable"
             " hf.co look-ups and downloads online, set 'local_files_only' to False."
         )
-    elif isinstance(head_call_error, RepositoryNotFoundError) or isinstance(head_call_error, GatedRepoError):
+    elif isinstance(head_call_error, (RepositoryNotFoundError, GatedRepoError)) or (
+        isinstance(head_call_error, HfHubHTTPError) and head_call_error.response.status_code == 401
+    ):
         # Repo not found or gated => let's raise the actual error
+        # Unauthorized => likely a token issue => let's raise the actual error
         raise head_call_error
     else:
         # Otherwise: most likely a connection issue or Hub downtime => let's warn the user

src/huggingface_hub/utils/_http.py

@@ -437,6 +437,7 @@ def hf_raise_for_status(response: Response, endpoint_name: Optional[str] = None)
 
         elif error_code == "RepoNotFound" or (
             response.status_code == 401
+            and error_message != "Invalid credentials in Authorization header"
             and response.request is not None
             and response.request.url is not None
             and REPO_API_REGEX.search(response.request.url) is not None

tests/test_utils_errors.py

@@ -36,7 +36,7 @@ def test_hf_raise_for_status_disabled_repo(self) -> None:
         assert context.exception.response.status_code == 403
         assert "Request ID: 123" in str(context.exception)
 
-    def test_hf_raise_for_status_401_repo_url(self) -> None:
+    def test_hf_raise_for_status_401_repo_url_not_invalid_token(self) -> None:
         response = Response()
         response.headers = {X_REQUEST_ID: 123}
         response.status_code = 401
@@ -48,6 +48,18 @@ def test_hf_raise_for_status_401_repo_url(self) -> None:
         assert context.exception.response.status_code == 401
         assert "Request ID: 123" in str(context.exception)
 
+    def test_hf_raise_for_status_401_repo_url_invalid_token(self) -> None:
+        response = Response()
+        response.headers = {X_REQUEST_ID: 123, "X-Error-Message": "Invalid credentials in Authorization header"}
+        response.status_code = 401
+        response.request = PreparedRequest()
+        response.request.url = "https://huggingface.co/api/models/username/reponame"
+        with self.assertRaisesRegex(HfHubHTTPError, "Invalid credentials in Authorization header") as context:
+            hf_raise_for_status(response)
+
+        assert context.exception.response.status_code == 401
+        assert "Request ID: 123" in str(context.exception)
+
     def test_hf_raise_for_status_403_wrong_token_scope(self) -> None:
         response = Response()
         response.headers = {X_REQUEST_ID: 123, "X-Error-Message": "specific error message"}