Merge branch 'AUTOMATIC1111:master' into kr-localization

1 files changed, 47 insertions, 19 deletions

diff --git a/webui.py b/webui.py
index fe0ce321..a742c17d 100644
--- a/webui.py
+++ b/webui.py
@@ -4,7 +4,7 @@ import time
 import importlib

 import signal

 import threading

-

+from fastapi import FastAPI

 from fastapi.middleware.gzip import GZipMiddleware

 

 from modules.paths import script_path

@@ -31,7 +31,6 @@ from modules.paths import script_path
 from modules.shared import cmd_opts

 import modules.hypernetworks.hypernetwork

 

-

 queue_lock = threading.Lock()

 

 

@@ -72,6 +71,7 @@ def wrap_gradio_gpu_call(func, extra_outputs=None):
 

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

 

+

 def initialize():

     modelloader.cleanup_models()

     modules.sd_models.setup_model()

@@ -80,17 +80,13 @@ def initialize():
     shared.face_restorers.append(modules.face_restoration.FaceRestoration())

     modelloader.load_upscalers()

 

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

+    modules.scripts.load_scripts()

 

-    shared.sd_model = modules.sd_models.load_model()

+    modules.sd_models.load_model()

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

     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)

 

-

-def webui():

-    initialize()

-    

     # 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}')

@@ -98,10 +94,38 @@ def webui():
 

     signal.signal(signal.SIGINT, sigint_handler)

 

+

+def create_api(app):

+    from modules.api.api import Api

+    api = Api(app, queue_lock)

+    return api

+

+def wait_on_server(demo=None):

     while 1:

+        time.sleep(0.5)

+        if demo and getattr(demo, 'do_restart', False):

+            time.sleep(0.5)

+            demo.close()

+            time.sleep(0.5)

+            break

+

+def api_only():

+    initialize()

 

+    app = FastAPI()

+    app.add_middleware(GZipMiddleware, minimum_size=1000)

+    api = create_api(app)

+

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

+

+

+def webui():

+    launch_api = cmd_opts.api

+    initialize()

+

+    while 1:

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

-        

+

         app, local_url, share_url = demo.launch(

             share=cmd_opts.share,

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

@@ -111,21 +135,20 @@ def webui():
             inbrowser=cmd_opts.autolaunch,

             prevent_thread_lock=True

         )

-        

+        # after initial launch, disable --autolaunch for subsequent restarts

+        cmd_opts.autolaunch = False

+

         app.add_middleware(GZipMiddleware, minimum_size=1000)

 

-        while 1:

-            time.sleep(0.5)

-            if getattr(demo, 'do_restart', False):

-                time.sleep(0.5)

-                demo.close()

-                time.sleep(0.5)

-                break

+        if (launch_api):

+            create_api(app)

+

+        wait_on_server(demo)

 

         sd_samplers.set_samplers()

 

         print('Reloading Custom Scripts')

-        modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))

+        modules.scripts.reload_scripts()

         print('Reloading modules: modules.ui')

         importlib.reload(modules.ui)

         print('Refreshing Model List')

@@ -133,5 +156,10 @@ def webui():
         print('Restarting Gradio')

 

 

+

+task = []

 if __name__ == "__main__":

-    webui()

+    if cmd_opts.nowebui:

+        api_only()

+    else:

+        webui()