Safeguard setting restore logic against exceptions (cccc5a20) · Commits · github_fork / Stable Diffusion Webui

scripts/xy_grid.py

+26 −22

Original line number	Diff line number	Diff line
		@@ -233,6 +233,21 @@ def draw_xy_grid(p, xs, ys, x_labels, y_labels, cell, draw_legend, include_lone_
		return processed_result


		class SharedSettingsStackHelper(object):
		def __enter__(self):
		self.CLIP_stop_at_last_layers = opts.CLIP_stop_at_last_layers
		self.hypernetwork = opts.sd_hypernetwork
		self.model = shared.sd_model

		def __exit__(self, exc_type, exc_value, tb):
		modules.sd_models.reload_model_weights(self.model)

		hypernetwork.load_hypernetwork(self.hypernetwork)
		hypernetwork.apply_strength()

		opts.data["CLIP_stop_at_last_layers"] = self.CLIP_stop_at_last_layers


		re_range = re.compile(r"\s([+-]?\s\d+)\s-\s([+-]?\s\d+)(?:\s\(([+-]\d+)\s\))?\s")
		re_range_float = re.compile(r"\s([+-]?\s\d+(?:.\d)?)\s-\s([+-]?\s\d+(?:.\d)?)(?:\s\(([+-]\d+(?:.\d)?)\s\))?\s*")

		@@ -267,9 +282,6 @@ class Script(scripts.Script):
		if not opts.return_grid:
		p.batch_size = 1


		CLIP_stop_at_last_layers = opts.CLIP_stop_at_last_layers

		def process_axis(opt, vals):
		if opt.label == 'Nothing':
		return [0]
		@@ -367,6 +379,7 @@ class Script(scripts.Script):

		return process_images(pc)

		with SharedSettingsStackHelper():
		processed = draw_xy_grid(
		p,
		xs=xs,
		@@ -381,13 +394,4 @@ class Script(scripts.Script):
		if opts.grid_save:
		images.save_image(processed.images[0], p.outpath_grids, "xy_grid", prompt=p.prompt, seed=processed.seed, grid=True, p=p)

		# restore checkpoint in case it was changed by axes
		modules.sd_models.reload_model_weights(shared.sd_model)

		hypernetwork.load_hypernetwork(opts.sd_hypernetwork)
		hypernetwork.apply_strength()


		opts.data["CLIP_stop_at_last_layers"] = CLIP_stop_at_last_layers

		return processed

Admin message