aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEyeDeck <eyedeck@gmail.com>2022-09-12 12:19:14 +0000
committerGitHub <noreply@github.com>2022-09-12 12:19:14 +0000
commitfc49844aa8caae5edd2a28367c78bd5b7a847518 (patch)
tree7f81c4aab5e04bbde1cf0ba63f5b5fa1f4828249
parente3646e79aa4d1694c463be648201498a2f1091da (diff)
parentc205a07fbc33ab0619108f68b3a16c51e6ef1b63 (diff)
downloadstable-diffusion-webui-gfx803-fc49844aa8caae5edd2a28367c78bd5b7a847518.tar.gz
stable-diffusion-webui-gfx803-fc49844aa8caae5edd2a28367c78bd5b7a847518.tar.bz2
stable-diffusion-webui-gfx803-fc49844aa8caae5edd2a28367c78bd5b7a847518.zip
Merge branch 'master' into master
-rw-r--r--modules/shared.py2
-rw-r--r--webui.py9
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/shared.py b/modules/shared.py
index b9c2f045..7d67a4c5 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -43,7 +43,7 @@ parser.add_argument("--ui-config-file", type=str, help="filename to use for ui c
parser.add_argument("--hide-ui-dir-config", action='store_true', help="hide directory configuration from webui", default=False)
parser.add_argument("--ui-settings-file", type=str, help="filename to use for ui settings", default=os.path.join(script_path, 'config.json'))
parser.add_argument("--gradio-debug", action='store_true', help="launch gradio with --debug option")
-parser.add_argument("--auth", type=str, help='set gradio authentication like "username:password"; or comma-delimit multiple like "u1:p1,u2:p2,u3:p3"', default=None)
+parser.add_argument("--gradio-auth", type=str, help='set gradio authentication like "username:password"; or comma-delimit multiple like "u1:p1,u2:p2,u3:p3"', default=None)
cmd_opts = parser.parse_args()
diff --git a/webui.py b/webui.py
index 2b8dedc7..1eac9178 100644
--- a/webui.py
+++ b/webui.py
@@ -115,8 +115,13 @@ def webui():
run_pnginfo=modules.extras.run_pnginfo
)
- auth = [tuple(cred.split(':')) for cred in cmd_opts.auth.strip('"').split(',')] if cmd_opts.auth else None
- 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=auth)
+ 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.auth.strip('"').split(',')] if cmd_opts.auth else None,
+ )
if __name__ == "__main__":