Merge branch 'master' into 1404-script-reload-without-restart

1 files changed, 12 insertions, 18 deletions

diff --git a/webui.py b/webui.py
index 140040ca..63495697 100644
--- a/webui.py
+++ b/webui.py
@@ -6,30 +6,29 @@ from modules import devices
 from modules.paths import script_path

 import signal

 import threading

-import modules.paths

+

 import modules.codeformer_model as codeformer

-import modules.esrgan_model as esrgan

-import modules.bsrgan_model as bsrgan

 import modules.extras

 import modules.face_restoration

 import modules.gfpgan_model as gfpgan

 import modules.img2img

-import modules.ldsr_model as ldsr

+

 import modules.lowvram

-import modules.realesrgan_model as realesrgan

+import modules.paths

 import modules.scripts

 import modules.sd_hijack

 import modules.sd_models

 import modules.shared as shared

-import modules.swinir_model as swinir

 import modules.txt2img

+

 import modules.ui

+from modules import devices

 from modules import modelloader

 from modules.paths import script_path

 from modules.shared import cmd_opts

 

 modelloader.cleanup_models()

-modules.sd_models.setup_model(cmd_opts.ckpt_dir)

+modules.sd_models.setup_model()

 codeformer.setup_model(cmd_opts.codeformer_models_path)

 gfpgan.setup_model(cmd_opts.gfpgan_models_path)

 shared.face_restorers.append(modules.face_restoration.FaceRestoration())

@@ -47,7 +46,7 @@ def wrap_queued_call(func):
     return f

 

 

-def wrap_gradio_gpu_call(func):

+def wrap_gradio_gpu_call(func, extra_outputs=None):

     def f(*args, **kwargs):

         devices.torch_gc()

 

@@ -59,6 +58,7 @@ def wrap_gradio_gpu_call(func):
         shared.state.current_image = None

         shared.state.current_image_sampling_step = 0

         shared.state.interrupted = False

+        shared.state.textinfo = None

 

         with queue_lock:

             res = func(*args, **kwargs)

@@ -70,7 +70,7 @@ def wrap_gradio_gpu_call(func):
 

         return res

 

-    return modules.ui.wrap_gradio_call(f)

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

 

 

 modules.scripts.load_scripts(os.path.join(script_path, "scripts"))

@@ -89,15 +89,8 @@ def webui():
 

     while 1:

 

-        demo = modules.ui.create_ui(

-            txt2img=wrap_gradio_gpu_call(modules.txt2img.txt2img),

-            img2img=wrap_gradio_gpu_call(modules.img2img.img2img),

-            run_extras=wrap_gradio_gpu_call(modules.extras.run_extras),

-            run_pnginfo=modules.extras.run_pnginfo,

-            run_modelmerger=modules.extras.run_modelmerger

-        )

-

-

+        demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)

+        

         demo.launch(

             share=cmd_opts.share,

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

@@ -123,5 +116,6 @@ def webui():
         print('Restarting Gradio')

 

 

+

 if __name__ == "__main__":

     webui()