From 643797bca9da66cfdd1a5cb65bd54f41211f567e Mon Sep 17 00:00:00 2001
From: space-nuko <24979496+space-nuko@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:51:35 -0500
Subject: [PATCH] Default for extra model paths

---
 comfy/cli_args.py     | 27 ++++++++++++++++++++++-----
 config.yaml           |  2 +-
 test/test_cli_args.py |  4 ++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/comfy/cli_args.py b/comfy/cli_args.py
index 40e948fd9..7c9c38695 100644
--- a/comfy/cli_args.py
+++ b/comfy/cli_args.py
@@ -4,6 +4,7 @@ import pprint
 import argparse
 import ruamel.yaml
 import folder_paths
+import copy
 
 yaml = ruamel.yaml.YAML()
 yaml.default_flow_style = False
@@ -225,9 +226,10 @@ class OptionInfoRaw:
     Raw YAML input and output, ignores argparse entirely
     """
 
-    def __init__(self, name, help=None):
+    def __init__(self, name, help=None, default=None):
         self.name = name
         self.help = help
+        self.default = default or {}
         self.parser_args = {}
         self.raw_output = True
 
@@ -238,13 +240,13 @@ class OptionInfoRaw:
         return self.help
 
     def get_arg_defaults(self, parser):
-        return { self.name: {} }
+        return { self.name: copy.copy(self.default) }
 
     def convert_to_args_array(self, value):
         return { self.name: value }
 
     def convert_to_file_option(self, parser, args):
-        return args.get(self.name.replace("-", "_"), {})
+        return args.get(self.name.replace("-", "_"), copy.copy(self.default))
 
     def validate(self, config_options, cli_args):
         pass
@@ -253,6 +255,21 @@ class OptionInfoRaw:
 # Config options
 #
 
+DEFAULT_EXTRA_MODEL_PATHS_CONFIG = yaml.load("""
+a1111:
+  base_path: path/to/stable-diffusion-webui/
+  checkpoints: models/Stable-diffusion
+  configs: models/Stable-diffusion
+  vae: models/VAE
+  loras: models/Lora
+  upscale_models: |
+    models/ESRGAN
+    models/SwinIR
+  embeddings: embeddings
+  hypernetworks: models/hypernetworks
+  controlnet: models/ControlNet
+""")
+
 CONFIG_OPTIONS = [
     ("network", [
         OptionInfo("listen", type=str, default="127.0.0.1", metavar="IP", nargs="?", const="0.0.0.0",
@@ -262,7 +279,7 @@ CONFIG_OPTIONS = [
                    help="Enable CORS (Cross-Origin Resource Sharing) with optional origin or allow all with default '*'."),
     ]),
     ("files", [
-        OptionInfoRaw("extra-model-paths", help="Extra paths to scan for model files."),
+        OptionInfoRaw("extra-model-paths", help="Extra paths to scan for model files.", default=DEFAULT_EXTRA_MODEL_PATHS_CONFIG),
         OptionInfo("output-directory", type=str, default=None, help="Set the ComfyUI output directory. Leave empty to use the default."),
     ]),
     ("behavior", [
@@ -362,7 +379,7 @@ class ComfyConfigLoader:
         return defaults
 
     def load_from_string(self, raw_config):
-        raw_config = yaml.load(raw_config)
+        raw_config = yaml.load(raw_config) or {}
 
         config = {}
         root = raw_config.get("config", {})
diff --git a/config.yaml b/config.yaml
index fff66f10a..023376ce1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -16,7 +16,7 @@ config:
 
     # Extra paths to scan for model files.
     extra_model_paths:
-      a111:
+      a1111:
         base_path: path/to/stable-diffusion-webui/
         checkpoints: models/Stable-diffusion
         configs: models/Stable-diffusion
diff --git a/test/test_cli_args.py b/test/test_cli_args.py
index 20ceddd6e..1e3ac26fc 100644
--- a/test/test_cli_args.py
+++ b/test/test_cli_args.py
@@ -10,6 +10,10 @@ def test_defaults():
     assert args.listen == "127.0.0.1"
     assert args.novram == False
 
+    extra_paths = args.extra_model_paths.get("a1111")
+    assert extra_paths is not None
+    assert extra_paths.get("base_path") == "path/to/stable-diffusion-webui/"
+
 
 def test_config():
     config = """