Unverified Commit 4f3a14e3 authored by Nicolas Patry's avatar Nicolas Patry Committed by GitHub
Browse files

Updating variable names. (#16445)

parent 20fb5d51
...@@ -34,9 +34,9 @@ from .utils import ( ...@@ -34,9 +34,9 @@ from .utils import (
ENV_VARS_TRUE_VALUES, ENV_VARS_TRUE_VALUES,
FEATURE_EXTRACTOR_NAME, FEATURE_EXTRACTOR_NAME,
FLAX_WEIGHTS_NAME, FLAX_WEIGHTS_NAME,
HF_ENDPOINT,
HF_ENDPOINT_PREFIX,
HF_MODULES_CACHE, HF_MODULES_CACHE,
HUGGINGFACE_CO_PREFIX,
HUGGINGFACE_CO_RESOLVE_ENDPOINT,
MODEL_CARD_NAME, MODEL_CARD_NAME,
MULTIPLE_CHOICE_DUMMY_INPUTS, MULTIPLE_CHOICE_DUMMY_INPUTS,
PYTORCH_PRETRAINED_BERT_CACHE, PYTORCH_PRETRAINED_BERT_CACHE,
...@@ -142,3 +142,8 @@ from .utils import ( ...@@ -142,3 +142,8 @@ from .utils import (
torch_version, torch_version,
url_to_filename, url_to_filename,
) )
# Backward compatible alias of the new variable name
HUGGINGFACE_CO_RESOLVE_ENDPOINT = HF_ENDPOINT
HUGGINGFACE_CO_PREFIX = HF_ENDPOINT_PREFIX
...@@ -45,9 +45,9 @@ from .generic import ( ...@@ -45,9 +45,9 @@ from .generic import (
from .hub import ( from .hub import (
CLOUDFRONT_DISTRIB_PREFIX, CLOUDFRONT_DISTRIB_PREFIX,
DISABLE_TELEMETRY, DISABLE_TELEMETRY,
HF_ENDPOINT,
HF_ENDPOINT_PREFIX,
HF_MODULES_CACHE, HF_MODULES_CACHE,
HUGGINGFACE_CO_PREFIX,
HUGGINGFACE_CO_RESOLVE_ENDPOINT,
PYTORCH_PRETRAINED_BERT_CACHE, PYTORCH_PRETRAINED_BERT_CACHE,
PYTORCH_TRANSFORMERS_CACHE, PYTORCH_TRANSFORMERS_CACHE,
S3_BUCKET_PREFIX, S3_BUCKET_PREFIX,
......
...@@ -107,8 +107,8 @@ if os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None) is not None: ...@@ -107,8 +107,8 @@ if os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None) is not None:
FutureWarning, FutureWarning,
) )
HUGGINGFACE_CO_RESOLVE_ENDPOINT = os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None) HUGGINGFACE_CO_RESOLVE_ENDPOINT = os.environ.get("HUGGINGFACE_CO_RESOLVE_ENDPOINT", None)
HUGGINGFACE_CO_RESOLVE_ENDPOINT = os.environ.get("HF_ENDPOINT", HUGGINGFACE_CO_RESOLVE_ENDPOINT) HF_ENDPOINT = os.environ.get("HF_ENDPOINT", HUGGINGFACE_CO_RESOLVE_ENDPOINT)
HUGGINGFACE_CO_PREFIX = HUGGINGFACE_CO_RESOLVE_ENDPOINT + "/{model_id}/resolve/{revision}/{filename}" HF_ENDPOINT_PREFIX = HF_ENDPOINT + "/{model_id}/resolve/{revision}/{filename}"
def is_remote_url(url_or_filename): def is_remote_url(url_or_filename):
...@@ -149,7 +149,7 @@ def hf_bucket_url( ...@@ -149,7 +149,7 @@ def hf_bucket_url(
if revision is None: if revision is None:
revision = "main" revision = "main"
return HUGGINGFACE_CO_PREFIX.format(model_id=model_id, revision=revision, filename=filename) return HF_ENDPOINT_PREFIX.format(model_id=model_id, revision=revision, filename=filename)
def url_to_filename(url: str, etag: Optional[str] = None) -> str: def url_to_filename(url: str, etag: Optional[str] = None) -> str:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment