Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui (4a3d05b6) · Commits · github_fork / Stable Diffusion Webui

launch.py

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -157,7 +157,7 @@ def run_extensions_installers(settings_file):
	run_extension_installer(os.path.join(dir_extensions, dirname_extension))		run_extension_installer(os.path.join(dir_extensions, dirname_extension))


	def prepare_enviroment():		def prepare_environment():
	torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")		torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")
	requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")		requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
	commandline_args = os.environ.get('COMMANDLINE_ARGS', "")		commandline_args = os.environ.get('COMMANDLINE_ARGS', "")
	@@ -291,5 +291,5 @@ def start():


	if __name__ == "__main__":		if __name__ == "__main__":
	prepare_enviroment()		prepare_environment()
	start()		start()

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -122,8 +122,7 @@ def run_bind():

	if send_generate_info and paste_fields[tab]["fields"] is not None:		if send_generate_info and paste_fields[tab]["fields"] is not None:
	if send_generate_info in paste_fields:		if send_generate_info in paste_fields:
	paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration', 'Size-1', 'Size-2'] + (["Seed"] if shared.opts.send_seed else [])		paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (['Size-1', 'Size-2'] if shared.opts.send_size else []) + (["Seed"] if shared.opts.send_seed else [])

	button.click(		button.click(
	fn=lambda *x: x,		fn=lambda *x: x,
	inputs=[field for field, name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],		inputs=[field for field, name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -396,6 +396,7 @@ options_templates.update(options_section(('ui', "User interface"), {
	"add_model_name_to_info": OptionInfo(False, "Add model name to generation information"),		"add_model_name_to_info": OptionInfo(False, "Add model name to generation information"),
	"disable_weights_auto_swap": OptionInfo(False, "When reading generation parameters from text into UI (from PNG info or pasted text), do not change the selected model/checkpoint."),		"disable_weights_auto_swap": OptionInfo(False, "When reading generation parameters from text into UI (from PNG info or pasted text), do not change the selected model/checkpoint."),
	"send_seed": OptionInfo(True, "Send seed when sending prompt or image to other interface"),		"send_seed": OptionInfo(True, "Send seed when sending prompt or image to other interface"),
			"send_size": OptionInfo(True, "Send size when sending prompt or image to another interface"),
	"font": OptionInfo("", "Font for image grids that have text"),		"font": OptionInfo("", "Font for image grids that have text"),
	"js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),		"js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),
	"js_modal_lightbox_initially_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),		"js_modal_lightbox_initially_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -46,10 +46,11 @@ class Script(scripts.Script):

	def ui(self, is_img2img):		def ui(self, is_img2img):
	put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False)		put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False)
			different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False)

	return [put_at_start]		return [put_at_start, different_seeds]

	def run(self, p, put_at_start):		def run(self, p, put_at_start, different_seeds):
	modules.processing.fix_seed(p)		modules.processing.fix_seed(p)

	original_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt		original_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt
	@@ -73,7 +74,7 @@ class Script(scripts.Script):
	print(f"Prompt matrix will create {len(all_prompts)} images using a total of {p.n_iter} batches.")		print(f"Prompt matrix will create {len(all_prompts)} images using a total of {p.n_iter} batches.")

	p.prompt = all_prompts		p.prompt = all_prompts
	p.seed = [p.seed for _ in all_prompts]		p.seed = [p.seed + (i if different_seeds else 0) for i in range(len(all_prompts))]
	p.prompt_for_display = original_prompt		p.prompt_for_display = original_prompt
	processed = process_images(p)		processed = process_images(p)