Merge pull request #76 from deepghs/dev/test

dev(narugo): update the test for huggingface_hub>=1

Author: narugo1992

.github/workflows/release.yml

@@ -55,11 +55,12 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       fail-fast: false
+      max-parallel: 1
       matrix:
         os:
           - 'ubuntu-22.04'
           - 'windows-2022'
-          - 'macos-13'
+          - 'macos-14'
         python-version:
           - '3.8'
 

.github/workflows/release_test.yml

@@ -49,11 +49,12 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       fail-fast: false
+      max-parallel: 1
       matrix:
         os:
           - 'ubuntu-22.04'
           - 'windows-2022'
-          - 'macos-13'
+          - 'macos-14'
         python-version:
           - '3.8'
 

.github/workflows/test.yml

@@ -12,19 +12,19 @@ jobs:
     if: ${{ !contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'test skip') }}
     strategy:
       fail-fast: false
-      max-parallel: 2
+      max-parallel: 1
       matrix:
         os:
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
         python-version:
           - '3.8'
-          - '3.9'
-          - '3.10'
+#          - '3.9'
+#          - '3.10'
           - '3.11'
-          - '3.12'
-          - '3.13'
+#          - '3.12'
+#          - '3.13'
 
     steps:
       - name: Get system version for Linux
@@ -132,7 +132,7 @@ jobs:
         os:
           - 'ubuntu-22.04'
           - 'windows-2022'
-          - 'macos-13'
+          - 'macos-14'
         python-version:
           - '3.8'
 

hfutils/entry/download.py

@@ -15,12 +15,16 @@
 from typing import Optional
 
 import click
-from huggingface_hub import configure_http_backend
 
 from .base import CONTEXT_SETTINGS, command_wrap, ClickErrorException
 from ..operate import download_file_to_file, download_archive_as_directory, download_directory_as_directory
 from ..operate.base import REPO_TYPES, RepoTypeTyping
-from ..utils import get_requests_session
+from ..utils import get_requests_session, HF_IS_VERSION_0_X_X
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 class NoRemotePathAssignedWithDownload(ClickErrorException):
@@ -122,7 +126,8 @@ def download(
 
         :raises NoRemotePathAssignedWithDownload: If no remote path in repository is assigned.
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
 
         if tmpdir:
             os.environ['TMPDIR'] = tmpdir

hfutils/entry/duplicate.py

@@ -6,12 +6,16 @@
 """
 
 import click
-from huggingface_hub import configure_http_backend
 
 from .base import CONTEXT_SETTINGS, command_wrap
 from ..operate import hf_repo_duplicate
 from ..operate.base import REPO_TYPES, RepoTypeTyping
-from ..utils import get_requests_session
+from ..utils import get_requests_session, HF_IS_VERSION_0_X_X
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 def _add_duplicate_subcommand(cli: click.Group) -> click.Group:
@@ -59,7 +63,9 @@ def duplicate(src_repo_id: str, dst_repo_id: str, repo_type: RepoTypeTyping, pri
 
         :raises: Various exceptions from huggingface_hub based on operation status
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
+
         hf_repo_duplicate(
             src_repo_id=src_repo_id,
             dst_repo_id=dst_repo_id,

hfutils/entry/ils.py

@@ -26,14 +26,18 @@
 import click
 from hbutils.scale import size_to_bytes_str
 from hbutils.string import plural_word, titleize
-from huggingface_hub import configure_http_backend
 
 from .base import CONTEXT_SETTINGS
 from ..index import hf_tar_get_index, hf_tar_validate
 from ..operate.base import REPO_TYPES
-from ..utils import get_requests_session, get_file_type, FileItemType
+from ..utils import get_requests_session, get_file_type, FileItemType, HF_IS_VERSION_0_X_X
 from ..utils.path import RepoTypeTyping, hf_normpath
 
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
+
 _FT_NAME_MAP = {
     FileItemType.IMAGE: 'image',
     FileItemType.ARCHIVE: 'archive/compressed',
@@ -133,7 +137,8 @@ def ls(repo_id: str, idx_repo_id: Optional[str], repo_type: RepoTypeTyping, revi
 
         The function uses click styles to format the output for better readability in the terminal.
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
 
         idx_info = hf_tar_get_index(
             repo_id=repo_id,

hfutils/entry/index.py

@@ -18,15 +18,19 @@
 
 import click
 from hbutils.string import plural_word
-from huggingface_hub import configure_http_backend
 
 from .base import CONTEXT_SETTINGS
 from ..cache import delete_detached_cache
 from ..index import hf_tar_validate, tar_create_index
 from ..operate import get_hf_fs, download_file_to_file, upload_directory_as_directory
 from ..operate.base import REPO_TYPES, RepoTypeTyping, get_hf_client
 from ..utils import tqdm, hf_fs_path, parse_hf_fs_path, TemporaryDirectory, hf_normpath, ColoredFormatter, \
-    get_requests_session
+    get_requests_session, HF_IS_VERSION_0_X_X
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 def _add_index_subcommand(cli: click.Group) -> click.Group:
@@ -90,7 +94,8 @@ def index(repo_id: str, idx_repo_id: Optional[str], repo_type: RepoTypeTyping, r
             This function is typically invoked through the CLI interface, like:
             $ python script.py index -r my_repo -x my_index_repo -t dataset -R main --min_upload_interval 120
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
 
         logger = logging.getLogger()
         logger.setLevel(logging.INFO)

hfutils/entry/ls.py

@@ -4,12 +4,16 @@
 
 import click
 import tzlocal
-from huggingface_hub import configure_http_backend
 from huggingface_hub.hf_api import RepoFolder, RepoFile
 
 from .base import CONTEXT_SETTINGS
 from ..operate.base import REPO_TYPES, get_hf_client
-from ..utils import get_requests_session, FileItemType, get_file_type
+from ..utils import get_requests_session, FileItemType, get_file_type, HF_IS_VERSION_0_X_X
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 class ListItem:
@@ -73,7 +77,8 @@ def ls(repo_id: str, repo_type: str, dir_in_repo, revision: str, show_all: bool,
         :param show_detailed: Flag to indicate whether to show detailed file information.
         :type show_detailed: bool
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
 
         hf_client = get_hf_client()
         items: List[ListItem] = []

hfutils/entry/ls_repo.py

@@ -2,12 +2,16 @@
 from typing import Optional
 
 import click
-from huggingface_hub import configure_http_backend
 from huggingface_hub.utils import LocalTokenNotFoundError
 
 from .base import CONTEXT_SETTINGS, ClickErrorException
 from ..operate.base import REPO_TYPES, get_hf_client
-from ..utils import get_requests_session
+from ..utils import get_requests_session, HF_IS_VERSION_0_X_X
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 class NoLocalAuthentication(ClickErrorException):
@@ -48,11 +52,15 @@ def ls(author: Optional[str], repo_type: str, pattern: str):
         :param pattern: Pattern of the repository names.
         :type pattern: str
         """
-        configure_http_backend(get_requests_session)
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
 
         hf_client = get_hf_client()
         if not author:
             try:
+                if not hf_client.token:
+                    raise LocalTokenNotFoundError
+
                 info = hf_client.whoami()
                 author = author or info['name']
             except LocalTokenNotFoundError:

hfutils/entry/rollback.py

@@ -5,7 +5,12 @@
 from .base import CONTEXT_SETTINGS
 from ..operate.base import REPO_TYPES, RepoTypeTyping
 from ..repository import hf_hub_rollback
-from ..utils import ColoredFormatter
+from ..utils import ColoredFormatter, HF_IS_VERSION_0_X_X, get_requests_session
+
+if HF_IS_VERSION_0_X_X:
+    from huggingface_hub import configure_http_backend
+else:
+    configure_http_backend = None
 
 
 def _add_rollback_subcommand(cli: click.Group) -> click.Group:
@@ -43,6 +48,9 @@ def rollback(repo_id: str, repo_type: RepoTypeTyping, revision: str, rollback_to
         :param revision: The revision of the repository to rollback.
         :param rollback_to_commit_id: The commit ID to rollback to.
         """
+        if HF_IS_VERSION_0_X_X:
+            configure_http_backend(get_requests_session)
+
         # Set up logging
         logger = logging.getLogger()
         logger.setLevel(logging.INFO)