diff --git a/comfy/utils.py b/comfy/utils.py index 884404cce..85c5d1b93 100644 --- a/comfy/utils.py +++ b/comfy/utils.py @@ -6,6 +6,14 @@ import safetensors.torch import numpy as np from PIL import Image import logging +import json + + +def dump_json(data): + # Roundtrip once to get rid of NaN, Infinity and -Infinity + good_data = json.loads(json.dumps(data), parse_constant=lambda x: None) + return json.dumps(good_data, allow_nan=False) + def load_torch_file(ckpt, safe_load=False, device=None): if device is None: diff --git a/comfy_extras/nodes_images.py b/comfy_extras/nodes_images.py index af37666b2..1e262f2c6 100644 --- a/comfy_extras/nodes_images.py +++ b/comfy_extras/nodes_images.py @@ -1,12 +1,12 @@ import nodes import folder_paths from comfy.cli_args import args +import comfy.utils from PIL import Image from PIL.PngImagePlugin import PngInfo import numpy as np -import json import os MAX_RESOLUTION = nodes.MAX_RESOLUTION @@ -109,11 +109,11 @@ class SaveAnimatedWEBP: metadata = pil_images[0].getexif() if not args.disable_metadata: if prompt is not None: - metadata[0x0110] = "prompt:{}".format(json.dumps(prompt)) + metadata[0x0110] = "prompt:{}".format(comfy.utils.dump_json(prompt)) if extra_pnginfo is not None: inital_exif = 0x010f for x in extra_pnginfo: - metadata[inital_exif] = "{}:{}".format(x, json.dumps(extra_pnginfo[x])) + metadata[inital_exif] = "{}:{}".format(x, comfy.utils.dump_json(extra_pnginfo[x])) inital_exif -= 1 if num_frames == 0: @@ -171,10 +171,10 @@ class SaveAnimatedPNG: if not args.disable_metadata: metadata = PngInfo() if prompt is not None: - metadata.add(b"comf", "prompt".encode("latin-1", "strict") + b"\0" + json.dumps(prompt).encode("latin-1", "strict"), after_idat=True) + metadata.add(b"comf", "prompt".encode("latin-1", "strict") + b"\0" + comfy.utils.dump_json(prompt).encode("latin-1", "strict"), after_idat=True) if extra_pnginfo is not None: for x in extra_pnginfo: - metadata.add(b"comf", x.encode("latin-1", "strict") + b"\0" + json.dumps(extra_pnginfo[x]).encode("latin-1", "strict"), after_idat=True) + metadata.add(b"comf", x.encode("latin-1", "strict") + b"\0" + comfy.utils.dump_json(extra_pnginfo[x]).encode("latin-1", "strict"), after_idat=True) file = f"{filename}_{counter:05}_.png" pil_images[0].save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=compress_level, save_all=True, duration=int(1000.0/fps), append_images=pil_images[1:]) diff --git a/comfy_extras/nodes_model_merging.py b/comfy_extras/nodes_model_merging.py index b0d149c60..d47d14aa6 100644 --- a/comfy_extras/nodes_model_merging.py +++ b/comfy_extras/nodes_model_merging.py @@ -6,7 +6,6 @@ import comfy.model_sampling import torch import folder_paths -import json import os from comfy.cli_args import args @@ -169,7 +168,7 @@ def save_checkpoint(model, clip=None, vae=None, clip_vision=None, filename_prefi full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, output_dir) prompt_info = "" if prompt is not None: - prompt_info = json.dumps(prompt) + prompt_info = comfy.utils.dump_json(prompt) metadata = {} @@ -214,7 +213,7 @@ def save_checkpoint(model, clip=None, vae=None, clip_vision=None, filename_prefi metadata["prompt"] = prompt_info if extra_pnginfo is not None: for x in extra_pnginfo: - metadata[x] = json.dumps(extra_pnginfo[x]) + metadata[x] = comfy.utils.dump_json(extra_pnginfo[x]) output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) @@ -260,14 +259,14 @@ class CLIPSave: def save(self, clip, filename_prefix, prompt=None, extra_pnginfo=None): prompt_info = "" if prompt is not None: - prompt_info = json.dumps(prompt) + prompt_info = comfy.utils.dump_json(prompt) metadata = {} if not args.disable_metadata: metadata["prompt"] = prompt_info if extra_pnginfo is not None: for x in extra_pnginfo: - metadata[x] = json.dumps(extra_pnginfo[x]) + metadata[x] = comfy.utils.dump_json(extra_pnginfo[x]) comfy.model_management.load_models_gpu([clip.load_model()], force_patch_weights=True) clip_sd = clip.get_sd() @@ -317,14 +316,14 @@ class VAESave: full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir) prompt_info = "" if prompt is not None: - prompt_info = json.dumps(prompt) + prompt_info = comfy.utils.dump_json(prompt) metadata = {} if not args.disable_metadata: metadata["prompt"] = prompt_info if extra_pnginfo is not None: for x in extra_pnginfo: - metadata[x] = json.dumps(extra_pnginfo[x]) + metadata[x] = comfy.utils.dump_json(extra_pnginfo[x]) output_checkpoint = f"{filename}_{counter:05}_.safetensors" output_checkpoint = os.path.join(full_output_folder, output_checkpoint) diff --git a/nodes.py b/nodes.py index 6fbeb377e..9939fbf3c 100644 --- a/nodes.py +++ b/nodes.py @@ -2,7 +2,6 @@ import torch import os import sys -import json import hashlib import traceback import math @@ -422,14 +421,14 @@ class SaveLatent: # support save metadata for latent sharing prompt_info = "" if prompt is not None: - prompt_info = json.dumps(prompt) + prompt_info = comfy.utils.dump_json(prompt) metadata = None if not args.disable_metadata: metadata = {"prompt": prompt_info} if extra_pnginfo is not None: for x in extra_pnginfo: - metadata[x] = json.dumps(extra_pnginfo[x]) + metadata[x] = comfy.utils.dump_json(extra_pnginfo[x]) file = f"{filename}_{counter:05}_.latent" @@ -1421,10 +1420,10 @@ class SaveImage: if not args.disable_metadata: metadata = PngInfo() if prompt is not None: - metadata.add_text("prompt", json.dumps(prompt)) + metadata.add_text("prompt", comfy.utils.dump_json(prompt)) if extra_pnginfo is not None: for x in extra_pnginfo: - metadata.add_text(x, json.dumps(extra_pnginfo[x])) + metadata.add_text(x, comfy.utils.dump_json(extra_pnginfo[x])) filename_with_batch_num = filename.replace("%batch_num%", str(batch_number)) file = f"{filename_with_batch_num}_{counter:05}_.png"