Fix minor things in ci (#3558)

* type hints

* skip unix-specific tests on windows instead of expecting failure

* typo

---------

Co-authored-by: Celina Hanouti <[email protected]>

Author: Wauplin

src/huggingface_hub/hf_api.py

@@ -7609,7 +7609,7 @@ def create_inference_endpoint(
             "type": type,
         }
         if scaling_metric:
-            payload["compute"]["scaling"]["measure"] = {scaling_metric: scaling_threshold}
+            payload["compute"]["scaling"]["measure"] = {scaling_metric: scaling_threshold}  # type: ignore
         if env:
             payload["model"]["env"] = env
         if secrets:

src/huggingface_hub/hf_file_system.py

@@ -341,7 +341,7 @@ def _open(
         revision: Optional[str] = None,
         block_size: Optional[int] = None,
         **kwargs,
-    ) -> "HfFileSystemFile":
+    ) -> Union["HfFileSystemFile", "HfFileSystemStreamFile"]:
         block_size = block_size if block_size is not None else self.block_size
         if block_size is not None:
             kwargs["block_size"] = block_size

src/huggingface_hub/inference/_mcp/utils.py

@@ -57,10 +57,10 @@ def format_result(result: "mcp_types.CallToolResult") -> str:
         elif item.type == "resource":
             resource = item.resource
 
-            if hasattr(resource, "text"):
+            if hasattr(resource, "text") and isinstance(resource.text, str):
                 formatted_parts.append(resource.text)
 
-            elif hasattr(resource, "blob"):
+            elif hasattr(resource, "blob") and isinstance(resource.blob, str):
                 formatted_parts.append(
                     f"[Binary Content ({resource.uri}): {resource.mimeType}, {_get_base64_size(resource.blob)} bytes]\n"
                     f"The task is complete and the content accessible to the User"

src/huggingface_hub/serialization/_base.py

@@ -102,7 +102,7 @@ def split_state_dict_into_shards_factory(
             continue
 
         # If a `tensor` shares the same underlying storage as another tensor, we put `tensor` in the same `block`
-        storage_id = get_storage_id(tensor)
+        storage_id = get_storage_id(tensor)  # type: ignore[invalid-argument-type]
         if storage_id is not None:
             if storage_id in storage_id_to_tensors:
                 # We skip this tensor for now and will reassign to correct shard later
@@ -114,7 +114,7 @@ def split_state_dict_into_shards_factory(
                 storage_id_to_tensors[storage_id] = [key]
 
         # Compute tensor size
-        tensor_size = get_storage_size(tensor)
+        tensor_size = get_storage_size(tensor)  # type: ignore[invalid-argument-type]
 
         # If this tensor is bigger than the maximal size, we put it in its own shard
         if tensor_size > max_shard_size:

tests/test_cache_layout.py

@@ -8,11 +8,7 @@
 from huggingface_hub.utils import SoftTemporaryDirectory, logging
 
 from .testing_constants import ENDPOINT_STAGING, TOKEN
-from .testing_utils import (
-    repo_name,
-    with_production_testing,
-    xfail_on_windows,
-)
+from .testing_utils import repo_name, skip_on_windows, with_production_testing
 
 
 logger = logging.get_logger(__name__)
@@ -28,7 +24,7 @@ def get_file_contents(path):
 
 @with_production_testing
 class CacheFileLayoutHfHubDownload(unittest.TestCase):
-    @xfail_on_windows(reason="Symlinks are deactivated in Windows tests.")
+    @skip_on_windows(reason="Symlinks are deactivated in Windows tests.")
     def test_file_downloaded_in_cache(self):
         for revision, expected_reference in (
             (None, "main"),
@@ -130,7 +126,7 @@ def test_file_download_happens_once(self):
 
             self.assertEqual(creation_time_0, creation_time_1)
 
-    @xfail_on_windows(reason="Symlinks are deactivated in Windows tests.")
+    @skip_on_windows(reason="Symlinks are deactivated in Windows tests.")
     def test_file_download_happens_once_intra_revision(self):
         # Tests that a file is only downloaded once if it's not updated, even across different revisions.
 
@@ -145,7 +141,7 @@ def test_file_download_happens_once_intra_revision(self):
 
             self.assertEqual(creation_time_0, creation_time_1)
 
-    @xfail_on_windows(reason="Symlinks are deactivated in Windows tests.")
+    @skip_on_windows(reason="Symlinks are deactivated in Windows tests.")
     def test_multiple_refs_for_same_file(self):
         with SoftTemporaryDirectory() as cache:
             hf_hub_download(MODEL_IDENTIFIER, "file_0.txt", cache_dir=cache)
@@ -179,7 +175,7 @@ def test_multiple_refs_for_same_file(self):
 
 @with_production_testing
 class CacheFileLayoutSnapshotDownload(unittest.TestCase):
-    @xfail_on_windows(reason="Symlinks are deactivated in Windows tests.")
+    @skip_on_windows(reason="Symlinks are deactivated in Windows tests.")
     def test_file_downloaded_in_cache(self):
         with SoftTemporaryDirectory() as cache:
             snapshot_download(MODEL_IDENTIFIER, cache_dir=cache)
@@ -210,7 +206,7 @@ def test_file_downloaded_in_cache(self):
 
             self.assertTrue(all([os.path.isfile(link) for link in resolved_snapshot_links]))
 
-    @xfail_on_windows(reason="Symlinks are deactivated in Windows tests.")
+    @skip_on_windows(reason="Symlinks are deactivated in Windows tests.")
     def test_file_downloaded_in_cache_several_revisions(self):
         with SoftTemporaryDirectory() as cache:
             snapshot_download(MODEL_IDENTIFIER, cache_dir=cache, revision="file-3")

tests/test_file_download.py

@@ -55,9 +55,9 @@
     DUMMY_RENAMED_OLD_MODEL_ID,
     SAMPLE_DATASET_IDENTIFIER,
     repo_name,
+    skip_on_windows,
     use_tmp_repo,
     with_production_testing,
-    xfail_on_windows,
 )
 
 
@@ -224,7 +224,7 @@ def test_file_cached_and_read_only_access(self):
             # Set permission back for cleanup
             _recursive_chmod(tmpdir, 0o777)
 
-    @xfail_on_windows(reason="umask is UNIX-specific")
+    @skip_on_windows(reason="umask is UNIX-specific")
     def test_hf_hub_download_custom_cache_permission(self):
         """Checks `hf_hub_download` respect the cache dir permission.
 
@@ -951,13 +951,13 @@ def test_hf_hub_url_on_awful_subfolder_and_filename(self):
             self.expected_resolve_url,
         )
 
-    @xfail_on_windows(reason="Windows paths cannot contain a '?'.")
+    @skip_on_windows(reason="Windows paths cannot contain a '?'.")
     def test_hf_hub_download_on_awful_filepath(self):
         local_path = hf_hub_download(self.repo_url.repo_id, self.filepath, cache_dir=self.cache_dir)
         # Local path is not url-encoded
         self.assertTrue(local_path.endswith(self.filepath))
 
-    @xfail_on_windows(reason="Windows paths cannot contain a '?'.")
+    @skip_on_windows(reason="Windows paths cannot contain a '?'.")
     def test_hf_hub_download_on_awful_subfolder_and_filename(self):
         local_path = hf_hub_download(
             self.repo_url.repo_id,
@@ -991,11 +991,11 @@ def setUpClass(cls):
     def tearDownClass(cls) -> None:
         cls.api.delete_repo(repo_id=cls.repo_id)
 
-    @xfail_on_windows(reason="Windows paths cannot contain '\\..\\'.", raises=ValueError)
+    @skip_on_windows(reason="Windows paths cannot contain '\\..\\'.")
     def test_download_folder_file_in_cache_dir(self) -> None:
         hf_hub_download(self.repo_id, "folder/..\\..\\..\\file", cache_dir=self.cache_dir)
 
-    @xfail_on_windows(reason="Windows paths cannot contain '\\..\\'.", raises=ValueError)
+    @skip_on_windows(reason="Windows paths cannot contain '\\..\\'.")
     def test_download_folder_file_to_local_dir(self) -> None:
         with SoftTemporaryDirectory() as local_dir:
             hf_hub_download(self.repo_id, "folder/..\\..\\..\\file", cache_dir=self.cache_dir, local_dir=local_dir)

tests/test_utils_cache.py

@@ -10,7 +10,7 @@
 from huggingface_hub.utils import DeleteCacheStrategy, HFCacheInfo, _format_size, scan_cache_dir
 from huggingface_hub.utils._cache_manager import CacheNotFound, _try_delete_path
 
-from .testing_utils import rmtree_with_retry, with_production_testing, xfail_on_windows
+from .testing_utils import rmtree_with_retry, skip_on_windows, with_production_testing
 
 
 # On production server to avoid recreating them all the time
@@ -372,7 +372,7 @@ def test_ref_to_missing_revision(self) -> None:
             + f"({self.repo_path}).",
         )
 
-    @xfail_on_windows("Last modified/last accessed work a bit differently on Windows.")
+    @skip_on_windows("Last modified/last accessed work a bit differently on Windows.")
     def test_scan_cache_last_modified_and_last_accessed(self) -> None:
         """Scan the last_modified and last_accessed properties when scanning."""
         TIME_GAP = 0.1
@@ -697,7 +697,7 @@ def test_delete_path_on_missing_folder(self) -> None:
         assert len(captured.output) > 0
         assert any(f"Couldn't delete TYPE: file not found ({dir_path})" in log for log in captured.output)
 
-    @xfail_on_windows(reason="Permissions are handled differently on Windows.")
+    @skip_on_windows(reason="Permissions are handled differently on Windows.")
     def test_delete_path_on_local_folder_with_wrong_permission(self) -> None:
         """Try to delete a local folder that is protected."""
         dir_path = self.cache_dir / "something"

tests/testing_utils.py

@@ -302,22 +302,17 @@ def _inner_test_function(*args, **kwargs):
     return _inner_decorator
 
 
-def xfail_on_windows(reason: str, raises: Optional[type[Exception]] = None):
+def skip_on_windows(reason: str):
     """
-    Decorator to flag tests that we expect to fail on Windows.
-
-    Will not raise an error if the expected error happens while running on Windows machine.
-    If error is expected but does not happen, the test fails as well.
+    Decorator to flag tests that we want to skip on Windows.
 
     Args:
         reason (`str`):
-            Reason why it should fail.
-        raises (`type[Exception]`):
-            The error type we except to happen.
+            Reason to skip it.
     """
 
     def _inner_decorator(test_function: Callable) -> Callable:
-        return pytest.mark.xfail(os.name == "nt", reason=reason, raises=raises, strict=True, run=True)(test_function)
+        return pytest.mark.skipif(os.name == "nt", reason=reason)(test_function)
 
     return _inner_decorator