Restart: only do restart if running via the wrapper script (46a5bd64) · Commits · github_fork / Stable Diffusion Webui

modules/restart.py

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		import os
		from pathlib import Path

		from modules.paths_internal import script_path


		def is_restartable() -> bool:
		"""
		Return True if the webui is restartable (i.e. there is something watching to restart it with)
		"""
		return bool(os.environ.get('SD_WEBUI_RESTART'))


		def restart_program() -> None:
		"""creates file tmp/restart and immediately stops the process, which webui.bat/webui.sh interpret as a command to start webui again"""

		(Path(script_path) / "tmp" / "restart").touch()

		stop_program()


		def stop_program() -> None:
		os._exit(0)

+0 −9

Original line number	Diff line number	Diff line
		@@ -853,12 +853,3 @@ def walk_files(path, allowed_extensions=None):
		continue

		yield os.path.join(root, filename)


		def restart_program():
		"""creates file tmp/restart and immediately stops the process, which webui.bat/webui.sh interpret as a command to start webui again"""

		with open(os.path.join(script_path, "tmp", "restart"), "w"):
		pass

		os._exit(0)

+8 −3

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ import html
		import shutil
		import errno

		from modules import extensions, shared, paths, config_states, errors
		from modules import extensions, shared, paths, config_states, errors, restart
		from modules.paths_internal import config_states_dir
		from modules.call_queue import wrap_gradio_gpu_call

		@@ -49,7 +49,11 @@ def apply_and_restart(disable_list, update_list, disable_all):
		shared.opts.disabled_extensions = disabled
		shared.opts.disable_all_extensions = disable_all
		shared.opts.save(shared.config_filename)
		shared.restart_program()

		if restart.is_restartable():
		restart.restart_program()
		else:
		restart.stop_program()


		def save_config_state(name):
		@@ -508,7 +512,8 @@ def create_ui():
		with gr.TabItem("Installed", id="installed"):

		with gr.Row(elem_id="extensions_installed_top"):
		apply = gr.Button(value="Apply and restart UI", variant="primary")
		apply_label = ("Apply and restart UI" if restart.is_restartable() else "Apply and quit")
		apply = gr.Button(value=apply_label, variant="primary")
		check = gr.Button(value="Check for updates")
		extensions_disable_all = gr.Radio(label="Disable all extensions", choices=["none", "extra", "all"], value=shared.opts.disable_all_extensions, elem_id="extensions_disable_all")
		extensions_disabled_list = gr.Text(elem_id="extensions_disabled_list", visible=False).style(container=False)

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		if not defined PYTHON (set PYTHON=python)
		if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")


		set SD_WEBUI_RESTART=tmp/restart
		set ERROR_REPORTING=FALSE

		mkdir tmp 2>NUL

+1 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,7 @@ prepare_tcmalloc() {
		}

		KEEP_GOING=1
		export SD_WEBUI_RESTART=tmp/restart
		while [[ "$KEEP_GOING" -eq "1" ]]; do
		if [[ ! -z "${ACCELERATE}" ]] && [ ${ACCELERATE}="True" ] && [ -x "$(command -v accelerate)" ]; then
		printf "\n%s\n" "${delimiter}"