The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Normalize extra_model_config.yaml paths to prevent duplicates. (#6885)
Robin Huang29d4384a75ab
diff --git a/tests-unit/utils/extra_config_test.py b/tests-unit/utils/extra_config_test.pyindex 6d232079e..eae1aa3d3 100644--- a/tests-unit/utils/extra_config_test.py+++ b/tests-unit/utils/extra_config_test.py@@ -145,7 +145,7 @@ def test_load_extra_model_paths_expands_appdata(else:expected_base_path = '/Users/TestUser/AppData/Roaming/ComfyUI'expected_calls = [- ('checkpoints', os.path.join(expected_base_path, 'models/checkpoints'), False),+ ('checkpoints', os.path.normpath(os.path.join(expected_base_path, 'models/checkpoints')), False),]assert mock_add_model_folder_path.call_count == len(expected_calls)@@ -197,8 +197,8 @@ def test_load_extra_path_config_relative_base_path(load_extra_path_config(dummy_yaml_name)- expected_checkpoints = os.path.abspath(os.path.join(str(tmp_path), sub_folder, "checkpoints"))- expected_some_value = os.path.abspath(os.path.join(str(tmp_path), sub_folder, "some_value"))+ expected_checkpoints = os.path.abspath(os.path.join(str(tmp_path), "my_rel_base", "checkpoints"))+ expected_some_value = os.path.abspath(os.path.join(str(tmp_path), "my_rel_base", "some_value"))actual_paths = folder_paths.folder_names_and_paths["checkpoints"][0]assert len(actual_paths) == 1, "Should have one path added for 'checkpoints'."diff --git a/utils/extra_config.py b/utils/extra_config.pyindex b7196e36f..a0fcda9e8 100644--- a/utils/extra_config.py+++ b/utils/extra_config.py@@ -29,5 +29,6 @@ def load_extra_path_config(yaml_path):full_path = os.path.join(base_path, full_path)elif not os.path.isabs(full_path):full_path = os.path.abspath(os.path.join(yaml_dir, y))- logging.info("Adding extra search path {} {}".format(x, full_path))- folder_paths.add_model_folder_path(x, full_path, is_default)+ normalized_path = os.path.normpath(full_path)+ logging.info("Adding extra search path {} {}".format(x, normalized_path))+ folder_paths.add_model_folder_path(x, normalized_path, is_default)