Merge remote-tracking branch 'upstream/master' into sub-quad_attn_opt

1 files changed, 13 insertions, 5 deletions

diff --git a/webui.py b/webui.py
index c7d55a97..d89e0fb5 100644
--- a/webui.py
+++ b/webui.py
@@ -9,7 +9,7 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware

 from fastapi.middleware.gzip import GZipMiddleware

 

-from modules import import_hook

+from modules import import_hook, errors

 from modules.call_queue import wrap_queued_call, queue_lock, wrap_gradio_gpu_call

 from modules.paths import script_path

 

@@ -61,7 +61,15 @@ def initialize():
     modelloader.load_upscalers()

 

     modules.sd_vae.refresh_vae_list()

-    modules.sd_models.load_model()

+

+    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)

+

     shared.opts.onchange("sd_model_checkpoint", wrap_queued_call(lambda: modules.sd_models.reload_model_weights()))

     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)

@@ -92,11 +100,11 @@ def initialize():
 

 def setup_cors(app):

     if cmd_opts.cors_allow_origins and cmd_opts.cors_allow_origins_regex:

-        app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'])

+        app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'], allow_credentials=True, allow_headers=['*'])

     elif cmd_opts.cors_allow_origins:

-        app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_methods=['*'])

+        app.add_middleware(CORSMiddleware, allow_origins=cmd_opts.cors_allow_origins.split(','), allow_methods=['*'], allow_credentials=True, allow_headers=['*'])

     elif cmd_opts.cors_allow_origins_regex:

-        app.add_middleware(CORSMiddleware, allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'])

+        app.add_middleware(CORSMiddleware, allow_origin_regex=cmd_opts.cors_allow_origins_regex, allow_methods=['*'], allow_credentials=True, allow_headers=['*'])

 

 

 def create_api(app):