Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Fix 404 NOT FOUND issue caused by endpoint tail slash #2721

Merged
merged 7 commits into from
Jan 6, 2025
Merged

[BUG] Fix 404 NOT FOUND issue caused by endpoint tail slash #2721

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e90e4c
Fix 404 NOT FOUND BUG caused by tail slash
Mingqi2 Dec 26, 2024
7893008
Update src/huggingface_hub/constants.py
Mingqi2 Dec 31, 2024
87e4be9
Update src/huggingface_hub/utils/_http.py
Mingqi2 Dec 31, 2024
5012bed
Update src/huggingface_hub/utils/_http.py
Mingqi2 Dec 31, 2024
e002bfd
Update src/huggingface_hub/constants.py
Mingqi2 Jan 3, 2025
cd30892
run style
hanouticelina Jan 3, 2025
82ac143
Merge branch 'main' into mingqi/fix_endpoint_tail_slash
hanouticelina Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/huggingface_hub/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re
import typing
from typing import Literal, Optional, Tuple

form urllib.parse import urljoin
Mingqi2 marked this conversation as resolved.
Show resolved Hide resolved

# Possible values for env variables

Expand Down Expand Up @@ -63,9 +63,11 @@ def _as_int(value: Optional[str]) -> Optional[int]:

_HF_DEFAULT_ENDPOINT = "https://huggingface.co"
_HF_DEFAULT_STAGING_ENDPOINT = "https://hub-ci.huggingface.co"
ENDPOINT = os.getenv("HF_ENDPOINT") or (_HF_DEFAULT_STAGING_ENDPOINT if _staging_mode else _HF_DEFAULT_ENDPOINT)
ENDPOINT = os.getenv("HF_ENDPOINT", "").rstrip("/") or (
_HF_DEFAULT_STAGING_ENDPOINT if _staging_mode else _HF_DEFAULT_ENDPOINT
)

HUGGINGFACE_CO_URL_TEMPLATE = ENDPOINT + "/{repo_id}/resolve/{revision}/{filename}"
HUGGINGFACE_CO_URL_TEMPLATE = urljoin(ENDPOINT, "/{repo_id}/resolve/{revision}/{filename}")
hanouticelina marked this conversation as resolved.
Show resolved Hide resolved
HUGGINGFACE_HEADER_X_REPO_COMMIT = "X-Repo-Commit"
HUGGINGFACE_HEADER_X_LINKED_ETAG = "X-Linked-Etag"
HUGGINGFACE_HEADER_X_LINKED_SIZE = "X-Linked-Size"
Expand Down
4 changes: 2 additions & 2 deletions src/huggingface_hub/utils/_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,9 @@ def fix_hf_endpoint_in_url(url: str, endpoint: Optional[str]) -> str:

This is useful when using a proxy and the Hugging Face Hub returns a URL with the default endpoint.
"""
endpoint = endpoint or constants.ENDPOINT
endpoint = endpoint.rstrip("/") if endpoint else constants.ENDPOINT
# check if a proxy has been set => if yes, update the returned URL to use the proxy
if endpoint not in (None, constants._HF_DEFAULT_ENDPOINT, constants._HF_DEFAULT_STAGING_ENDPOINT):
if endpoint not in (constants._HF_DEFAULT_ENDPOINT, constants._HF_DEFAULT_STAGING_ENDPOINT):
url = url.replace(constants._HF_DEFAULT_ENDPOINT, endpoint)
url = url.replace(constants._HF_DEFAULT_STAGING_ENDPOINT, endpoint)
return url
Expand Down
Loading