From 964b63c0423a861bd67c40b59f767e7037051083 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 17 Oct 2022 11:38:32 +0300
Subject: [PATCH] add api() function to return webui() to how it was

---
 webui.py | 79 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/webui.py b/webui.py
index 603a4ccd793..16c862f0e08 100644
--- a/webui.py
+++ b/webui.py
@@ -87,59 +87,62 @@ 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)
 
-
-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}')
         os._exit(0)
 
     signal.signal(signal.SIGINT, sigint_handler)
-    
-    if cmd_opts.api:
-        from modules.api.api import Api
-        api = Api()
 
-        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)
 
-    else:
-        while 1:
+def api()
+    initialize()
 
-            demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)
+    from modules.api.api import Api
+    api = Api()
+    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)
 
-            app, local_url, share_url = demo.launch(
-                share=cmd_opts.share,
-                server_name="0.0.0.0" if cmd_opts.listen else None,
-                server_port=cmd_opts.port,
-                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,
-                prevent_thread_lock=True
-            )
 
-            app.add_middleware(GZipMiddleware, minimum_size=1000)
+def webui():
+    initialize()
 
-            while 1:
+    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,
+            server_port=cmd_opts.port,
+            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,
+            prevent_thread_lock=True
+        )
+
+        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)
-                if getattr(demo, 'do_restart', False):
-                    time.sleep(0.5)
-                    demo.close()
-                    time.sleep(0.5)
-                    break
+                break
 
-            sd_samplers.set_samplers()
+        sd_samplers.set_samplers()
 
-            print('Reloading Custom Scripts')
-            modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))
-            print('Reloading modules: modules.ui')
-            importlib.reload(modules.ui)
-            print('Refreshing Model List')
-            modules.sd_models.list_models()
-            print('Restarting Gradio')
+        print('Reloading Custom Scripts')
+        modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))
+        print('Reloading modules: modules.ui')
+        importlib.reload(modules.ui)
+        print('Refreshing Model List')
+        modules.sd_models.list_models()
+        print('Restarting Gradio')
 
 
 if __name__ == "__main__":
-    webui()
+    if cmd_opts.api:
+        api()
+    else:
+        webui()