Merge branch 'master' into gradient-clipping

1 files changed, 32 insertions, 6 deletions

diff --git a/webui.py b/webui.py
index 81df09dd..f4f1d74d 100644
--- a/webui.py
+++ b/webui.py
@@ -5,11 +5,12 @@ import importlib
 import signal

 import threading

 from fastapi import FastAPI

+from fastapi.middleware.cors import CORSMiddleware

 from fastapi.middleware.gzip import GZipMiddleware

 

 from modules.paths import script_path

 

-from modules import devices, sd_samplers, upscaler, extensions

+from modules import devices, sd_samplers, upscaler, extensions, localization

 import modules.codeformer_model as codeformer

 import modules.extras

 import modules.face_restoration

@@ -27,14 +28,12 @@ import modules.txt2img
 import modules.script_callbacks

 

 import modules.ui

-from modules import devices

 from modules import modelloader

-from modules.paths import script_path

 from modules.shared import cmd_opts

 import modules.hypernetworks.hypernetwork

 

 queue_lock = threading.Lock()

-

+server_name = "0.0.0.0" if cmd_opts.listen else cmd_opts.server_name

 

 def wrap_queued_call(func):

     def f(*args, **kwargs):

@@ -58,11 +57,12 @@ def wrap_gradio_gpu_call(func, extra_outputs=None):
 

         return res

 

-    return modules.ui.wrap_gradio_call(f, extra_outputs=extra_outputs)

+    return modules.ui.wrap_gradio_call(f, extra_outputs=extra_outputs, add_stats=True)

 

 

 def initialize():

     extensions.list_extensions()

+    localization.list_localizations(cmd_opts.localizations_dir)

 

     if cmd_opts.ui_debug_mode:

         shared.sd_upscalers = upscaler.UpscalerLanczos().scalers

@@ -85,6 +85,19 @@ def initialize():
     shared.opts.onchange("sd_hypernetwork", wrap_queued_call(lambda: modules.hypernetworks.hypernetwork.load_hypernetwork(shared.opts.sd_hypernetwork)))

     shared.opts.onchange("sd_hypernetwork_strength", modules.hypernetworks.hypernetwork.apply_strength)

 

+    if cmd_opts.tls_keyfile is not None and cmd_opts.tls_keyfile is not None:

+

+        try:

+            if not os.path.exists(cmd_opts.tls_keyfile):

+                print("Invalid path to TLS keyfile given")

+            if not os.path.exists(cmd_opts.tls_certfile):

+                print(f"Invalid path to TLS certfile: '{cmd_opts.tls_certfile}'")

+        except TypeError:

+            cmd_opts.tls_keyfile = cmd_opts.tls_certfile = None

+            print("TLS setup invalid, running webui without TLS")

+        else:

+            print("Running with TLS")

+

     # make the program just exit at ctrl+c without waiting for anything

     def sigint_handler(sig, frame):

         print(f'Interrupted with signal {sig} in {frame}')

@@ -93,6 +106,11 @@ def initialize():
     signal.signal(signal.SIGINT, sigint_handler)

 

 

+def setup_cors(app):

+    if cmd_opts.cors_allow_origins:

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

+

+

 def create_api(app):

     from modules.api.api import Api

     api = Api(app, queue_lock)

@@ -114,6 +132,7 @@ def api_only():
     initialize()

 

     app = FastAPI()

+    setup_cors(app)

     app.add_middleware(GZipMiddleware, minimum_size=1000)

     api = create_api(app)

 

@@ -131,8 +150,10 @@ def webui():
 

         app, local_url, share_url = demo.launch(

             share=cmd_opts.share,

-            server_name="0.0.0.0" if cmd_opts.listen else None,

+            server_name=server_name,

             server_port=cmd_opts.port,

+            ssl_keyfile=cmd_opts.tls_keyfile,

+            ssl_certfile=cmd_opts.tls_certfile,

             debug=cmd_opts.gradio_debug,

             auth=[tuple(cred.split(':')) for cred in cmd_opts.gradio_auth.strip('"').split(',')] if cmd_opts.gradio_auth else None,

             inbrowser=cmd_opts.autolaunch,

@@ -147,6 +168,8 @@ def webui():
         # runnnig its code. We disable this here. Suggested by RyotaK.

         app.user_middleware = [x for x in app.user_middleware if x.cls.__name__ != 'CORSMiddleware']

 

+        setup_cors(app)

+

         app.add_middleware(GZipMiddleware, minimum_size=1000)

 

         if launch_api:

@@ -160,6 +183,9 @@ def webui():
 

         print('Reloading extensions')

         extensions.list_extensions()

+

+        localization.list_localizations(cmd_opts.localizations_dir)

+

         print('Reloading custom scripts')

         modules.scripts.reload_scripts()

         print('Reloading modules: modules.ui')