remove duplicate code from #3970 (4a8cf01f) · Commits · github_fork / Stable Diffusion Webui

modules/api/api.py

+1 −9

Original line number	Diff line number	Diff line
		@@ -178,15 +178,7 @@ class Api:

		progress = min(progress, 1)

		# copy from check_progress_call of ui.py

		if shared.parallel_processing_allowed:
		if shared.state.sampling_step - shared.state.current_image_sampling_step >= shared.opts.show_progress_every_n_steps and shared.state.current_latent is not None:
		if shared.opts.show_progress_grid:
		shared.state.current_image = samples_to_image_grid(shared.state.current_latent)
		else:
		shared.state.current_image = sample_to_image(shared.state.current_latent)
		shared.state.current_image_sampling_step = shared.state.sampling_step
		shared.state.set_current_image()

		current_image = None
		if shared.state.current_image and not req.skip_current_image:

+14 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,20 @@ class State:

		devices.torch_gc()

		"""sets self.current_image from self.current_latent if enough sampling steps have been made after the last call to this"""
		def set_current_image(self):
		if not parallel_processing_allowed:
		return

		if self.sampling_step - self.current_image_sampling_step >= opts.show_progress_every_n_steps and self.current_latent is not None:
		if opts.show_progress_grid:
		self.current_image = sd_samplers.samples_to_image_grid(self.current_latent)
		else:
		self.current_image = sd_samplers.sample_to_image(self.current_latent)

		self.current_image_sampling_step = self.sampling_step


		state = State()

		artist_db = modules.artists.ArtistsDatabase(os.path.join(script_path, 'artists.csv'))

+1 −9

Original line number	Diff line number	Diff line
		@@ -277,15 +277,7 @@ def check_progress_call(id_part):
		preview_visibility = gr_show(False)

		if opts.show_progress_every_n_steps > 0:
		if shared.parallel_processing_allowed:

		if shared.state.sampling_step - shared.state.current_image_sampling_step >= opts.show_progress_every_n_steps and shared.state.current_latent is not None:
		if opts.show_progress_grid:
		shared.state.current_image = modules.sd_samplers.samples_to_image_grid(shared.state.current_latent)
		else:
		shared.state.current_image = modules.sd_samplers.sample_to_image(shared.state.current_latent)
		shared.state.current_image_sampling_step = shared.state.sampling_step

		shared.state.set_current_image()
		image = shared.state.current_image

		if image is None: