Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion swift/utils/hub_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def safe_snapshot_download(model_id_or_path: str,
'*.ot', '*.h5'
]
if not download_model:
ignore_patterns += ['*.bin', '*.safetensors']
ignore_patterns = [*ignore_patterns, '*.bin', '*.safetensors']
hub = get_hub(use_hf)
if model_id_or_path.startswith('~'):
model_id_or_path = os.path.abspath(os.path.expanduser(model_id_or_path))
Expand Down
20 changes: 19 additions & 1 deletion tests/utils/test_hub_utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import os
import tempfile
import unittest
from contextlib import nullcontext
from unittest.mock import MagicMock, patch

from swift.utils.hub_utils import download_file, download_ms_file
from swift.utils.hub_utils import download_file, download_ms_file, safe_snapshot_download


class TestHubUtils(unittest.TestCase):
Expand Down Expand Up @@ -86,6 +87,23 @@ def test_download_file_uses_a_distinct_cache_path_for_each_url(self, mock_cache_
self.assertEqual(f.read(), b'second')
self.assertEqual(mock_get.call_count, 2)

@patch('swift.utils.hub_utils.safe_ddp_context', side_effect=lambda **kwargs: nullcontext())
@patch('swift.hub.get_hub')
def test_metadata_download_does_not_mutate_caller_ignore_patterns(self, mock_get_hub, _mock_safe_ddp_context):
hub = MagicMock()
hub.download_model.return_value = self.tmp_dir
mock_get_hub.return_value = hub
ignore_patterns = ['custom/*']

safe_snapshot_download('org/model', download_model=False, ignore_patterns=ignore_patterns)

self.assertEqual(ignore_patterns, ['custom/*'])
self.assertEqual(hub.download_model.call_args_list[0].args[2], ['custom/*', '*.bin', '*.safetensors'])

safe_snapshot_download('org/model', download_model=True, ignore_patterns=ignore_patterns)

self.assertEqual(hub.download_model.call_args_list[1].args[2], ['custom/*'])


if __name__ == '__main__':
unittest.main()
Loading