diff --git a/tests/test_loader_glob_skip.py b/tests/test_loader_glob_skip.py index 9ca77bd9ee..d461e23cf8 100644 --- a/tests/test_loader_glob_skip.py +++ b/tests/test_loader_glob_skip.py @@ -14,7 +14,9 @@ from unittest.mock import MagicMock, patch class TestGlobSkippedWhenNotBothConfigs(unittest.TestCase): """Verify HfFileSystem.glob is not called when is_model or is_peft is False.""" - def _run_both_exist_block(self, is_model, is_peft, supports_llama32, model_name, is_local_dir=False): + def _run_both_exist_block( + self, is_model, is_peft, supports_llama32, model_name, is_local_dir = False + ): """Simulate the both_exist detection block from loader.py. This mirrors the exact logic at lines 500-517 / 1276-1292 of loader.py. @@ -23,10 +25,12 @@ class TestGlobSkippedWhenNotBothConfigs(unittest.TestCase): from unittest.mock import MagicMock both_exist = (is_model and is_peft) and not supports_llama32 - glob_mock = MagicMock(return_value=[ - f"{model_name}/config.json", - f"{model_name}/adapter_config.json", - ]) + glob_mock = MagicMock( + return_value = [ + f"{model_name}/config.json", + f"{model_name}/adapter_config.json", + ] + ) # This mirrors the guarded block in loader.py if supports_llama32 and is_model and is_peft: @@ -36,7 +40,10 @@ class TestGlobSkippedWhenNotBothConfigs(unittest.TestCase): else: files = glob_mock(f"{model_name}/*.json") files = list(os.path.split(x)[-1] for x in files) - if sum(x == "adapter_config.json" or x == "config.json" for x in files) >= 2: + if ( + sum(x == "adapter_config.json" or x == "config.json" for x in files) + >= 2 + ): both_exist = True return both_exist, glob_mock.called @@ -45,34 +52,44 @@ class TestGlobSkippedWhenNotBothConfigs(unittest.TestCase): def test_glob_skipped_when_is_model_false(self): both_exist, glob_called = self._run_both_exist_block( - is_model=False, is_peft=True, supports_llama32=True, - model_name="org/some-adapter", + is_model = False, + is_peft = True, + supports_llama32 = True, + model_name = "org/some-adapter", ) self.assertFalse(glob_called, "glob should not be called when is_model=False") self.assertFalse(both_exist) def test_glob_skipped_when_is_peft_false(self): both_exist, glob_called = self._run_both_exist_block( - is_model=True, is_peft=False, supports_llama32=True, - model_name="org/some-model", + is_model = True, + is_peft = False, + supports_llama32 = True, + model_name = "org/some-model", ) self.assertFalse(glob_called, "glob should not be called when is_peft=False") self.assertFalse(both_exist) def test_glob_skipped_when_both_false(self): both_exist, glob_called = self._run_both_exist_block( - is_model=False, is_peft=False, supports_llama32=True, - model_name="org/bad-repo", + is_model = False, + is_peft = False, + supports_llama32 = True, + model_name = "org/bad-repo", ) self.assertFalse(glob_called, "glob should not be called when both are False") self.assertFalse(both_exist) def test_glob_skipped_when_supports_llama32_false(self): both_exist, glob_called = self._run_both_exist_block( - is_model=True, is_peft=True, supports_llama32=False, - model_name="org/some-model", + is_model = True, + is_peft = True, + supports_llama32 = False, + model_name = "org/some-model", + ) + self.assertFalse( + glob_called, "glob should not be called when SUPPORTS_LLAMA32=False" ) - self.assertFalse(glob_called, "glob should not be called when SUPPORTS_LLAMA32=False") # both_exist is set by the old-style check: (is_model and is_peft) and not SUPPORTS_LLAMA32 self.assertTrue(both_exist) @@ -80,16 +97,23 @@ class TestGlobSkippedWhenNotBothConfigs(unittest.TestCase): def test_glob_called_when_both_true_and_supports_llama32(self): both_exist, glob_called = self._run_both_exist_block( - is_model=True, is_peft=True, supports_llama32=True, - model_name="org/mixed-repo", + is_model = True, + is_peft = True, + supports_llama32 = True, + model_name = "org/mixed-repo", + ) + self.assertTrue( + glob_called, "glob should be called when is_model and is_peft are both True" ) - self.assertTrue(glob_called, "glob should be called when is_model and is_peft are both True") self.assertTrue(both_exist) def test_local_dir_skips_glob(self): both_exist, glob_called = self._run_both_exist_block( - is_model=True, is_peft=True, supports_llama32=True, - model_name="/local/path/to/model", is_local_dir=True, + is_model = True, + is_peft = True, + supports_llama32 = True, + model_name = "/local/path/to/model", + is_local_dir = True, ) self.assertFalse(glob_called, "glob should not be called for local directories") self.assertTrue(both_exist) @@ -109,13 +133,15 @@ class TestLoaderSourceHasGuard(unittest.TestCase): # Find all lines with the SUPPORTS_LLAMA32 check near glob usage lines = source.splitlines() guard_lines = [ - line.strip() for line in lines + line.strip() + for line in lines if "SUPPORTS_LLAMA32" in line and "if " in line and "is_model" in line ] # There should be exactly 2 guarded checks (one per from_pretrained method) self.assertEqual( - len(guard_lines), 2, - f"Expected 2 guarded SUPPORTS_LLAMA32 checks with is_model/is_peft, found {len(guard_lines)}: {guard_lines}" + len(guard_lines), + 2, + f"Expected 2 guarded SUPPORTS_LLAMA32 checks with is_model/is_peft, found {len(guard_lines)}: {guard_lines}", ) for line in guard_lines: self.assertIn("is_model", line)