rename fields for API for saving/sending images (3531a500) · Commits · github_fork / Stable Diffusion Webui

modules/api/api.py

+17 −24

Original line number	Diff line number	Diff line
		@@ -180,27 +180,25 @@ 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": txt2imgreq.do_not_save,
		"do_not_save_grid": txt2imgreq.do_not_save,
		}
		)
		"do_not_save_samples": not txt2imgreq.save_images,
		"do_not_save_grid": not txt2imgreq.save_images,
		})
		if populate.sampler_name:
		populate.sampler_index = None # prevent a warning later on

		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)
		send_images = args.pop('send_images', True)
		args.pop('save_images', None)

		with self.queue_lock:
		p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)
		p.outpath_grids = opts.outdir_txt2img_grids
		p.outpath_samples = opts.outdir_txt2img_samples

		shared.state.begin()
		if script is not None:
		p.outpath_grids = opts.outdir_txt2img_grids
		p.outpath_samples = opts.outdir_txt2img_samples
		p.script_args = [script_idx + 1] + [None] * (script.args_from - 1) + p.script_args
		processed = scripts.scripts_txt2img.run(p, *p.script_args)
		else:
		@@ -224,11 +222,10 @@ 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": img2imgreq.do_not_save,
		"do_not_save_grid": img2imgreq.do_not_save,
		"mask": mask
		}
		)
		"do_not_save_samples": not img2imgreq.save_images,
		"do_not_save_grid": not img2imgreq.save_images,
		"mask": mask,
		})
		if populate.sampler_name:
		populate.sampler_index = None # prevent a warning later on

		@@ -236,21 +233,17 @@ 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)
		send_images = args.pop('send_images', True)
		args.pop('save_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]
		p.outpath_grids = opts.outdir_img2img_grids
		p.outpath_samples = opts.outdir_img2img_samples

		shared.state.begin()
		if script is not None:
		p.outpath_grids = opts.outdir_img2img_grids
		p.outpath_samples = opts.outdir_img2img_samples
		p.script_args = [script_idx + 1] + [None] * (script.args_from - 1) + p.script_args
		processed = scripts.scripts_img2img.run(p, *p.script_args)
		else:

modules/api/models.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -104,8 +104,8 @@ StableDiffusionTxt2ImgProcessingAPI = PydanticModelGenerator(
		{"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}
		{"key": "send_images", "type": bool, "default": True},
		{"key": "save_images", "type": bool, "default": False},
		]
		).generate_model()

		@@ -120,8 +120,8 @@ StableDiffusionImg2ImgProcessingAPI = PydanticModelGenerator(
		{"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}
		{"key": "send_images", "type": bool, "default": True},
		{"key": "save_images", "type": bool, "default": False},
		]
		).generate_model()

modules/images.py

+0 −3

Original line number	Diff line number	Diff line
		@@ -489,9 +489,6 @@ 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