From b2f6e0704e178f64881f507f3a48ff36e63e1a62 Mon Sep 17 00:00:00 2001 From: catalpaaa Date: Tue, 25 Apr 2023 07:27:24 -0700 Subject: add subpath support --- webui.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'webui.py') diff --git a/webui.py b/webui.py index b570895f..d8997819 100644 --- a/webui.py +++ b/webui.py @@ -290,6 +290,11 @@ def webui(): print(f"Startup time: {startup_timer.summary()}.") + if cmd_opts.subpath: + redirector = FastAPI() + redirector.get("/") + mounted_app = gradio.mount_gradio_app(redirector, shared.demo, path=f"/{cmd_opts.subpath}") + wait_on_server(shared.demo) print('Restarting UI...') -- cgit v1.2.3 From b1717c0a4804f8ed3bb8cc2f3aea5d095778b447 Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Tue, 2 May 2023 09:08:00 +0300 Subject: do not load wait for shared.sd_model to load at startup --- webui.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'webui.py') diff --git a/webui.py b/webui.py index 357bf4c1..0873a26c 100644 --- a/webui.py +++ b/webui.py @@ -6,6 +6,8 @@ import signal import re import warnings import json +from threading import Thread + from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.gzip import GZipMiddleware @@ -191,18 +193,10 @@ def initialize(): modules.textual_inversion.textual_inversion.list_textual_inversion_templates() startup_timer.record("refresh textual inversion templates") - try: - modules.sd_models.load_model() - except Exception as e: - errors.display(e, "loading stable diffusion model") - print("", file=sys.stderr) - print("Stable diffusion model failed to load, exiting", file=sys.stderr) - exit(1) - startup_timer.record("load SD checkpoint") - - shared.opts.data["sd_model_checkpoint"] = shared.sd_model.sd_checkpoint_info.title + # load model in parallel to other startup stuff + Thread(target=lambda: shared.sd_model).start() - shared.opts.onchange("sd_model_checkpoint", wrap_queued_call(lambda: modules.sd_models.reload_model_weights())) + shared.opts.onchange("sd_model_checkpoint", wrap_queued_call(lambda: modules.sd_models.reload_model_weights()), call=False) shared.opts.onchange("sd_vae", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False) shared.opts.onchange("sd_vae_as_default", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False) shared.opts.onchange("temp_dir", ui_tempdir.on_tmpdir_changed) -- cgit v1.2.3 From efe98ca0900bdf1098a5a957f576b86e4ddebbea Mon Sep 17 00:00:00 2001 From: Acncagua Slt Date: Wed, 3 May 2023 00:44:16 +0900 Subject: Initialize the upscalers Add modelloader.load_upscalers to def initialize() --- webui.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'webui.py') diff --git a/webui.py b/webui.py index 357bf4c1..dd385a38 100644 --- a/webui.py +++ b/webui.py @@ -185,6 +185,9 @@ def initialize(): modules.scripts.load_scripts() startup_timer.record("load scripts") + modelloader.load_upscalers() + #startup_timer.record("load upscalers") #Is this necessary? I don't know. + modules.sd_vae.refresh_vae_list() startup_timer.record("refresh VAE") -- cgit v1.2.3 From 5427b7128db9656038bebc0a0240ee122b98e6b9 Mon Sep 17 00:00:00 2001 From: mouhao Date: Sun, 7 May 2023 20:54:48 +0800 Subject: Update webui.py Fix missing /docs endpoint in newer gradio versions Newer versions of gradio (>=3.27.1) have removed the /docs endpoint by default. This commit adds it back to enable accessing the API documentation. --- webui.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'webui.py') diff --git a/webui.py b/webui.py index 357bf4c1..a3dfdcee 100644 --- a/webui.py +++ b/webui.py @@ -286,6 +286,11 @@ def api_only(): print(f"Startup time: {startup_timer.summary()}.") api.launch(server_name="0.0.0.0" if cmd_opts.listen else "127.0.0.1", port=cmd_opts.port if cmd_opts.port else 7861) +# patch in url for api docs +def my_setup(self): + self.docs_url = "/docs" + self.redoc_url = "/redoc" + self.orig_setup() def webui(): launch_api = cmd_opts.api @@ -313,6 +318,9 @@ def webui(): for line in file.readlines(): gradio_auth_creds += [x.strip() for x in line.split(',') if x.strip()] + if launch_api: + FastAPI.orig_setup = FastAPI.setup + setattr(FastAPI, "setup", my_setup) app, local_url, share_url = shared.demo.launch( share=cmd_opts.share, server_name=server_name, -- cgit v1.2.3 From 160780283a991f56b5671402f2cd3830f8f2a66b Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Mon, 8 May 2023 07:57:17 +0300 Subject: put all code for /docs in same place and make it work properly with UI reloads --- webui.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'webui.py') diff --git a/webui.py b/webui.py index 8ffb0844..3ecc3f07 100644 --- a/webui.py +++ b/webui.py @@ -280,12 +280,6 @@ def api_only(): print(f"Startup time: {startup_timer.summary()}.") api.launch(server_name="0.0.0.0" if cmd_opts.listen else "127.0.0.1", port=cmd_opts.port if cmd_opts.port else 7861) -# patch in url for api docs -def my_setup(self): - self.docs_url = "/docs" - self.redoc_url = "/redoc" - self.orig_setup() - def webui(): launch_api = cmd_opts.api initialize() @@ -312,9 +306,16 @@ def webui(): for line in file.readlines(): gradio_auth_creds += [x.strip() for x in line.split(',') if x.strip()] - if launch_api: - FastAPI.orig_setup = FastAPI.setup - setattr(FastAPI, "setup", my_setup) + # this restores the missing /docs endpoint + if launch_api and not hasattr(FastAPI, 'original_setup'): + def fastapi_setup(self): + self.docs_url = "/docs" + self.redoc_url = "/redoc" + self.original_setup() + + FastAPI.original_setup = FastAPI.setup + FastAPI.setup = fastapi_setup + app, local_url, share_url = shared.demo.launch( share=cmd_opts.share, server_name=server_name, -- cgit v1.2.3 From 2b96a7b694d3392f76940dfe5df895a2833400fb Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Mon, 8 May 2023 16:46:35 +0300 Subject: add links to wiki for filename pattern settings add extended info for quicksettings setting --- webui.py | 1 + 1 file changed, 1 insertion(+) (limited to 'webui.py') diff --git a/webui.py b/webui.py index f770db54..727ebd31 100644 --- a/webui.py +++ b/webui.py @@ -345,6 +345,7 @@ def webui(): setup_middleware(app) modules.progress.setup_progress_api(app) + modules.ui.setup_ui_api(app) if launch_api: create_api(app) -- cgit v1.2.3