Merge pull request #8287 from vladmandic/save-images (bb3ecc32) · Commits · github_fork / Stable Diffusion Webui

modules/api/api.py

+17 −6

Original line number	Diff line number	Diff line
		@@ -180,8 +180,8 @@ class Api:

		populate = txt2imgreq.copy(update={ # Override __init__ params
		"sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),
		"do_not_save_samples": True,
		"do_not_save_grid": True
		"do_not_save_samples": txt2imgreq.do_not_save,
		"do_not_save_grid": txt2imgreq.do_not_save,
		}
		)
		if populate.sampler_name:
		@@ -190,6 +190,10 @@ class Api:
		args = vars(populate)
		args.pop('script_name', None)

		send_images = True if not 'do_not_send' in args else not args['do_not_send']
		args.pop('do_not_send', None)
		args.pop('do_not_save', None)

		with self.queue_lock:
		p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)

		@@ -203,7 +207,7 @@ class Api:
		processed = process_images(p)
		shared.state.end()

		b64images = list(map(encode_pil_to_base64, processed.images))
		b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []

		return TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())

		@@ -220,8 +224,8 @@ class Api:

		populate = img2imgreq.copy(update={ # Override __init__ params
		"sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),
		"do_not_save_samples": True,
		"do_not_save_grid": True,
		"do_not_save_samples": img2imgreq.do_not_save,
		"do_not_save_grid": img2imgreq.do_not_save,
		"mask": mask
		}
		)
		@@ -232,6 +236,13 @@ class Api:
		args.pop('include_init_images', None) # this is meant to be done by "exclude": True in model, but it's for a reason that I cannot determine.
		args.pop('script_name', None)

		send_images = True if not 'do_not_send' in args else not args['do_not_send']
		args.pop('do_not_send', None)
		args.pop('do_not_save', None)

		send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images']
		args.pop('do_not_send_images', None)

		with self.queue_lock:
		p = StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)
		p.init_images = [decode_base64_to_image(x) for x in init_images]
		@@ -246,7 +257,7 @@ class Api:
		processed = process_images(p)
		shared.state.end()

		b64images = list(map(encode_pil_to_base64, processed.images))
		b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []

		if not img2imgreq.include_init_images:
		img2imgreq.init_images = None

modules/api/models.py

+20 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,8 @@ API_NOT_ALLOWED = [
		"outpath_samples",
		"outpath_grids",
		"sampler_index",
		"do_not_save_samples",
		"do_not_save_grid",
		# "do_not_save_samples",
		# "do_not_save_grid",
		"extra_generation_params",
		"overlay_images",
		"do_not_reload_embeddings",
		@@ -100,13 +100,29 @@ class PydanticModelGenerator:
		StableDiffusionTxt2ImgProcessingAPI = PydanticModelGenerator(
		"StableDiffusionProcessingTxt2Img",
		StableDiffusionProcessingTxt2Img,
		[{"key": "sampler_index", "type": str, "default": "Euler"}, {"key": "script_name", "type": str, "default": None}, {"key": "script_args", "type": list, "default": []}]
		[
		{"key": "sampler_index", "type": str, "default": "Euler"},
		{"key": "script_name", "type": str, "default": None},
		{"key": "script_args", "type": list, "default": []},
		{"key": "do_not_send", "type": bool, "default": False},
		{"key": "do_not_save", "type": bool, "default": True}
		]
		).generate_model()

		StableDiffusionImg2ImgProcessingAPI = PydanticModelGenerator(
		"StableDiffusionProcessingImg2Img",
		StableDiffusionProcessingImg2Img,
		[{"key": "sampler_index", "type": str, "default": "Euler"}, {"key": "init_images", "type": list, "default": None}, {"key": "denoising_strength", "type": float, "default": 0.75}, {"key": "mask", "type": str, "default": None}, {"key": "include_init_images", "type": bool, "default": False, "exclude" : True}, {"key": "script_name", "type": str, "default": None}, {"key": "script_args", "type": list, "default": []}]
		[
		{"key": "sampler_index", "type": str, "default": "Euler"},
		{"key": "init_images", "type": list, "default": None},
		{"key": "denoising_strength", "type": float, "default": 0.75},
		{"key": "mask", "type": str, "default": None},
		{"key": "include_init_images", "type": bool, "default": False, "exclude" : True},
		{"key": "script_name", "type": str, "default": None},
		{"key": "script_args", "type": list, "default": []},
		{"key": "do_not_send", "type": bool, "default": False},
		{"key": "do_not_save", "type": bool, "default": True}
		]
		).generate_model()

		class TextToImageResponse(BaseModel):

modules/images.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,9 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
		"""
		namegen = FilenameGenerator(p, seed, prompt, image)

		if path is None: # set default path to avoid errors when functions are triggered manually or via api and param is not set
		path = opts.outdir_save

		if save_to_dirs is None:
		save_to_dirs = (grid and opts.grid_save_to_dirs) or (not grid and opts.save_to_dirs and not no_prompt)

Admin message