Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into fix-counter (349f8930) · Commits · github_fork / Stable Diffusion Webui

modules/images.py

+9 −1

Original line number	Diff line number	Diff line
		@@ -661,7 +661,15 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i

		save_image_with_geninfo(image_to_save, info, temp_file_path, extension, existing_pnginfo=params.pnginfo, pnginfo_section_name=pnginfo_section_name)

		os.replace(temp_file_path, filename_without_extension + extension)
		full_file_name = filename_without_extension + extension
		if shared.opts.save_images_add_number_suffix and os.path.exists(full_file_name):
		count = 1
		while True:
		full_file_name = f"{filename_without_extension}_{count}{extension}"
		if not os.path.exists(full_file_name):
		break
		count += 1
		os.replace(temp_file_path, full_file_name)

		fullfn_without_extension, extension = os.path.splitext(params.filename)
		if hasattr(os, 'statvfs'):

+9 −7

Original line number	Diff line number	Diff line
		@@ -114,8 +114,6 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
		else:
		p.override_settings.pop("sd_model_checkpoint", None)

		proc = modules.scripts.scripts_img2img.run(p, *args)
		if proc is None:
		if output_dir:
		p.outpath_samples = output_dir
		p.override_settings['save_to_dirs'] = False
		@@ -123,6 +121,10 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
		p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'
		else:
		p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'

		proc = modules.scripts.scripts_img2img.run(p, *args)

		if proc is None:
		process_images(p)

+2 −0

Original line number	Diff line number	Diff line
		@@ -533,6 +533,7 @@ class Processed:
		self.all_seeds = all_seeds or p.all_seeds or [self.seed]
		self.all_subseeds = all_subseeds or p.all_subseeds or [self.subseed]
		self.infotexts = infotexts or [info]
		self.version = program_version()

		def js(self):
		obj = {
		@@ -567,6 +568,7 @@ class Processed:
		"job_timestamp": self.job_timestamp,
		"clip_skip": self.clip_skip,
		"is_using_inpainting_conditioning": self.is_using_inpainting_conditioning,
		"version": self.version,
		}

		return json.dumps(obj)

+5 −1

Original line number	Diff line number	Diff line
		@@ -491,11 +491,15 @@ class ScriptRunner:

		arg_info = api_models.ScriptArg(label=control.label or "")

		for field in ("value", "minimum", "maximum", "step", "choices"):
		for field in ("value", "minimum", "maximum", "step"):
		v = getattr(control, field, None)
		if v is not None:
		setattr(arg_info, field, v)

		choices = getattr(control, 'choices', None) # as of gradio 3.41, some items in choices are strings, and some are tuples where the first elem is the string
		if choices is not None:
		setattr(arg_info, 'choices', [x[0] if isinstance(x, tuple) else x for x in choices])

		api_args.append(arg_info)

		script.api_info = api_models.ScriptInfo(

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ options_templates.update(options_section(('saving-images', "Saving images/grids"
		"samples_format": OptionInfo('png', 'File format for images'),
		"samples_filename_pattern": OptionInfo("", "Images filename pattern", component_args=hide_dirs).link("wiki", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Custom-Images-Filename-Name-and-Subdirectory"),
		"save_images_add_number": OptionInfo(True, "Add number to filename when saving", component_args=hide_dirs),

		"save_images_add_number_suffix": OptionInfo(True, "Add number suffix when necessary", component_args=hide_dirs).info("prevent existing image from being override"),
		"grid_save": OptionInfo(True, "Always save all generated image grids"),
		"grid_format": OptionInfo('png', 'File format for grids'),
		"grid_extended_filename": OptionInfo(False, "Add extended info (seed, prompt) to filename when saving grid"),