Pin fsspec to use default expand_path

src/huggingface_hub/hf_file_system.py

@@ -8,6 +8,7 @@
 from urllib.parse import quote, unquote
 
 import fsspec
+from packaging import version
 
 from ._commit_api import CommitOperationCopy, CommitOperationDelete
 from .constants import DEFAULT_REVISION, ENDPOINT, REPO_TYPE_MODEL, REPO_TYPES_MAPPING, REPO_TYPES_URL_PREFIXES
@@ -375,34 +376,35 @@ def info(self, path: str, **kwargs) -> Dict[str, Any]:
             return {"name": name, "size": 0, "type": "directory"}
         return super().info(path, **kwargs)
 
-    def expand_path(
-        self, path: Union[str, List[str]], recursive: bool = False, maxdepth: Optional[int] = None, **kwargs
-    ) -> List[str]:
-        # The default implementation does not allow passing custom kwargs (e.g., we use these kwargs to propagate the `revision`)
-        if maxdepth is not None and maxdepth < 1:
-            raise ValueError("maxdepth must be at least 1")
-
-        if isinstance(path, str):
-            return self.expand_path([path], recursive, maxdepth)
-
-        out = set()
-        path = [self._strip_protocol(p) for p in path]
-        for p in path:
-            if has_magic(p):
-                bit = set(self.glob(p, **kwargs))
-                out |= bit
-                if recursive:
-                    out |= set(self.expand_path(list(bit), recursive=recursive, maxdepth=maxdepth, **kwargs))
-                continue
-            elif recursive:
-                rec = set(self.find(p, maxdepth=maxdepth, withdirs=True, detail=False, **kwargs))
-                out |= rec
-            if p not in out and (recursive is False or self.exists(p)):
-                # should only check once, for the root
-                out.add(p)
-        if not out:
-            raise FileNotFoundError(path)
-        return list(sorted(out))
+    if version.parse(fsspec.__version__) < version.parse("2023.5.0"):
+        # The default implementation in fsspec<2023.5.0 does not allow passing custom kwargs (e.g., we use these kwargs to propagate the `revision`)
+        def expand_path(
+            self, path: Union[str, List[str]], recursive: bool = False, maxdepth: Optional[int] = None, **kwargs
+        ) -> List[str]:
+            if maxdepth is not None and maxdepth < 1:
+                raise ValueError("maxdepth must be at least 1")
+
+            if isinstance(path, str):
+                return self.expand_path([path], recursive, maxdepth)
+
+            out = set()
+            path = [self._strip_protocol(p) for p in path]
+            for p in path:
+                if has_magic(p):
+                    bit = set(self.glob(p, **kwargs))
+                    out |= bit
+                    if recursive:
+                        out |= set(self.expand_path(list(bit), recursive=recursive, maxdepth=maxdepth, **kwargs))
+                    continue
+                elif recursive:
+                    rec = set(self.find(p, maxdepth=maxdepth, withdirs=True, detail=False, **kwargs))
+                    out |= rec
+                if p not in out and (recursive is False or self.exists(p)):
+                    # should only check once, for the root
+                    out.add(p)
+            if not out:
+                raise FileNotFoundError(path)
+            return list(sorted(out))
 
 
 class HfFileSystemFile(fsspec.spec.AbstractBufferedFile):