From ba05e327896898eb73caec3ed710fe45d1e38732 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 2 Sep 2023 14:12:59 +0900
Subject: update cmd arg description

---
 modules/cmd_args.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/cmd_args.py')

diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index aab62286..a77c7e77 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -112,8 +112,8 @@ parser.add_argument("--skip-version-check", action='store_true', help="Do not ch
 parser.add_argument("--no-hashing", action='store_true', help="disable sha256 hashing of checkpoints to help loading performance", default=False)
 parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False)
 parser.add_argument('--subpath', type=str, help='customize the subpath for gradio, use with reverse proxy')
-parser.add_argument('--add-stop-route', action='store_true', help='add /_stop route to stop server')
+parser.add_argument('--add-stop-route', action='store_true', help='does not do anything')
 parser.add_argument('--api-server-stop', action='store_true', help='enable server stop/restart/kill via api')
 parser.add_argument('--timeout-keep-alive', type=int, default=30, help='set timeout_keep_alive for uvicorn')
 parser.add_argument("--disable-all-extensions", action='store_true', help="prevent all extensions from running regardless of any other settings", default=False)
-parser.add_argument("--disable-extra-extensions", action='store_true', help=" prevent all extensions except built-in from running regardless of any other settings", default=False)
+parser.add_argument("--disable-extra-extensions", action='store_true', help="prevent all extensions except built-in from running regardless of any other settings", default=False)
-- 
cgit v1.2.3


From 46ef1857098df7610c36e73903731e486feca927 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 9 Sep 2023 15:53:10 +0900
Subject: deprecate --enable-console-prompts

use --enable-console-prompts as the default value for shared.opts.enable_console_prompts
---
 modules/cmd_args.py       | 2 +-
 modules/img2img.py        | 2 +-
 modules/shared_options.py | 2 +-
 modules/txt2img.py        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/cmd_args.py')

diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index aab62286..fe4d4ecc 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -90,7 +90,7 @@ parser.add_argument("--autolaunch", action='store_true', help="open the webui UR
 parser.add_argument("--theme", type=str, help="launches the UI with light or dark theme", default=None)
 parser.add_argument("--use-textbox-seed", action='store_true', help="use textbox for seeds in UI (no up/down, but possible to input long seeds)", default=False)
 parser.add_argument("--disable-console-progressbars", action='store_true', help="do not output progressbars to console", default=False)
-parser.add_argument("--enable-console-prompts", action='store_true', help="print prompts to console when generating with txt2img and img2img", default=False)
+parser.add_argument("--enable-console-prompts", action='store_true', help="does not do anything", default=False)  # Legacy compatibility, use as default value shared.opts.enable_console_prompts
 parser.add_argument('--vae-path', type=str, help='Checkpoint to use as VAE; setting this argument disables all settings related to VAE', default=None)
 parser.add_argument("--disable-safe-unpickle", action='store_true', help="disable checking pytorch models for malicious code", default=False)
 parser.add_argument("--api", action='store_true', help="use api=True to launch the API together with the webui (use --nowebui instead for only the API)")
diff --git a/modules/img2img.py b/modules/img2img.py
index cbd80bac..72ee7bc2 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -199,7 +199,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
 
     p.user = request.username
 
-    if shared.opts.enable_console_prompts or shared.cmd_opts.enable_console_prompts:
+    if shared.opts.enable_console_prompts:
         print(f"\nimg2img: {prompt}", file=shared.progress_print_out)
 
     if mask:
diff --git a/modules/shared_options.py b/modules/shared_options.py
index 44fb1670..1ea5c8f8 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -100,7 +100,7 @@ options_templates.update(options_section(('face-restoration', "Face restoration"
 
 options_templates.update(options_section(('system', "System"), {
     "auto_launch_browser": OptionInfo("Local", "Automatically open webui in browser on startup", gr.Radio, lambda: {"choices": ["Disable", "Local", "Remote"]}),
-    "enable_console_prompts": OptionInfo(False, "Print prompts to console when generating with txt2img and img2img."),
+    "enable_console_prompts": OptionInfo(shared.cmd_opts.enable_console_prompts, "Print prompts to console when generating with txt2img and img2img."),
     "show_warnings": OptionInfo(False, "Show warnings in console.").needs_reload_ui(),
     "show_gradio_deprecation_warnings": OptionInfo(True, "Show gradio deprecation warnings in console.").needs_reload_ui(),
     "memmon_poll_rate": OptionInfo(8, "VRAM usage polls per second during generation.", gr.Slider, {"minimum": 0, "maximum": 40, "step": 1}).info("0 = disable"),
diff --git a/modules/txt2img.py b/modules/txt2img.py
index 379ef859..721206dd 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -45,7 +45,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
 
     p.user = request.username
 
-    if shared.opts.enable_console_prompts or cmd_opts.enable_console_prompts:
+    if shared.opts.enable_console_prompts:
         print(f"\ntxt2img: {prompt}", file=shared.progress_print_out)
 
     with closing(p):
-- 
cgit v1.2.3


From ab3d3528a18ea1a81f1af22ea71bfc0d8c710dde Mon Sep 17 00:00:00 2001
From: Leon <yongliang.zhao@happyelements.com>
Date: Thu, 14 Sep 2023 18:42:56 +0800
Subject: add --skip-load-model-at-start

---
 modules/cmd_args.py   | 1 +
 modules/initialize.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/cmd_args.py')

diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 5be879dd..4e602a84 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -117,3 +117,4 @@ parser.add_argument('--api-server-stop', action='store_true', help='enable serve
 parser.add_argument('--timeout-keep-alive', type=int, default=30, help='set timeout_keep_alive for uvicorn')
 parser.add_argument("--disable-all-extensions", action='store_true', help="prevent all extensions from running regardless of any other settings", default=False)
 parser.add_argument("--disable-extra-extensions", action='store_true', help="prevent all extensions except built-in from running regardless of any other settings", default=False)
+parser.add_argument("--skip-load-model-at-start", action='store_true', help="if load a model at web start, only take effect when --nowebui", )
diff --git a/modules/initialize.py b/modules/initialize.py
index f24f7637..ac95fc6f 100644
--- a/modules/initialize.py
+++ b/modules/initialize.py
@@ -151,8 +151,8 @@ def initialize_rest(*, reload_script_modules=False):
 
         from modules import devices
         devices.first_time_calculation()
-
-    Thread(target=load_model).start()
+    if not shared.cmd_opts.skip_load_model_at_start:
+        Thread(target=load_model).start()
 
     from modules import shared_items
     shared_items.reload_hypernetworks()
-- 
cgit v1.2.3


From 2b06cefe66684ed2648d3221efbc36aeaae99a2f Mon Sep 17 00:00:00 2001
From: gibiee <37574274+gibiee@users.noreply.github.com>
Date: Sun, 5 Nov 2023 11:37:23 +0900
Subject: correct a typo

modify "defaul" to "default"
---
 modules/cmd_args.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/cmd_args.py')

diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 4e602a84..a9fb9bfa 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -107,7 +107,7 @@ parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, req
 parser.add_argument("--disable-tls-verify", action="store_false", help="When passed, enables the use of self-signed certificates.", default=None)
 parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None)
 parser.add_argument("--gradio-queue", action='store_true', help="does not do anything", default=True)
-parser.add_argument("--no-gradio-queue", action='store_true', help="Disables gradio queue; causes the webpage to use http requests instead of websockets; was the defaul in earlier versions")
+parser.add_argument("--no-gradio-queue", action='store_true', help="Disables gradio queue; causes the webpage to use http requests instead of websockets; was the default in earlier versions")
 parser.add_argument("--skip-version-check", action='store_true', help="Do not check versions of torch and xformers")
 parser.add_argument("--no-hashing", action='store_true', help="disable sha256 hashing of checkpoints to help loading performance", default=False)
 parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False)
-- 
cgit v1.2.3