Merge pull request #12254 from AUTOMATIC1111/auro-autolaunch
Automatically open webui in browser when running "locally"
This commit is contained in:
commit
902f8cf292
|
@ -422,6 +422,7 @@ options_templates.update(options_section(('face-restoration', "Face restoration"
|
||||||
}))
|
}))
|
||||||
|
|
||||||
options_templates.update(options_section(('system', "System"), {
|
options_templates.update(options_section(('system', "System"), {
|
||||||
|
"auto_launch_browser": OptionInfo("Local", "Automatically open webui in browser on startup", gr.Radio, lambda: {"choices": ["Disable", "Local", "Remote"]}),
|
||||||
"show_warnings": OptionInfo(False, "Show warnings in console.").needs_reload_ui(),
|
"show_warnings": OptionInfo(False, "Show warnings in console.").needs_reload_ui(),
|
||||||
"show_gradio_deprecation_warnings": OptionInfo(True, "Show gradio deprecation warnings in console.").needs_reload_ui(),
|
"show_gradio_deprecation_warnings": OptionInfo(True, "Show gradio deprecation warnings in console.").needs_reload_ui(),
|
||||||
"memmon_poll_rate": OptionInfo(8, "VRAM usage polls per second during generation.", gr.Slider, {"minimum": 0, "maximum": 40, "step": 1}).info("0 = disable"),
|
"memmon_poll_rate": OptionInfo(8, "VRAM usage polls per second during generation.", gr.Slider, {"minimum": 0, "maximum": 40, "step": 1}).info("0 = disable"),
|
||||||
|
|
15
webui.py
15
webui.py
|
@ -372,6 +372,13 @@ def webui():
|
||||||
|
|
||||||
gradio_auth_creds = list(get_gradio_auth_creds()) or None
|
gradio_auth_creds = list(get_gradio_auth_creds()) or None
|
||||||
|
|
||||||
|
auto_launch_browser = False
|
||||||
|
if os.getenv('SD_WEBUI_RESTARTING') != '1':
|
||||||
|
if shared.opts.auto_launch_browser == "Remote" or cmd_opts.autolaunch:
|
||||||
|
auto_launch_browser = True
|
||||||
|
elif shared.opts.auto_launch_browser == "Local":
|
||||||
|
auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok])
|
||||||
|
|
||||||
app, local_url, share_url = shared.demo.launch(
|
app, local_url, share_url = shared.demo.launch(
|
||||||
share=cmd_opts.share,
|
share=cmd_opts.share,
|
||||||
server_name=server_name,
|
server_name=server_name,
|
||||||
|
@ -381,7 +388,7 @@ def webui():
|
||||||
ssl_verify=cmd_opts.disable_tls_verify,
|
ssl_verify=cmd_opts.disable_tls_verify,
|
||||||
debug=cmd_opts.gradio_debug,
|
debug=cmd_opts.gradio_debug,
|
||||||
auth=gradio_auth_creds,
|
auth=gradio_auth_creds,
|
||||||
inbrowser=cmd_opts.autolaunch and os.getenv('SD_WEBUI_RESTARTING') != '1',
|
inbrowser=auto_launch_browser,
|
||||||
prevent_thread_lock=True,
|
prevent_thread_lock=True,
|
||||||
allowed_paths=cmd_opts.gradio_allowed_path,
|
allowed_paths=cmd_opts.gradio_allowed_path,
|
||||||
app_kwargs={
|
app_kwargs={
|
||||||
|
@ -391,9 +398,6 @@ def webui():
|
||||||
root_path=f"/{cmd_opts.subpath}" if cmd_opts.subpath else "",
|
root_path=f"/{cmd_opts.subpath}" if cmd_opts.subpath else "",
|
||||||
)
|
)
|
||||||
|
|
||||||
# after initial launch, disable --autolaunch for subsequent restarts
|
|
||||||
cmd_opts.autolaunch = False
|
|
||||||
|
|
||||||
startup_timer.record("gradio launch")
|
startup_timer.record("gradio launch")
|
||||||
|
|
||||||
# gradio uses a very open CORS policy via app.user_middleware, which makes it possible for
|
# gradio uses a very open CORS policy via app.user_middleware, which makes it possible for
|
||||||
|
@ -438,6 +442,9 @@ def webui():
|
||||||
shared.demo.close()
|
shared.demo.close()
|
||||||
break
|
break
|
||||||
|
|
||||||
|
# disable auto launch webui in browser for subsequent UI Reload
|
||||||
|
os.environ.setdefault('SD_WEBUI_RESTARTING', '1')
|
||||||
|
|
||||||
print('Restarting UI...')
|
print('Restarting UI...')
|
||||||
shared.demo.close()
|
shared.demo.close()
|
||||||
time.sleep(0.5)
|
time.sleep(0.5)
|
||||||
|
|
Loading…
Reference in New Issue