From 28fff5d1dbba8b4a546e31c69240133f35b2235f Mon Sep 17 00:00:00 2001 From: EllangoK Date: Thu, 6 Apr 2023 19:06:39 -0400 Subject: [PATCH] fixes lack of support for multi configs also adds some metavars to argarse --- comfy/cli_args.py | 8 ++++---- main.py | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/comfy/cli_args.py b/comfy/cli_args.py index f2960ae3..b6898cea 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -2,12 +2,12 @@ import argparse parser = argparse.ArgumentParser() -parser.add_argument("--listen", nargs="?", const="0.0.0.0", default="127.0.0.1", type=str, help="Specify the IP address to listen on (default: 127.0.0.1). If --listen is provided without an argument, it defaults to 0.0.0.0. (listens on all)") +parser.add_argument("--listen", type=str, default="127.0.0.1", metavar="IP", nargs="?", const="0.0.0.0", help="Specify the IP address to listen on (default: 127.0.0.1). If --listen is provided without an argument, it defaults to 0.0.0.0. (listens on all)") parser.add_argument("--port", type=int, default=8188, help="Set the listen port.") -parser.add_argument("--enable-cors-header", default=None, nargs="?", const="*", help="Enable CORS (Cross-Origin Resource Sharing) with optional origin or allow all with default '*'.") -parser.add_argument("--extra-model-paths-config", type=str, default=None, help="Load an extra_model_paths.yaml file.") +parser.add_argument("--enable-cors-header", type=str, default=None, metavar="ORIGIN", nargs="?", const="*", help="Enable CORS (Cross-Origin Resource Sharing) with optional origin or allow all with default '*'.") +parser.add_argument("--extra-model-paths-config", type=str, default=None, metavar="PATH", nargs='+', action='append', help="Load one or more extra_model_paths.yaml files.") parser.add_argument("--output-directory", type=str, default=None, help="Set the ComfyUI output directory.") -parser.add_argument("--cuda-device", type=int, default=None, help="Set the id of the cuda device this instance will use.") +parser.add_argument("--cuda-device", type=int, default=None, metavar="DEVICE_ID", help="Set the id of the cuda device this instance will use.") parser.add_argument("--dont-upcast-attention", action="store_true", help="Disable upcasting of attention. Can boost speed but increase the chances of black images.") attn_group = parser.add_mutually_exclusive_group() diff --git a/main.py b/main.py index 51a48fc6..9c0a3d8a 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,9 @@ import asyncio +import itertools import os import shutil import threading + from comfy.cli_args import args if os.name == "nt": @@ -94,7 +96,8 @@ if __name__ == "__main__": load_extra_path_config(extra_model_paths_config_path) if args.extra_model_paths_config: - load_extra_path_config(args.extra_model_paths_config) + for config_path in itertools.chain(*args.extra_model_paths_config): + load_extra_path_config(config_path) if args.output_directory: output_dir = os.path.abspath(args.output_directory)