diff options
Diffstat (limited to 'webui.py')
| -rw-r--r-- | webui.py | 57 |
1 files changed, 25 insertions, 32 deletions
@@ -3,36 +3,34 @@ import threading from modules import devices
from modules.paths import script_path
-
import signal
-
-from modules.shared import opts, cmd_opts, state
-import modules.shared as shared
-import modules.ui
-import modules.scripts
-import modules.sd_hijack
-import modules.codeformer_model
-import modules.gfpgan_model
-import modules.face_restoration
-import modules.realesrgan_model as realesrgan
+import threading
+import modules.paths
+import modules.codeformer_model as codeformer
import modules.esrgan_model as esrgan
-import modules.ldsr_model as ldsr
+import modules.bsrgan_model as bsrgan
import modules.extras
+import modules.face_restoration
+import modules.gfpgan_model as gfpgan
+import modules.ldsr_model as ldsr
import modules.lowvram
-import modules.txt2img
-import modules.img2img
-import modules.swinir as swinir
+import modules.realesrgan_model as realesrgan
+import modules.scripts
+import modules.sd_hijack
import modules.sd_models
+import modules.shared as shared
+import modules.swinir_model as swinir
+import modules.ui
+from modules import modelloader
+from modules.paths import script_path
+from modules.shared import cmd_opts
-
-modules.codeformer_model.setup_codeformer()
-modules.gfpgan_model.setup_gfpgan()
+modelloader.cleanup_models()
+modules.sd_models.setup_model(cmd_opts.ckpt_dir)
+codeformer.setup_model(cmd_opts.codeformer_models_path)
+gfpgan.setup_model(cmd_opts.gfpgan_models_path)
shared.face_restorers.append(modules.face_restoration.FaceRestoration())
-
-esrgan.load_models(cmd_opts.esrgan_models_path)
-swinir.load_models(cmd_opts.swinir_models_path)
-realesrgan.setup_realesrgan()
-ldsr.add_lsdr()
+modelloader.load_upscalers()
queue_lock = threading.Lock()
@@ -46,7 +44,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()
@@ -58,6 +56,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)
@@ -69,7 +68,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"))
@@ -86,13 +85,7 @@ def webui(): signal.signal(signal.SIGINT, sigint_handler)
- 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,
|