diff --git a/modules/control/run.py b/modules/control/run.py index a8a201457..98839fb50 100644 --- a/modules/control/run.py +++ b/modules/control/run.py @@ -563,7 +563,7 @@ def control_run(state: str = '', # pylint: disable=keyword-arg-before-vararg # outputs output = output or [] - for i, output_image in enumerate(output): + for _i, output_image in enumerate(output): if output_image is not None: output_images.append(output_image) if shared.opts.include_mask and not script_run: diff --git a/modules/processing.py b/modules/processing.py index a34408c05..89f702d0f 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -405,10 +405,6 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: else: images.save_image(image, p.outpath_samples, "", p.seeds[i], p.prompts[i], shared.opts.samples_format, info=info, p=p) # main save image - # add masks - if shared.opts.include_mask and not script_run: - if processed_image is not None and isinstance(processed_image, Image.Image): - output_images.append(processed_image) if hasattr(p, 'mask_for_overlay') and p.mask_for_overlay and any([shared.opts.save_mask, shared.opts.save_mask_composite, shared.opts.return_mask, shared.opts.return_mask_composite]): image_mask = p.mask_for_overlay.convert('RGB') image1 = image.convert('RGBA').convert('RGBa') diff --git a/modules/processing_class.py b/modules/processing_class.py index 5388f6bb9..50b6f2473 100644 --- a/modules/processing_class.py +++ b/modules/processing_class.py @@ -493,8 +493,6 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing): self.mask_for_overlay = Image.fromarray(np_mask) self.overlay_images = [] - latent_mask = self.latent_mask if self.latent_mask is not None else self.image_mask - add_color_corrections = shared.opts.img2img_color_correction and self.color_corrections is None if add_color_corrections: self.color_corrections = [] diff --git a/modules/scripts_manager.py b/modules/scripts_manager.py index 5f1cc92a7..1fbe6e630 100644 --- a/modules/scripts_manager.py +++ b/modules/scripts_manager.py @@ -367,7 +367,7 @@ class ScriptRunner: self.selectable_scripts.append(script) except Exception as e: errors.log.error(f'Script initialize: {path} {e}') - errors.display(e, f'script') + errors.display(e, 'script') def initialize_scripts(self, is_img2img=False, is_control=False): from modules import scripts_auto_postprocessing diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index b38e04992..9b22128c5 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -82,7 +82,7 @@ def create_sampler(name, model): # restore default scheduler if name == 'Default' and hasattr(model, 'scheduler'): return restore_default(model) - + # create sampler config = find_sampler_config(name) if config is None or config.constructor is None: diff --git a/modules/sd_unet.py b/modules/sd_unet.py index ca344a622..4d3dc30eb 100644 --- a/modules/sd_unet.py +++ b/modules/sd_unet.py @@ -37,7 +37,7 @@ def load_unet(model): if prior_text_encoder is not None: model.prior_pipe.text_encoder = None # Prevent OOM model.prior_pipe.text_encoder = prior_text_encoder.to(devices.device, dtype=devices.dtype) - elif any([m in model.__class__.__name__ for m in dit_models]): + elif any([m in model.__class__.__name__ for m in dit_models]): # noqa: C419 loaded_unet = shared.opts.sd_unet sd_models.load_diffuser() # TODO model load: force-reloading entire model as loading transformers only leads to massive memory usage else: diff --git a/modules/sd_vae_taesd.py b/modules/sd_vae_taesd.py index 00fc22ed1..d5e30c1bb 100644 --- a/modules/sd_vae_taesd.py +++ b/modules/sd_vae_taesd.py @@ -154,7 +154,7 @@ def decode(latents): return image except Exception as e: from modules import errors - errors.display(e, f'taesd"') + errors.display(e, 'taesd"') return warn_once(f'decode: {e}', variant=variant) diff --git a/modules/taesd/taehv.py b/modules/taesd/taehv.py index 2c9466f08..0f1828e45 100644 --- a/modules/taesd/taehv.py +++ b/modules/taesd/taehv.py @@ -220,7 +220,7 @@ class TAEHV(nn.Module): def forward(self, x): return self.c(x) - + def decode(self, x, parallel=True, show_progress_bar=False, return_dict=False): # pylint: disable=unused-argument """Decode a sequence of frames.""" return self.decode_video(x, parallel=False, show_progress_bar=False) diff --git a/scripts/xyz/xyz_grid_shared.py b/scripts/xyz/xyz_grid_shared.py index 2f53b4422..bcb355fef 100644 --- a/scripts/xyz/xyz_grid_shared.py +++ b/scripts/xyz/xyz_grid_shared.py @@ -294,7 +294,7 @@ def apply_control(field): else: p.xyz_init_images = getattr(p, 'init_images', None) if getattr(p, 'init_images', None) is None or len(getattr(p, 'init_images', [])) == 0: - shared.log.error(f'XYZ grid apply control: init image is required') + shared.log.error('XYZ grid apply control: init image is required') return x if field in ['controlnet', 't2i adapter', 'processor']: from modules.control import run, processor @@ -328,7 +328,7 @@ def apply_control(field): active_process, active_model, active_strength, active_start, active_end = run.check_active(p, unit.type, run.unit.current) has_models, selected_models, control_conditioning, control_guidance_start, control_guidance_end = run.check_enabled(p, unit.type, run.unit.current, active_model, active_strength, active_start, active_end) pipe = run.set_pipe(p, has_models, unit.type, selected_models, active_model, active_strength, control_conditioning, control_guidance_start, control_guidance_end) - processed_image = processor.preprocess_image(p, pipe, input_image=p.init_images[0], unit_type=unit.type, active_process=active_process, active_model=active_model, selected_models=selected_models, has_models=has_models) + _processed_image = processor.preprocess_image(p, pipe, input_image=p.init_images[0], unit_type=unit.type, active_process=active_process, active_model=active_model, selected_models=selected_models, has_models=has_models) if pipe is not None: shared.sd_model = pipe elif field == 'control_start':