diff --git a/comfy/cmd/folder_paths.py b/comfy/cmd/folder_paths.py index 94a938402..d405a63d9 100644 --- a/comfy/cmd/folder_paths.py +++ b/comfy/cmd/folder_paths.py @@ -1,6 +1,7 @@ import os import sys import time +from pkg_resources import resource_filename from ..cli_args import args @@ -21,8 +22,7 @@ else: base_path = os.getcwd() models_dir = os.path.join(base_path, "models") folder_names_and_paths["checkpoints"] = ([os.path.join(models_dir, "checkpoints")], supported_pt_extensions) -folder_names_and_paths["configs"] = ([os.path.join(models_dir, "configs")], [".yaml"]) - +folder_names_and_paths["configs"] = ([os.path.join(models_dir, "configs"), resource_filename("comfy", "configs/")], [".yaml"]) folder_names_and_paths["loras"] = ([os.path.join(models_dir, "loras")], supported_pt_extensions) folder_names_and_paths["vae"] = ([os.path.join(models_dir, "vae")], supported_pt_extensions) folder_names_and_paths["clip"] = ([os.path.join(models_dir, "clip")], supported_pt_extensions) diff --git a/models/configs/anything_v3.yaml b/comfy/configs/anything_v3.yaml similarity index 100% rename from models/configs/anything_v3.yaml rename to comfy/configs/anything_v3.yaml diff --git a/models/configs/v1-inference.yaml b/comfy/configs/v1-inference.yaml similarity index 100% rename from models/configs/v1-inference.yaml rename to comfy/configs/v1-inference.yaml diff --git a/models/configs/v1-inference_clip_skip_2.yaml b/comfy/configs/v1-inference_clip_skip_2.yaml similarity index 100% rename from models/configs/v1-inference_clip_skip_2.yaml rename to comfy/configs/v1-inference_clip_skip_2.yaml diff --git a/models/configs/v1-inference_clip_skip_2_fp16.yaml b/comfy/configs/v1-inference_clip_skip_2_fp16.yaml similarity index 100% rename from models/configs/v1-inference_clip_skip_2_fp16.yaml rename to comfy/configs/v1-inference_clip_skip_2_fp16.yaml diff --git a/models/configs/v1-inference_fp16.yaml b/comfy/configs/v1-inference_fp16.yaml similarity index 100% rename from models/configs/v1-inference_fp16.yaml rename to comfy/configs/v1-inference_fp16.yaml diff --git a/models/configs/v1-inpainting-inference.yaml b/comfy/configs/v1-inpainting-inference.yaml similarity index 100% rename from models/configs/v1-inpainting-inference.yaml rename to comfy/configs/v1-inpainting-inference.yaml diff --git a/models/configs/v2-inference-v.yaml b/comfy/configs/v2-inference-v.yaml similarity index 100% rename from models/configs/v2-inference-v.yaml rename to comfy/configs/v2-inference-v.yaml diff --git a/models/configs/v2-inference-v_fp32.yaml b/comfy/configs/v2-inference-v_fp32.yaml similarity index 100% rename from models/configs/v2-inference-v_fp32.yaml rename to comfy/configs/v2-inference-v_fp32.yaml diff --git a/models/configs/v2-inference.yaml b/comfy/configs/v2-inference.yaml similarity index 100% rename from models/configs/v2-inference.yaml rename to comfy/configs/v2-inference.yaml diff --git a/models/configs/v2-inference_fp32.yaml b/comfy/configs/v2-inference_fp32.yaml similarity index 100% rename from models/configs/v2-inference_fp32.yaml rename to comfy/configs/v2-inference_fp32.yaml diff --git a/models/configs/v2-inpainting-inference.yaml b/comfy/configs/v2-inpainting-inference.yaml similarity index 100% rename from models/configs/v2-inpainting-inference.yaml rename to comfy/configs/v2-inpainting-inference.yaml diff --git a/comfy/nodes/base_nodes.py b/comfy/nodes/base_nodes.py index 6b99cec9f..7d267de08 100644 --- a/comfy/nodes/base_nodes.py +++ b/comfy/nodes/base_nodes.py @@ -8,6 +8,7 @@ import random from PIL import Image, ImageOps, ImageSequence from PIL.PngImagePlugin import PngInfo +from pkg_resources import resource_filename import numpy as np import safetensors.torch diff --git a/models/configs/put_configs_here b/models/configs/put_configs_here new file mode 100644 index 000000000..e69de29bb