From 16ab1a0af79547ee9ca7124b10c0cb22d4c61119 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 26 Jun 2024 08:58:22 -0400 Subject: [PATCH] lint updates --- modules/api/script.py | 4 ++-- modules/control/run.py | 3 +-- modules/devices.py | 4 ++-- modules/loader.py | 4 ++-- modules/model_t5.py | 1 + modules/processing_diffusers.py | 2 +- modules/sd_models.py | 2 +- modules/sd_samplers.py | 2 +- modules/sd_samplers_cfg_denoiser.py | 6 +++--- modules/sd_samplers_timesteps.py | 2 +- modules/sd_samplers_timesteps_impl.py | 2 +- modules/textual_inversion/textual_inversion.py | 6 +++--- modules/ui_extensions.py | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/api/script.py b/modules/api/script.py index 6f9e5a3f6..cae59791e 100644 --- a/modules/api/script.py +++ b/modules/api/script.py @@ -39,10 +39,10 @@ def get_script(script_name, script_runner): return script_runner.scripts[script_idx] def init_default_script_args(script_runner): - #find max idx from the scripts in runner and generate a none array to init script_args + # find max idx from the scripts in runner and generate a none array to init script_args last_arg_index = 1 for script in script_runner.scripts: - if last_arg_index < script.args_to: + if last_arg_index < script.args_to: # pylint disable=consider-using-max-builtin last_arg_index = script.args_to # None everywhere except position 0 to initialize script args script_args = [None]*last_arg_index diff --git a/modules/control/run.py b/modules/control/run.py index 7048827c9..cb4c121ca 100644 --- a/modules/control/run.py +++ b/modules/control/run.py @@ -692,5 +692,4 @@ def control_run(units: List[unit.Unit] = [], inputs: List[Image.Image] = [], ini if is_generator: yield (output_images, blended_image, html_txt, output_filename) else: - yield (output_images, blended_image, html_txt, output_filename) - return + return (output_images, blended_image, html_txt, output_filename) diff --git a/modules/devices.py b/modules/devices.py index d72555192..056e3a7a8 100644 --- a/modules/devices.py +++ b/modules/devices.py @@ -46,7 +46,7 @@ def get_gpu_info(): try: if shared.cmd_opts.use_openvino: return { - 'device': get_openvino_device(), + 'device': get_openvino_device(), # pylint: disable=used-before-assignment 'openvino': get_package_version("openvino"), } elif shared.cmd_opts.use_directml: @@ -311,7 +311,7 @@ def set_cuda_params(): inference_context = contextlib.nullcontext else: inference_context = torch.no_grad - log_device_name = get_raw_openvino_device() if shared.cmd_opts.use_openvino else torch.device(get_optimal_device_name()) + log_device_name = get_raw_openvino_device() if shared.cmd_opts.use_openvino else torch.device(get_optimal_device_name()) # pylint: disable=used-before-assignment log.debug(f'Desired Torch parameters: dtype={shared.opts.cuda_dtype} no-half={shared.opts.no_half} no-half-vae={shared.opts.no_half_vae} upscast={shared.opts.upcast_sampling}') log.info(f'Setting Torch parameters: device={log_device_name} dtype={dtype} vae={dtype_vae} unet={dtype_unet} context={inference_context.__name__} fp16={fp16_ok} bf16={bf16_ok} optimization={shared.opts.cross_attention_optimization}') diff --git a/modules/loader.py b/modules/loader.py index 1fe3ba81e..e7cb03339 100644 --- a/modules/loader.py +++ b/modules/loader.py @@ -35,7 +35,7 @@ timer.startup.record("torch") import transformers # pylint: disable=W0611,C0411 timer.startup.record("transformers") -import onnxruntime +import onnxruntime # pylint: disable=W0611,C0411 onnxruntime.set_default_logger_severity(3) timer.startup.record("onnx") @@ -50,7 +50,7 @@ timer.startup.record("pydantic") import diffusers # pylint: disable=W0611,C0411 import diffusers.loaders.single_file # pylint: disable=W0611,C0411 logging.getLogger("diffusers.loaders.single_file").setLevel(logging.ERROR) -from tqdm.rich import tqdm +from tqdm.rich import tqdm # pylint: disable=W0611,C0411 diffusers.loaders.single_file.logging.tqdm = partial(tqdm, unit='C') timer.startup.record("diffusers") diff --git a/modules/model_t5.py b/modules/model_t5.py index 7b735794c..1a1e40382 100644 --- a/modules/model_t5.py +++ b/modules/model_t5.py @@ -75,3 +75,4 @@ def set_t5(pipe, module, t5=None, cache_dir=None): else: pipe.maybe_free_model_hooks() devices.torch_gc() + return pipe diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py index dca8e0a71..b4be9940b 100644 --- a/modules/processing_diffusers.py +++ b/modules/processing_diffusers.py @@ -85,7 +85,7 @@ def process_diffusers(p: processing.StableDiffusionProcessing): shared.sd_model = update_pipeline(shared.sd_model, p) shared.log.info(f'Base: class={shared.sd_model.__class__.__name__}') - update_sampler(p, shared.sd_model) # TODO SD3 + update_sampler(p, shared.sd_model) base_args = set_pipeline_args( p=p, model=shared.sd_model, diff --git a/modules/sd_models.py b/modules/sd_models.py index f039ea316..5b1870c4e 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -547,7 +547,7 @@ def change_backend(): shared.native = shared.backend == shared.Backend.DIFFUSERS checkpoints_loaded.clear() from modules.sd_samplers import list_samplers - list_samplers(shared.backend) + list_samplers() list_models() from modules.sd_vae import refresh_vae_list refresh_vae_list() diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index 886b49ce3..5be3526ae 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -14,7 +14,7 @@ samplers_map = {} loaded_config = None -def list_samplers(backend_name = shared.backend): +def list_samplers(): global all_samplers # pylint: disable=global-statement global all_samplers_map # pylint: disable=global-statement global samplers # pylint: disable=global-statement diff --git a/modules/sd_samplers_cfg_denoiser.py b/modules/sd_samplers_cfg_denoiser.py index 6685a4d38..4b42d4918 100644 --- a/modules/sd_samplers_cfg_denoiser.py +++ b/modules/sd_samplers_cfg_denoiser.py @@ -1,5 +1,5 @@ -# TODO a1111 compatibility module -# TODO cfg_denoiser implementation missing +# a1111 compatibility module +# cfg_denoiser implementation missing import torch from modules import prompt_parser, devices, sd_samplers_common @@ -95,7 +95,7 @@ class CFGDenoiser(torch.nn.Module): if state.interrupted or state.skipped: raise sd_samplers_common.InterruptedException - # TODO cfg_scale implementation missing + # cfg_scale implementation missing for original backend # if sd_samplers_common.apply_refiner(self): # cond = self.sampler.sampler_extra_args['cond'] # uncond = self.sampler.sampler_extra_args['uncond'] diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py index 0e8e01909..aa9e0bbe2 100644 --- a/modules/sd_samplers_timesteps.py +++ b/modules/sd_samplers_timesteps.py @@ -1,4 +1,4 @@ -# TODO a1111 compatibility module +# a1111 compatibility module import torch from modules import sd_samplers_common, sd_samplers_timesteps_impl, sd_samplers_compvis diff --git a/modules/sd_samplers_timesteps_impl.py b/modules/sd_samplers_timesteps_impl.py index 03716ee08..5784a760b 100644 --- a/modules/sd_samplers_timesteps_impl.py +++ b/modules/sd_samplers_timesteps_impl.py @@ -1,4 +1,4 @@ -# TODO a1111 compatibility module +# a1111 compatibility module import torch import tqdm diff --git a/modules/textual_inversion/textual_inversion.py b/modules/textual_inversion/textual_inversion.py index b0779716b..1d1e5057e 100644 --- a/modules/textual_inversion/textual_inversion.py +++ b/modules/textual_inversion/textual_inversion.py @@ -259,14 +259,14 @@ class EmbeddingDatabase: if ext in ['.PNG', '.WEBP', '.JXL', '.AVIF']: if '.preview' in filename.lower(): - return + return None embed_image = Image.open(path) if hasattr(embed_image, 'text') and 'sd-ti-embedding' in embed_image.text: data = embedding_from_b64(embed_image.text['sd-ti-embedding']) else: data = extract_image_data_embed(embed_image) if not data: # if data is None, means this is not an embeding, just a preview image - return + return None elif ext in ['.BIN', '.PT']: data = torch.load(path, map_location="cpu") elif ext in ['.SAFETENSORS']: @@ -284,7 +284,7 @@ class EmbeddingDatabase: elif type(data) == dict and type(next(iter(data.values()))) == torch.Tensor: if len(data.keys()) != 1: self.skipped_embeddings[name] = Embedding(None, name=name, filename=path) - return + return None emb = next(iter(data.values())) if len(emb.shape) == 1: emb = emb.unsqueeze(0) diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py index 8a08fc322..4e3fd3588 100644 --- a/modules/ui_extensions.py +++ b/modules/ui_extensions.py @@ -206,7 +206,7 @@ def uninstall_extension(extension_path, search_text, sort_column): if len(found) > 0 and os.path.isdir(extension_path): found = found[0] try: - shutil.rmtree(found.path, ignore_errors=False, onerror=errorRemoveReadonly) + shutil.rmtree(found.path, ignore_errors=False, onerror=errorRemoveReadonly) # pylint: disable=deprecated-argument # extensions.extensions = [extension for extension in extensions.extensions if os.path.abspath(found.path) != os.path.abspath(extension_path)] except Exception as e: shared.log.warning(f'Extension uninstall failed: {found.path} {e}')