Revert "Updating variable names. (#16445)" (#17011)

This reverts commit 4f3a14e3.

src/transformers/file_utils.py

@@ -34,9 +34,9 @@ from .utils import (
     ENV_VARS_TRUE_VALUES,
     FEATURE_EXTRACTOR_NAME,
     FLAX_WEIGHTS_NAME,
-    HF_ENDPOINT,
-    HF_ENDPOINT_PREFIX,
     HF_MODULES_CACHE,
+    HUGGINGFACE_CO_PREFIX,
+    HUGGINGFACE_CO_RESOLVE_ENDPOINT,
     MODEL_CARD_NAME,
     MULTIPLE_CHOICE_DUMMY_INPUTS,
     PYTORCH_PRETRAINED_BERT_CACHE,
@@ -142,8 +142,3 @@ from .utils import (
     torch_version,
     url_to_filename,
 )
-
-
-# Backward compatible alias of the new variable name
-HUGGINGFACE_CO_RESOLVE_ENDPOINT = HF_ENDPOINT
-HUGGINGFACE_CO_PREFIX = HF_ENDPOINT_PREFIX

src/transformers/utils/__init__.py

@@ -45,9 +45,9 @@ from .generic import (
 from .hub import (
     CLOUDFRONT_DISTRIB_PREFIX,
     DISABLE_TELEMETRY,
-    HF_ENDPOINT,
-    HF_ENDPOINT_PREFIX,
     HF_MODULES_CACHE,
+    HUGGINGFACE_CO_PREFIX,
+    HUGGINGFACE_CO_RESOLVE_ENDPOINT,
     PYTORCH_PRETRAINED_BERT_CACHE,
     PYTORCH_TRANSFORMERS_CACHE,
     S3_BUCKET_PREFIX,

src/transformers/utils/hub.py

@@ -107,8 +107,8 @@ if os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None) is not None:
         FutureWarning,
     )
     HUGGINGFACE_CO_RESOLVE_ENDPOINT = os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None)
-HF_ENDPOINT = os.environ.get("HF_ENDPOINT", HUGGINGFACE_CO_RESOLVE_ENDPOINT)
-HF_ENDPOINT_PREFIX = HF_ENDPOINT + "/{model_id}/resolve/{revision}/{filename}"
+HUGGINGFACE_CO_RESOLVE_ENDPOINT = os.environ.get("HF_ENDPOINT", HUGGINGFACE_CO_RESOLVE_ENDPOINT)
+HUGGINGFACE_CO_PREFIX = HUGGINGFACE_CO_RESOLVE_ENDPOINT + "/{model_id}/resolve/{revision}/{filename}"
 
 
 def is_remote_url(url_or_filename):
@@ -149,7 +149,7 @@ def hf_bucket_url(
 
     if revision is None:
         revision = "main"
-    return HF_ENDPOINT_PREFIX.format(model_id=model_id, revision=revision, filename=filename)
+    return HUGGINGFACE_CO_PREFIX.format(model_id=model_id, revision=revision, filename=filename)
 
 
 def url_to_filename(url: str, etag: Optional[str] = None) -> str: