diff --git a/comfy_extras/nodes_lora_extract.py b/comfy_extras/nodes_lora_extract.py index 152009be7..fb89e03f4 100644 --- a/comfy_extras/nodes_lora_extract.py +++ b/comfy_extras/nodes_lora_extract.py @@ -115,7 +115,7 @@ class LoraSave(io.ComfyNode): if text_encoder_diff is not None: output_sd = calc_lora_model(text_encoder_diff.patcher, rank, "", "text_encoders.", output_sd, lora_type, bias_diff=bias_diff) - output_checkpoint = folder_paths.format_output_filename(filename, counter, "safetensors") + output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) comfy.utils.save_torch_file(output_sd, output_checkpoint, metadata=None) diff --git a/comfy_extras/nodes_model_merging.py b/comfy_extras/nodes_model_merging.py index 95178b539..5384ed531 100644 --- a/comfy_extras/nodes_model_merging.py +++ b/comfy_extras/nodes_model_merging.py @@ -221,7 +221,7 @@ def save_checkpoint(model, clip=None, vae=None, clip_vision=None, filename_prefi for x in extra_pnginfo: metadata[x] = json.dumps(extra_pnginfo[x]) - output_checkpoint = folder_paths.format_output_filename(filename, counter, "safetensors") + output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) comfy.sd.save_checkpoint(output_checkpoint, model, clip, vae, clip_vision, metadata=metadata, extra_keys=extra_keys) @@ -297,7 +297,7 @@ class CLIPSave: full_output_folder, filename, counter, subfolder, filename_prefix_ = folder_paths.get_save_image_path(filename_prefix_, self.output_dir) - output_checkpoint = folder_paths.format_output_filename(filename, counter, "safetensors") + output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) current_clip_sd = comfy.utils.state_dict_prefix_replace(current_clip_sd, replace_prefix) @@ -333,7 +333,7 @@ class VAESave: for x in extra_pnginfo: metadata[x] = json.dumps(extra_pnginfo[x]) - output_checkpoint = folder_paths.format_output_filename(filename, counter, "safetensors") + output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) comfy.utils.save_torch_file(vae.get_sd(), output_checkpoint, metadata=metadata) diff --git a/comfy_extras/nodes_train.py b/comfy_extras/nodes_train.py index bbe1d0eba..024a89391 100644 --- a/comfy_extras/nodes_train.py +++ b/comfy_extras/nodes_train.py @@ -1221,9 +1221,9 @@ class SaveLoRA(io.ComfyNode): folder_paths.get_save_image_path(prefix, output_dir) ) if steps is None: - output_checkpoint = folder_paths.format_output_filename(filename, counter, "safetensors") + output_checkpoint = f"{filename}_{counter:05}_.safetensors" else: - output_checkpoint = folder_paths.format_output_filename(f"{filename}_{steps}_steps", counter, "safetensors") + output_checkpoint = f"{filename}_{steps}_steps_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) safetensors.torch.save_file(lora, output_checkpoint) return io.NodeOutput() diff --git a/nodes.py b/nodes.py index 1a136a989..d716d61c5 100644 --- a/nodes.py +++ b/nodes.py @@ -508,7 +508,7 @@ class SaveLatent: for x in extra_pnginfo: metadata[x] = json.dumps(extra_pnginfo[x]) - file = folder_paths.format_output_filename(filename, counter, "latent") + file = f"{filename}_{counter:05}_.latent" results: list[FileLocator] = [] results.append({