Merge pull request #10569 from strelokhalfer/pr (d0e8fa62) · Commits · github_fork / Stable Diffusion Webui

modules/images.py

+7 −3

Original line number	Diff line number	Diff line
		@@ -338,6 +338,8 @@ def sanitize_filename_part(text, replace_spaces=True):
		class FilenameGenerator:
		replacements = {
		'seed': lambda self: self.seed if self.seed is not None else '',
		'seed_first': lambda self: self.seed if self.p.batch_size == 1 else self.p.all_seeds[0],
		'seed_last': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.all_seeds[-1],
		'steps': lambda self: self.p and self.p.steps,
		'cfg': lambda self: self.p and self.p.cfg_scale,
		'width': lambda self: self.image.width,
		@@ -354,19 +356,21 @@ class FilenameGenerator:
		'prompt_no_styles': lambda self: self.prompt_no_style(),
		'prompt_spaces': lambda self: sanitize_filename_part(self.prompt, replace_spaces=False),
		'prompt_words': lambda self: self.prompt_words(),
		'batch_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.batch_index + 1,
		'generation_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.n_iter == 1 and self.p.batch_size == 1 else self.p.iteration * self.p.batch_size + self.p.batch_index + 1,
		'batch_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 or self.zip else self.p.batch_index + 1,
		'batch_size': lambda self: self.p.batch_size,
		'generation_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if (self.p.n_iter == 1 and self.p.batch_size == 1) or self.zip else self.p.iteration * self.p.batch_size + self.p.batch_index + 1,
		'hasprompt': lambda self, args: self.hasprompt(args), # accepts formats:[hasprompt<prompt1\|default><prompt2>..]
		'clip_skip': lambda self: opts.data["CLIP_stop_at_last_layers"],
		'denoising': lambda self: self.p.denoising_strength if self.p and self.p.denoising_strength else NOTHING_AND_SKIP_PREVIOUS_TEXT,
		}
		default_time_format = '%Y%m%d%H%M%S'

		def __init__(self, p, seed, prompt, image):
		def __init__(self, p, seed, prompt, image, zip=False):
		self.p = p
		self.seed = seed
		self.prompt = prompt
		self.image = image
		self.zip = zip

		def hasprompt(self, *args):
		lower = self.prompt.lower()

modules/shared.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ options_templates.update(options_section(('saving-images', "Saving images/grids"
		"grid_extended_filename": OptionInfo(False, "Add extended info (seed, prompt) to filename when saving grid"),
		"grid_only_if_multiple": OptionInfo(True, "Do not save grids consisting of one picture"),
		"grid_prevent_empty_spots": OptionInfo(False, "Prevent empty spots in grid (when set to autodetect)"),
		"grid_zip_filename_pattern": OptionInfo("", "Archive filename pattern", component_args=hide_dirs).link("wiki", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Custom-Images-Filename-Name-and-Subdirectory"),
		"n_rows": OptionInfo(-1, "Grid row count; use -1 for autodetect and 0 for it to be same as batch size", gr.Slider, {"minimum": -1, "maximum": 16, "step": 1}),

		"enable_pnginfo": OptionInfo(True, "Save text information about generation parameters as chunks to png files"),

modules/ui_common.py

+7 −2

Original line number	Diff line number	Diff line
		@@ -50,9 +50,10 @@ def save_files(js_data, images, do_make_zip, index):
		save_to_dirs = shared.opts.use_save_to_dirs_for_ui
		extension: str = shared.opts.samples_format
		start_index = 0
		only_one = False

		if index > -1 and shared.opts.save_selected_only and (index >= data["index_of_first_image"]): # ensures we are looking at a specific non-grid picture, and we have save_selected_only

		only_one = True
		images = [images[index]]
		start_index = index

		@@ -70,6 +71,7 @@ def save_files(js_data, images, do_make_zip, index):
		is_grid = image_index < p.index_of_first_image
		i = 0 if is_grid else (image_index - p.index_of_first_image)

		p.batch_index = image_index-1
		fullfn, txt_fullfn = modules.images.save_image(image, path, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)

		filename = os.path.relpath(fullfn, path)
		@@ -83,7 +85,10 @@ def save_files(js_data, images, do_make_zip, index):

		# Make Zip
		if do_make_zip:
		zip_filepath = os.path.join(path, "images.zip")
		zip_fileseed = p.all_seeds[index-1] if only_one else p.all_seeds[0]
		namegen = modules.images.FilenameGenerator(p, zip_fileseed, p.all_prompts[0], image, True)
		zip_filename = namegen.apply(shared.opts.grid_zip_filename_pattern or "[datetime]_[[model_name]]_[seed]-[seed_last]")
		zip_filepath = os.path.join(path, f"{zip_filename}.zip")

		from zipfile import ZipFile
		with ZipFile(zip_filepath, "w") as zip_file:

Admin message