From fdfd81aa27c37480f0f53a0ad0cf0b9fbf7f2059 Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Sun, 26 Jan 2025 05:17:47 +1100 Subject: [PATCH] nit - Reorder default_paths back top top of file. --- folder_paths.py | 73 +++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/folder_paths.py b/folder_paths.py index 370354a4d..83da535fa 100644 --- a/folder_paths.py +++ b/folder_paths.py @@ -14,6 +14,43 @@ supported_pt_extensions: set[str] = {'.ckpt', '.pt', '.bin', '.pth', '.safetenso folder_names_and_paths: dict[str, tuple[list[str], set[str] | list[str]]] = {} filename_list_cache: dict[str, tuple[list[str], dict[str, float], float]] = {} + +class DefaultModelSubdirOptions(TypedDict, total=False): + extensions: set[str] | list[str] + alternate_names: list[str] + + +# Default models subdirs +default_paths: dict[str, DefaultModelSubdirOptions] = { + "checkpoints": {}, + "configs": { + "extensions": [".yaml"], + }, + "loras": {}, + "vae": {}, + "text_encoders": { + "alternate_names": ["clip"], + }, + "clip_vision": {}, + "style_models": {}, + "embeddings": {}, + "diffusers": { + "extensions": ["folder"], + }, + "vae_approx": {}, + "controlnet": { + "alternate_names": ["t2i_adapter"], + }, + "gligen": {}, + "upscale_models": {}, + "hypernetworks": {}, + "photomaker": {}, + "classifiers": { + "extensions": {""}, + }, +} + + class CacheHelper: """ Helper class for managing file list cache data. @@ -355,42 +392,6 @@ def get_save_image_path(filename_prefix: str, output_dir: str, image_width=0, im return full_output_folder, filename, counter, subfolder, filename_prefix -class DefaultModelSubdirOptions(TypedDict, total=False): - extensions: set[str] | list[str] - alternate_names: list[str] - - -# Default models subdirs -default_paths: dict[str, DefaultModelSubdirOptions] = { - "checkpoints": {}, - "configs": { - "extensions": [".yaml"], - }, - "loras": {}, - "vae": {}, - "text_encoders": { - "alternate_names": ["clip"], - }, - "clip_vision": {}, - "style_models": {}, - "embeddings": {}, - "diffusers": { - "extensions": ["folder"], - }, - "vae_approx": {}, - "controlnet": { - "alternate_names": ["t2i_adapter"], - }, - "gligen": {}, - "upscale_models": {}, - "hypernetworks": {}, - "photomaker": {}, - "classifiers": { - "extensions": {""}, - }, -} - - def reset_all_paths(new_base_path: str) -> None: """ Internal use only. Designed for use immediately after startup.