From 636ff513b0b5939f15456b82abd2e99951f6e3c1 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Fri, 21 Jul 2023 18:01:20 +0300
Subject: Merge pull request #11920 from wfjsw/typo-fix-1

typo fix
---
 webui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webui.py')

diff --git a/webui.py b/webui.py
index 2aafc09f..2314735f 100644
--- a/webui.py
+++ b/webui.py
@@ -407,7 +407,7 @@ def webui():
             ssl_verify=cmd_opts.disable_tls_verify,
             debug=cmd_opts.gradio_debug,
             auth=gradio_auth_creds,
-            inbrowser=cmd_opts.autolaunch and os.getenv('SD_WEBUI_RESTARTING ') != '1',
+            inbrowser=cmd_opts.autolaunch and os.getenv('SD_WEBUI_RESTARTING') != '1',
             prevent_thread_lock=True,
             allowed_paths=cmd_opts.gradio_allowed_path,
             app_kwargs={
-- 
cgit v1.2.3


From ce0aab36432c655c8cb48ccc2caf23d10d77cad1 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 25 Jul 2023 15:19:10 +0300
Subject: Merge pull request #11984 from
 AUTOMATIC1111/api-only-subpath-(root_path)

api only subpath (rootpath)
---
 modules/api/api.py | 4 ++--
 webui.py           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'webui.py')

diff --git a/modules/api/api.py b/modules/api/api.py
index 9d73083f..606db179 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -724,9 +724,9 @@ class Api:
             cuda = {'error': f'{err}'}
         return models.MemoryResponse(ram=ram, cuda=cuda)
 
-    def launch(self, server_name, port):
+    def launch(self, server_name, port, root_path):
         self.app.include_router(self.router)
-        uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=shared.cmd_opts.timeout_keep_alive)
+        uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=shared.cmd_opts.timeout_keep_alive, root_path=root_path)
 
     def kill_webui(self):
         restart.stop_program()
diff --git a/webui.py b/webui.py
index 2314735f..6bf06854 100644
--- a/webui.py
+++ b/webui.py
@@ -374,7 +374,7 @@ def api_only():
     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,
-        root_path = f"/{cmd_opts.subpath}"
+        root_path=f"/{cmd_opts.subpath}" if cmd_opts.subpath else ""
     )
 
 
-- 
cgit v1.2.3