Merge branch 'dev' into ext-inst-pbar (9421c113) · Commits · github_fork / Stable Diffusion Webui

launch.py

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,9 @@ start = launch_utils.start


	def main():		def main():
			launch_utils.startup_timer.record("initial startup")

			with launch_utils.startup_timer.subcategory("prepare environment"):
	if not args.skip_prepare_environment:		if not args.skip_prepare_environment:
	prepare_environment()		prepare_environment()

modules/launch_utils.py

+28 −8

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ from functools import lru_cache

	from modules import cmd_args, errors		from modules import cmd_args, errors
	from modules.paths_internal import script_path, extensions_dir		from modules.paths_internal import script_path, extensions_dir
	from modules import timer # noqa:F401		from modules.timer import startup_timer

	args, _ = cmd_args.parser.parse_known_args()		args, _ = cmd_args.parser.parse_known_args()

	@@ -194,7 +194,7 @@ def run_extension_installer(extension_dir):

	try:		try:
	env = os.environ.copy()		env = os.environ.copy()
	env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env['PYTHONPATH']}"		env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"

	print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env))		print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env))
	except Exception as e:		except Exception as e:
	@@ -224,12 +224,14 @@ def run_extensions_installers(settings_file):
	if not os.path.isdir(extensions_dir):		if not os.path.isdir(extensions_dir):
	return		return

			with startup_timer.subcategory("run extensions installers"):
	from tqdm.auto import tqdm		from tqdm.auto import tqdm
	pbar_extensions = tqdm(list_extensions(settings_file),		pbar_extensions = tqdm(list_extensions(settings_file),
	bar_format="{desc}: \|{bar}\|{percentage:3.0f}% [{n_fmt}/{total_fmt} {elapsed}<{remaining}]")		bar_format="{desc}: \|{bar}\|{percentage:3.0f}% [{n_fmt}/{total_fmt} {elapsed}<{remaining}]")
	for dirname_extension in pbar_extensions:		for dirname_extension in pbar_extensions:
	pbar_extensions.set_description("Installing %s" % dirname_extension)		pbar_extensions.set_description("Installing %s" % dirname_extension)
	run_extension_installer(os.path.join(extensions_dir, dirname_extension))		run_extension_installer(os.path.join(extensions_dir, dirname_extension))
			startup_timer.record(dirname_extension)


	re_requirement = re.compile(r"\s([-_a-zA-Z0-9]+)\s(?:==\s([-+_.a-zA-Z0-9]+))?\s")		re_requirement = re.compile(r"\s([-_a-zA-Z0-9]+)\s(?:==\s([-+_.a-zA-Z0-9]+))?\s")
	@@ -302,8 +304,11 @@ def prepare_environment():
	if not args.skip_python_version_check:		if not args.skip_python_version_check:
	check_python_version()		check_python_version()

			startup_timer.record("checks")

	commit = commit_hash()		commit = commit_hash()
	tag = git_tag()		tag = git_tag()
			startup_timer.record("git version info")

	print(f"Python {sys.version}")		print(f"Python {sys.version}")
	print(f"Version: {tag}")		print(f"Version: {tag}")
	@@ -311,21 +316,27 @@ def prepare_environment():

	if args.reinstall_torch or not is_installed("torch") or not is_installed("torchvision"):		if args.reinstall_torch or not is_installed("torch") or not is_installed("torchvision"):
	run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch", live=True)		run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch", live=True)
			startup_timer.record("install torch")

	if not args.skip_torch_cuda_test and not check_run_python("import torch; assert torch.cuda.is_available()"):		if not args.skip_torch_cuda_test and not check_run_python("import torch; assert torch.cuda.is_available()"):
	raise RuntimeError(		raise RuntimeError(
	'Torch is not able to use GPU; '		'Torch is not able to use GPU; '
	'add --skip-torch-cuda-test to COMMANDLINE_ARGS variable to disable this check'		'add --skip-torch-cuda-test to COMMANDLINE_ARGS variable to disable this check'
	)		)
			startup_timer.record("torch GPU test")


	if not is_installed("gfpgan"):		if not is_installed("gfpgan"):
	run_pip(f"install {gfpgan_package}", "gfpgan")		run_pip(f"install {gfpgan_package}", "gfpgan")
			startup_timer.record("install gfpgan")

	if not is_installed("clip"):		if not is_installed("clip"):
	run_pip(f"install {clip_package}", "clip")		run_pip(f"install {clip_package}", "clip")
			startup_timer.record("install clip")

	if not is_installed("open_clip"):		if not is_installed("open_clip"):
	run_pip(f"install {openclip_package}", "open_clip")		run_pip(f"install {openclip_package}", "open_clip")
			startup_timer.record("install open_clip")

	if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:		if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:
	if platform.system() == "Windows":		if platform.system() == "Windows":
	@@ -339,8 +350,11 @@ def prepare_environment():
	elif platform.system() == "Linux":		elif platform.system() == "Linux":
	run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")		run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")

			startup_timer.record("install xformers")

	if not is_installed("ngrok") and args.ngrok:		if not is_installed("ngrok") and args.ngrok:
	run_pip("install ngrok", "ngrok")		run_pip("install ngrok", "ngrok")
			startup_timer.record("install ngrok")

	os.makedirs(os.path.join(script_path, dir_repos), exist_ok=True)		os.makedirs(os.path.join(script_path, dir_repos), exist_ok=True)

	@@ -350,22 +364,28 @@ def prepare_environment():
	git_clone(codeformer_repo, repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)		git_clone(codeformer_repo, repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)
	git_clone(blip_repo, repo_dir('BLIP'), "BLIP", blip_commit_hash)		git_clone(blip_repo, repo_dir('BLIP'), "BLIP", blip_commit_hash)

			startup_timer.record("clone repositores")

	if not is_installed("lpips"):		if not is_installed("lpips"):
	run_pip(f"install -r \"{os.path.join(repo_dir('CodeFormer'), 'requirements.txt')}\"", "requirements for CodeFormer")		run_pip(f"install -r \"{os.path.join(repo_dir('CodeFormer'), 'requirements.txt')}\"", "requirements for CodeFormer")
			startup_timer.record("install CodeFormer requirements")

	if not os.path.isfile(requirements_file):		if not os.path.isfile(requirements_file):
	requirements_file = os.path.join(script_path, requirements_file)		requirements_file = os.path.join(script_path, requirements_file)

	if not requirements_met(requirements_file):		if not requirements_met(requirements_file):
	run_pip(f"install -r \"{requirements_file}\"", "requirements")		run_pip(f"install -r \"{requirements_file}\"", "requirements")
			startup_timer.record("install requirements")

	run_extensions_installers(settings_file=args.ui_settings_file)		run_extensions_installers(settings_file=args.ui_settings_file)

	if args.update_check:		if args.update_check:
	version_check(commit)		version_check(commit)
			startup_timer.record("check version")

	if args.update_all_extensions:		if args.update_all_extensions:
	git_pull_recursive(extensions_dir)		git_pull_recursive(extensions_dir)
			startup_timer.record("update extensions")

	if "--exit" in sys.argv:		if "--exit" in sys.argv:
	print("Exiting because of --exit argument")		print("Exiting because of --exit argument")

modules/prompt_parser.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -178,7 +178,7 @@ def get_learned_conditioning(model, prompts: SdConditioning \| list[str], steps):


	re_AND = re.compile(r"\bAND\b")		re_AND = re.compile(r"\bAND\b")
	re_weight = re.compile(r"^(.?)(?:\s:\s([-+]?(?:\d+\.?\|\d\.\d+)))?\s*$")		re_weight = re.compile(r"^((?:\s\|.)?)(?:\s:\s([-+]?(?:\d+\.?\|\d\.\d+)))?\s*$")


	def get_multicond_prompt_list(prompts: SdConditioning \| list[str]):		def get_multicond_prompt_list(prompts: SdConditioning \| list[str]):

Admin message