Merge eadb911018 into 712cca36a1

2026-01-30 16:20:17 +08:00 · 2026-01-13 23:30:05 -06:00
61 changed files with 741 additions and 2093 deletions
--- a/README.md
+++ b/README.md
@ -240,7 +240,7 @@ These have less hardware support than the builds above but they work on windows.

 RDNA 3 (RX 7000 series):

-```pip install --pre torch torchvision torchaudio --index-url https://rocm.nightlies.amd.com/v2/gfx110X-all/```
+```pip install --pre torch torchvision torchaudio --index-url https://rocm.nightlies.amd.com/v2/gfx110X-dgpu/```

 RDNA 3.5 (Strix halo/Ryzen AI Max+ 365):

--- a/comfy/clip_vision.py
+++ b/comfy/clip_vision.py
@ -66,7 +66,6 @@ class ClipVisionModel():
        outputs = Output()
        outputs["last_hidden_state"] = out[0].to(comfy.model_management.intermediate_device())
        outputs["image_embeds"] = out[2].to(comfy.model_management.intermediate_device())
-        outputs["image_sizes"] = [pixel_values.shape[1:]] * pixel_values.shape[0]
        if self.return_all_hidden_states:
            all_hs = out[1].to(comfy.model_management.intermediate_device())
            outputs["penultimate_hidden_states"] = all_hs[:, -2]
--- a/comfy/float.py
+++ b/comfy/float.py
@ -137,44 +137,10 @@ def to_blocked(input_matrix, flatten: bool = True) -> torch.Tensor:
    return rearranged.reshape(padded_rows, padded_cols)


-def stochastic_round_quantize_nvfp4_block(x, per_tensor_scale, generator):
+def stochastic_round_quantize_nvfp4(x, per_tensor_scale, pad_16x, seed=0):
    F4_E2M1_MAX = 6.0
    F8_E4M3_MAX = 448.0

-    orig_shape = x.shape
-
-    block_size = 16
-
-    x = x.reshape(orig_shape[0], -1, block_size)
-    scaled_block_scales_fp8 = torch.clamp(((torch.amax(torch.abs(x), dim=-1)) / F4_E2M1_MAX) / per_tensor_scale.to(x.dtype), max=F8_E4M3_MAX).to(torch.float8_e4m3fn)
-    x = x / (per_tensor_scale.to(x.dtype) * scaled_block_scales_fp8.to(x.dtype)).unsqueeze(-1)
-
-    x = x.view(orig_shape).nan_to_num()
-    data_lp = stochastic_float_to_fp4_e2m1(x, generator=generator)
-    return data_lp, scaled_block_scales_fp8
-
-
-def stochastic_round_quantize_nvfp4(x, per_tensor_scale, pad_16x, seed=0):
-    def roundup(x: int, multiple: int) -> int:
-        """Round up x to the nearest multiple."""
-        return ((x + multiple - 1) // multiple) * multiple
-
-    generator = torch.Generator(device=x.device)
-    generator.manual_seed(seed)
-
-    # Handle padding
-    if pad_16x:
-        rows, cols = x.shape
-        padded_rows = roundup(rows, 16)
-        padded_cols = roundup(cols, 16)
-        if padded_rows != rows or padded_cols != cols:
-            x = torch.nn.functional.pad(x, (0, padded_cols - cols, 0, padded_rows - rows))
-
-    x, blocked_scaled = stochastic_round_quantize_nvfp4_block(x, per_tensor_scale, generator)
-    return x, to_blocked(blocked_scaled, flatten=False)
-
-
-def stochastic_round_quantize_nvfp4_by_block(x, per_tensor_scale, pad_16x, seed=0, block_size=4096 * 4096):
    def roundup(x: int, multiple: int) -> int:
        """Round up x to the nearest multiple."""
        return ((x + multiple - 1) // multiple) * multiple
@ -192,20 +158,16 @@ def stochastic_round_quantize_nvfp4_by_block(x, per_tensor_scale, pad_16x, seed=
            # what we want to produce. If we pad here, we want the padded output.
            orig_shape = x.shape

-    orig_shape = list(orig_shape)
+    block_size = 16

-    output_fp4 = torch.empty(orig_shape[:-1] + [orig_shape[-1] // 2], dtype=torch.uint8, device=x.device)
-    output_block = torch.empty(orig_shape[:-1] + [orig_shape[-1] // 16], dtype=torch.float8_e4m3fn, device=x.device)
+    x = x.reshape(orig_shape[0], -1, block_size)
+    scaled_block_scales_fp8 = torch.clamp(((torch.amax(torch.abs(x), dim=-1)) / F4_E2M1_MAX) / per_tensor_scale.to(x.dtype), max=F8_E4M3_MAX).to(torch.float8_e4m3fn)
+    x /= (per_tensor_scale.to(x.dtype) * scaled_block_scales_fp8.to(x.dtype)).unsqueeze(-1)

    generator = torch.Generator(device=x.device)
    generator.manual_seed(seed)

-    num_slices = max(1, (x.numel() / block_size))
-    slice_size = max(1, (round(x.shape[0] / num_slices)))
-
-    for i in range(0, x.shape[0], slice_size):
-        fp4, block = stochastic_round_quantize_nvfp4_block(x[i: i + slice_size], per_tensor_scale, generator=generator)
-        output_fp4[i:i + slice_size].copy_(fp4)
-        output_block[i:i + slice_size].copy_(block)
-
-    return output_fp4, to_blocked(output_block, flatten=False)
+    x = x.view(orig_shape).nan_to_num()
+    data_lp = stochastic_float_to_fp4_e2m1(x, generator=generator)
+    blocked_scales = to_blocked(scaled_block_scales_fp8, flatten=False)
+    return data_lp, blocked_scales
--- a/comfy/quant_ops.py
+++ b/comfy/quant_ops.py
@ -104,7 +104,7 @@ class TensorCoreNVFP4Layout(_CKNvfp4Layout):
        needs_padding = padded_shape != orig_shape

        if stochastic_rounding > 0:
-            qdata, block_scale = comfy.float.stochastic_round_quantize_nvfp4_by_block(tensor, scale, pad_16x=needs_padding, seed=stochastic_rounding)
+            qdata, block_scale = comfy.float.stochastic_round_quantize_nvfp4(tensor, scale, pad_16x=needs_padding, seed=stochastic_rounding)
        else:
            qdata, block_scale = ck.quantize_nvfp4(tensor, scale, pad_16x=needs_padding)

--- a/comfy/sd.py
+++ b/comfy/sd.py
@ -1014,7 +1014,6 @@ class CLIPType(Enum):
    KANDINSKY5 = 22
    KANDINSKY5_IMAGE = 23
    NEWBIE = 24
-    FLUX2 = 25


 def load_clip(ckpt_paths, embedding_directory=None, clip_type=CLIPType.STABLE_DIFFUSION, model_options={}):
@ -1047,7 +1046,6 @@ class TEModel(Enum):
    QWEN3_2B = 17
    GEMMA_3_12B = 18
    JINA_CLIP_2 = 19
-    QWEN3_8B = 20


 def detect_te_model(sd):
@ -1091,8 +1089,6 @@ def detect_te_model(sd):
                return TEModel.QWEN3_4B
            elif weight.shape[0] == 2048:
                return TEModel.QWEN3_2B
-            elif weight.shape[0] == 4096:
-                return TEModel.QWEN3_8B
        if weight.shape[0] == 5120:
            if "model.layers.39.post_attention_layernorm.weight" in sd:
                return TEModel.MISTRAL3_24B
@ -1218,18 +1214,11 @@ def load_text_encoder_state_dicts(state_dicts=[], embedding_directory=None, clip
            clip_target.tokenizer = comfy.text_encoders.flux.Flux2Tokenizer
            tokenizer_data["tekken_model"] = clip_data[0].get("tekken_model", None)
        elif te_model == TEModel.QWEN3_4B:
-            if clip_type == CLIPType.FLUX or clip_type == CLIPType.FLUX2:
-                clip_target.clip = comfy.text_encoders.flux.klein_te(**llama_detect(clip_data), model_type="qwen3_4b")
-                clip_target.tokenizer = comfy.text_encoders.flux.KleinTokenizer
-            else:
-                clip_target.clip = comfy.text_encoders.z_image.te(**llama_detect(clip_data))
-                clip_target.tokenizer = comfy.text_encoders.z_image.ZImageTokenizer
+            clip_target.clip = comfy.text_encoders.z_image.te(**llama_detect(clip_data))
+            clip_target.tokenizer = comfy.text_encoders.z_image.ZImageTokenizer
        elif te_model == TEModel.QWEN3_2B:
            clip_target.clip = comfy.text_encoders.ovis.te(**llama_detect(clip_data))
            clip_target.tokenizer = comfy.text_encoders.ovis.OvisTokenizer
-        elif te_model == TEModel.QWEN3_8B:
-            clip_target.clip = comfy.text_encoders.flux.klein_te(**llama_detect(clip_data), model_type="qwen3_8b")
-            clip_target.tokenizer = comfy.text_encoders.flux.KleinTokenizer8B
        elif te_model == TEModel.JINA_CLIP_2:
            clip_target.clip = comfy.text_encoders.jina_clip_2.JinaClip2TextModelWrapper
            clip_target.tokenizer = comfy.text_encoders.jina_clip_2.JinaClip2TokenizerWrapper
--- a/comfy/supported_models.py
+++ b/comfy/supported_models.py
@ -763,7 +763,7 @@ class Flux2(Flux):

    def __init__(self, unet_config):
        super().__init__(unet_config)
-        self.memory_usage_factor = self.memory_usage_factor * (2.0 * 2.0) * (unet_config['hidden_size'] / 2604)
+        self.memory_usage_factor = self.memory_usage_factor * (2.0 * 2.0) * 2.36

    def get_model(self, state_dict, prefix="", device=None):
        out = model_base.Flux2(self, device=device)
@ -1042,7 +1042,7 @@ class ZImage(Lumina2):
        "shift": 3.0,
    }

-    memory_usage_factor = 2.8
+    memory_usage_factor = 2.0

    supported_inference_dtypes = [torch.bfloat16, torch.float32]

--- a/comfy/text_encoders/flux.py
+++ b/comfy/text_encoders/flux.py
@ -3,7 +3,7 @@ import comfy.text_encoders.t5
 import comfy.text_encoders.sd3_clip
 import comfy.text_encoders.llama
 import comfy.model_management
-from transformers import T5TokenizerFast, LlamaTokenizerFast, Qwen2Tokenizer
+from transformers import T5TokenizerFast, LlamaTokenizerFast
 import torch
 import os
 import json
@ -172,60 +172,3 @@ def flux2_te(dtype_llama=None, llama_quantization_metadata=None, pruned=False):
                model_options["num_layers"] = 30
            super().__init__(device=device, dtype=dtype, model_options=model_options)
    return Flux2TEModel_
-
-class Qwen3Tokenizer(sd1_clip.SDTokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}):
-        tokenizer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "qwen25_tokenizer")
-        super().__init__(tokenizer_path, pad_with_end=False, embedding_size=2560, embedding_key='qwen3_4b', tokenizer_class=Qwen2Tokenizer, has_start_token=False, has_end_token=False, pad_to_max_length=False, max_length=99999999, min_length=512, pad_token=151643, tokenizer_data=tokenizer_data)
-
-class Qwen3Tokenizer8B(sd1_clip.SDTokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}):
-        tokenizer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "qwen25_tokenizer")
-        super().__init__(tokenizer_path, pad_with_end=False, embedding_size=4096, embedding_key='qwen3_8b', tokenizer_class=Qwen2Tokenizer, has_start_token=False, has_end_token=False, pad_to_max_length=False, max_length=99999999, min_length=512, pad_token=151643, tokenizer_data=tokenizer_data)
-
-class KleinTokenizer(sd1_clip.SD1Tokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}, name="qwen3_4b"):
-        if name == "qwen3_4b":
-            tokenizer = Qwen3Tokenizer
-        elif name == "qwen3_8b":
-            tokenizer = Qwen3Tokenizer8B
-
-        super().__init__(embedding_directory=embedding_directory, tokenizer_data=tokenizer_data, name=name, tokenizer=tokenizer)
-        self.llama_template = "<|im_start|>user\n{}<|im_end|>\n<|im_start|>assistant\n<think>\n\n</think>\n\n"
-
-    def tokenize_with_weights(self, text, return_word_ids=False, llama_template=None, **kwargs):
-        if llama_template is None:
-            llama_text = self.llama_template.format(text)
-        else:
-            llama_text = llama_template.format(text)
-
-        tokens = super().tokenize_with_weights(llama_text, return_word_ids=return_word_ids, disable_weights=True, **kwargs)
-        return tokens
-
-class KleinTokenizer8B(KleinTokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}, name="qwen3_8b"):
-        super().__init__(embedding_directory=embedding_directory, tokenizer_data=tokenizer_data, name=name)
-
-class Qwen3_4BModel(sd1_clip.SDClipModel):
-    def __init__(self, device="cpu", layer=[9, 18, 27], layer_idx=None, dtype=None, attention_mask=True, model_options={}):
-        super().__init__(device=device, layer=layer, layer_idx=layer_idx, textmodel_json_config={}, dtype=dtype, special_tokens={"pad": 151643}, layer_norm_hidden_state=False, model_class=comfy.text_encoders.llama.Qwen3_4B, enable_attention_masks=attention_mask, return_attention_masks=attention_mask, model_options=model_options)
-
-class Qwen3_8BModel(sd1_clip.SDClipModel):
-    def __init__(self, device="cpu", layer=[9, 18, 27], layer_idx=None, dtype=None, attention_mask=True, model_options={}):
-        super().__init__(device=device, layer=layer, layer_idx=layer_idx, textmodel_json_config={}, dtype=dtype, special_tokens={"pad": 151643}, layer_norm_hidden_state=False, model_class=comfy.text_encoders.llama.Qwen3_8B, enable_attention_masks=attention_mask, return_attention_masks=attention_mask, model_options=model_options)
-
-def klein_te(dtype_llama=None, llama_quantization_metadata=None, model_type="qwen3_4b"):
-    if model_type == "qwen3_4b":
-        model = Qwen3_4BModel
-    elif model_type == "qwen3_8b":
-        model = Qwen3_8BModel
-
-    class Flux2TEModel_(Flux2TEModel):
-        def __init__(self, device="cpu", dtype=None, model_options={}):
-            if llama_quantization_metadata is not None:
-                model_options = model_options.copy()
-                model_options["quantization_metadata"] = llama_quantization_metadata
-            if dtype_llama is not None:
-                dtype = dtype_llama
-            super().__init__(device=device, dtype=dtype, name=model_type, model_options=model_options, clip_model=model)
-    return Flux2TEModel_
--- a/comfy/text_encoders/llama.py
+++ b/comfy/text_encoders/llama.py
@ -99,28 +99,6 @@ class Qwen3_4BConfig:
    rope_scale = None
    final_norm: bool = True

-@dataclass
-class Qwen3_8BConfig:
-    vocab_size: int = 151936
-    hidden_size: int = 4096
-    intermediate_size: int = 12288
-    num_hidden_layers: int = 36
-    num_attention_heads: int = 32
-    num_key_value_heads: int = 8
-    max_position_embeddings: int = 40960
-    rms_norm_eps: float = 1e-6
-    rope_theta: float = 1000000.0
-    transformer_type: str = "llama"
-    head_dim = 128
-    rms_norm_add = False
-    mlp_activation = "silu"
-    qkv_bias = False
-    rope_dims = None
-    q_norm = "gemma3"
-    k_norm = "gemma3"
-    rope_scale = None
-    final_norm: bool = True
-
@dataclass
 class Ovis25_2BConfig:
    vocab_size: int = 151936
@ -650,15 +628,6 @@ class Qwen3_4B(BaseLlama, torch.nn.Module):
        self.model = Llama2_(config, device=device, dtype=dtype, ops=operations)
        self.dtype = dtype

-class Qwen3_8B(BaseLlama, torch.nn.Module):
-    def __init__(self, config_dict, dtype, device, operations):
-        super().__init__()
-        config = Qwen3_8BConfig(**config_dict)
-        self.num_layers = config.num_hidden_layers
-
-        self.model = Llama2_(config, device=device, dtype=dtype, ops=operations)
-        self.dtype = dtype
-
 class Ovis25_2B(BaseLlama, torch.nn.Module):
    def __init__(self, config_dict, dtype, device, operations):
        super().__init__()
--- a/comfy/text_encoders/lt.py
+++ b/comfy/text_encoders/lt.py
@ -118,9 +118,8 @@ class LTXAVTEModel(torch.nn.Module):
            sdo = comfy.utils.state_dict_prefix_replace(sd, {"text_embedding_projection.aggregate_embed.weight": "text_embedding_projection.weight", "model.diffusion_model.video_embeddings_connector.": "video_embeddings_connector.", "model.diffusion_model.audio_embeddings_connector.": "audio_embeddings_connector."}, filter_keys=True)
            if len(sdo) == 0:
                sdo = sd
-            missing, unexpected = self.load_state_dict(sdo, strict=False)
-            missing = [k for k in missing if not k.startswith("gemma3_12b.")] # filter out keys that belong to the main gemma model
-            return (missing, unexpected)
+
+            return self.load_state_dict(sdo, strict=False)

    def memory_estimation_function(self, token_weight_pairs, device=None):
        constant = 6.0
--- a/comfy/utils.py
+++ b/comfy/utils.py
@ -929,9 +929,7 @@ def bislerp(samples, width, height):
    return result.to(orig_dtype)

 def lanczos(samples, width, height):
-    #the below API is strict and expects grayscale to be squeezed
-    samples = samples.squeeze(1) if samples.shape[1] == 1 else samples.movedim(1, -1)
-    images = [Image.fromarray(np.clip(255. * image.cpu().numpy(), 0, 255).astype(np.uint8)) for image in samples]
+    images = [Image.fromarray(np.clip(255. * image.movedim(0, -1).cpu().numpy(), 0, 255).astype(np.uint8)) for image in samples]
    images = [image.resize((width, height), resample=Image.Resampling.LANCZOS) for image in images]
    images = [torch.from_numpy(np.array(image).astype(np.float32) / 255.0).movedim(-1, 0) for image in images]
    result = torch.stack(images)
--- a/comfy_api/latest/_input_impl/video_types.py
+++ b/comfy_api/latest/_input_impl/video_types.py
@ -374,7 +374,7 @@ class VideoFromComponents(VideoInput):
            if audio_stream and self.__components.audio:
                waveform = self.__components.audio['waveform']
                waveform = waveform[:, :, :math.ceil((audio_sample_rate / frame_rate) * self.__components.images.shape[0])]
-                frame = av.AudioFrame.from_ndarray(waveform.movedim(2, 1).reshape(1, -1).float().cpu().numpy(), format='flt', layout='mono' if waveform.shape[1] == 1 else 'stereo')
+                frame = av.AudioFrame.from_ndarray(waveform.movedim(2, 1).reshape(1, -1).float().numpy(), format='flt', layout='mono' if waveform.shape[1] == 1 else 'stereo')
                frame.sample_rate = audio_sample_rate
                frame.pts = 0
                output.mux(audio_stream.encode(frame))
--- a/comfy_api/latest/_io.py
+++ b/comfy_api/latest/_io.py
@ -153,7 +153,7 @@ class Input(_IO_V3):
    '''
    Base class for a V3 Input.
    '''
-    def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
+    def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):
        super().__init__()
        self.id = id
        self.display_name = display_name
@ -162,7 +162,6 @@ class Input(_IO_V3):
        self.lazy = lazy
        self.extra_dict = extra_dict if extra_dict is not None else {}
        self.rawLink = raw_link
-        self.advanced = advanced

    def as_dict(self):
        return prune_dict({
@ -171,7 +170,6 @@ class Input(_IO_V3):
            "tooltip": self.tooltip,
            "lazy": self.lazy,
            "rawLink": self.rawLink,
-            "advanced": self.advanced,
        }) | prune_dict(self.extra_dict)

    def get_io_type(self):
@ -186,8 +184,8 @@ class WidgetInput(Input):
    '''
    def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                 default: Any=None,
-                 socketless: bool=None, widget_type: str=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-        super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)
+                 socketless: bool=None, widget_type: str=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):
+        super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)
        self.default = default
        self.socketless = socketless
        self.widget_type = widget_type
@ -244,8 +242,8 @@ class Boolean(ComfyTypeIO):
        '''Boolean input.'''
        def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                    default: bool=None, label_on: str=None, label_off: str=None,
-                    socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)
+                    socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)
            self.label_on = label_on
            self.label_off = label_off
            self.default: bool
@ -264,8 +262,8 @@ class Int(ComfyTypeIO):
        '''Integer input.'''
        def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                    default: int=None, min: int=None, max: int=None, step: int=None, control_after_generate: bool=None,
-                    display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)
+                    display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)
            self.min = min
            self.max = max
            self.step = step
@ -290,8 +288,8 @@ class Float(ComfyTypeIO):
        '''Float input.'''
        def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                    default: float=None, min: float=None, max: float=None, step: float=None, round: float=None,
-                    display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)
+                    display_mode: NumberDisplay=None, socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)
            self.min = min
            self.max = max
            self.step = step
@ -316,8 +314,8 @@ class String(ComfyTypeIO):
        '''String input.'''
        def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                    multiline=False, placeholder: str=None, default: str=None, dynamic_prompts: bool=None,
-                    socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link, advanced)
+                    socketless: bool=None, force_input: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, force_input, extra_dict, raw_link)
            self.multiline = multiline
            self.placeholder = placeholder
            self.dynamic_prompts = dynamic_prompts
@ -352,13 +350,12 @@ class Combo(ComfyTypeIO):
            socketless: bool=None,
            extra_dict=None,
            raw_link: bool=None,
-            advanced: bool=None,
        ):
            if isinstance(options, type) and issubclass(options, Enum):
                options = [v.value for v in options]
            if isinstance(default, Enum):
                default = default.value
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link, advanced)
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link)
            self.multiselect = False
            self.options = options
            self.control_after_generate = control_after_generate
@ -390,8 +387,8 @@ class MultiCombo(ComfyTypeI):
    class Input(Combo.Input):
        def __init__(self, id: str, options: list[str], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None,
                    default: list[str]=None, placeholder: str=None, chip: bool=None, control_after_generate: bool=None,
-                    socketless: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, options, display_name, optional, tooltip, lazy, default, control_after_generate, socketless=socketless, extra_dict=extra_dict, raw_link=raw_link, advanced=advanced)
+                    socketless: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, options, display_name, optional, tooltip, lazy, default, control_after_generate, socketless=socketless, extra_dict=extra_dict, raw_link=raw_link)
            self.multiselect = True
            self.placeholder = placeholder
            self.chip = chip
@ -424,9 +421,9 @@ class Webcam(ComfyTypeIO):
        Type = str
        def __init__(
                self, id: str, display_name: str=None, optional=False,
-                tooltip: str=None, lazy: bool=None, default: str=None, socketless: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None
+                tooltip: str=None, lazy: bool=None, default: str=None, socketless: bool=None, extra_dict=None, raw_link: bool=None
        ):
-            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link, advanced)
+            super().__init__(id, display_name, optional, tooltip, lazy, default, socketless, None, None, extra_dict, raw_link)


@comfytype(io_type="MASK")
@ -779,7 +776,7 @@ class MultiType:
        '''
        Input that permits more than one input type; if `id` is an instance of `ComfyType.Input`, then that input will be used to create a widget (if applicable) with overridden values.
        '''
-        def __init__(self, id: str | Input, types: list[type[_ComfyType] | _ComfyType], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
+        def __init__(self, id: str | Input, types: list[type[_ComfyType] | _ComfyType], display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):
            # if id is an Input, then use that Input with overridden values
            self.input_override = None
            if isinstance(id, Input):
@ -792,7 +789,7 @@ class MultiType:
                # if is a widget input, make sure widget_type is set appropriately
                if isinstance(self.input_override, WidgetInput):
                    self.input_override.widget_type = self.input_override.get_io_type()
-            super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)
+            super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)
            self._io_types = types

        @property
@ -846,8 +843,8 @@ class MatchType(ComfyTypeIO):

    class Input(Input):
        def __init__(self, id: str, template: MatchType.Template,
-                    display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None, advanced: bool=None):
-            super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link, advanced)
+                    display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None, raw_link: bool=None):
+            super().__init__(id, display_name, optional, tooltip, lazy, extra_dict, raw_link)
            self.template = template

        def as_dict(self):
@ -1122,8 +1119,8 @@ class ImageCompare(ComfyTypeI):

  class Input(WidgetInput):
      def __init__(self, id: str, display_name: str=None, optional=False, tooltip: str=None,
-                   socketless: bool=True, advanced: bool=None):
-          super().__init__(id, display_name, optional, tooltip, None, None, socketless, None, None, None, None, advanced)
+                   socketless: bool=True):
+          super().__init__(id, display_name, optional, tooltip, None, None, socketless)

      def as_dict(self):
          return super().as_dict()
--- a/comfy_api_nodes/README.md
+++ b/comfy_api_nodes/README.md
@ -0,0 +1,65 @@
+# ComfyUI API Nodes
+
+## Introduction 
+
+Below are a collection of nodes that work by calling external APIs. More information available in our [docs](https://docs.comfy.org/tutorials/api-nodes/overview).
+
+## Development
+
+While developing, you should be testing against the Staging environment. To test against staging:
+
+**Install ComfyUI_frontend**
+
+Follow the instructions [here](https://github.com/Comfy-Org/ComfyUI_frontend) to start the frontend server. By default, it will connect to Staging authentication. 
+
+> **Hint:** If you use --front-end-version argument for ComfyUI, it will use production authentication.
+
+```bash
+python run main.py --comfy-api-base https://stagingapi.comfy.org
+```
+
+To authenticate to staging, please login and then ask one of Comfy Org team to whitelist you for access to staging.
+
+API stubs are generated through automatic codegen tools from OpenAPI definitions. Since the Comfy Org OpenAPI definition contains many things from the Comfy Registry as well, we use redocly/cli to filter out only the paths relevant for API nodes.
+
+### Redocly Instructions 
+
+**Tip**
+When developing locally, use the `redocly-dev.yaml` file to generate pydantic models. This lets you use stubs for APIs that are not marked `Released` yet.
+
+Before your API node PR merges, make sure to add the `Released` tag to the `openapi.yaml` file and test in staging.
+
+```bash
+# Download the OpenAPI file from staging server.
+curl -o openapi.yaml https://stagingapi.comfy.org/openapi
+
+# Filter out unneeded API definitions.
+npm install -g @redocly/cli
+redocly bundle openapi.yaml --output filtered-openapi.yaml --config comfy_api_nodes/redocly-dev.yaml --remove-unused-components
+
+# Generate the pydantic datamodels for validation.
+datamodel-codegen --use-subclass-enum --field-constraints --strict-types bytes --input filtered-openapi.yaml --output comfy_api_nodes/apis/__init__.py --output-model-type pydantic_v2.BaseModel
+
+```
+
+
+# Merging to Master
+
+Before merging to comfyanonymous/ComfyUI master, follow these steps:
+
+1. Add the "Released" tag to the ComfyUI OpenAPI yaml file for each endpoint you are using in the nodes. 
+1. Make sure the ComfyUI API is deployed to prod with your changes.
+1. Run the code generation again with `redocly.yaml` and the production OpenAPI yaml file.
+
+```bash
+# Download the OpenAPI file from prod server.
+curl -o openapi.yaml https://api.comfy.org/openapi
+
+# Filter out unneeded API definitions.
+npm install -g @redocly/cli
+redocly bundle openapi.yaml --output filtered-openapi.yaml --config comfy_api_nodes/redocly.yaml --remove-unused-components
+
+# Generate the pydantic datamodels for validation.
+datamodel-codegen --use-subclass-enum --field-constraints --strict-types bytes --input filtered-openapi.yaml --output comfy_api_nodes/apis/__init__.py --output-model-type pydantic_v2.BaseModel
+
+```
--- a/comfy_api_nodes/apis/bfl_api.py
+++ b/comfy_api_nodes/apis/bfl_api.py
--- a/comfy_api_nodes/apis/bytedance_api.py
+++ b/comfy_api_nodes/apis/bytedance_api.py
@ -65,13 +65,11 @@ class TaskImageContent(BaseModel):
 class Text2VideoTaskCreationRequest(BaseModel):
    model: str = Field(...)
    content: list[TaskTextContent] = Field(..., min_length=1)
-    generate_audio: bool | None = Field(...)


 class Image2VideoTaskCreationRequest(BaseModel):
    model: str = Field(...)
    content: list[TaskTextContent | TaskImageContent] = Field(..., min_length=2)
-    generate_audio: bool | None = Field(...)


 class TaskCreationResponse(BaseModel):
@ -143,9 +141,4 @@ VIDEO_TASKS_EXECUTION_TIME = {
        "720p": 65,
        "1080p": 100,
    },
-    "seedance-1-5-pro-251215": {
-        "480p": 80,
-        "720p": 100,
-        "1080p": 150,
-    },
 }
--- a/comfy_api_nodes/apis/gemini_api.py
+++ b/comfy_api_nodes/apis/gemini_api.py
--- a/comfy_api_nodes/apis/ideogram.py
+++ b/comfy_api_nodes/apis/ideogram.py
@ -1,292 +0,0 @@
-from enum import Enum
-from typing import Optional, List, Dict, Any, Union
-from datetime import datetime
-
-from pydantic import BaseModel, Field, RootModel, StrictBytes
-
-
-class IdeogramColorPalette1(BaseModel):
-    name: str = Field(..., description='Name of the preset color palette')
-
-
-class Member(BaseModel):
-    color: Optional[str] = Field(
-        None, description='Hexadecimal color code', pattern='^#[0-9A-Fa-f]{6}$'
-    )
-    weight: Optional[float] = Field(
-        None, description='Optional weight for the color (0-1)', ge=0.0, le=1.0
-    )
-
-
-class IdeogramColorPalette2(BaseModel):
-    members: List[Member] = Field(
-        ..., description='Array of color definitions with optional weights'
-    )
-
-
-class IdeogramColorPalette(
-    RootModel[Union[IdeogramColorPalette1, IdeogramColorPalette2]]
-):
-    root: Union[IdeogramColorPalette1, IdeogramColorPalette2] = Field(
-        ...,
-        description='A color palette specification that can either use a preset name or explicit color definitions with weights',
-    )
-
-
-class ImageRequest(BaseModel):
-    aspect_ratio: Optional[str] = Field(
-        None,
-        description="Optional. The aspect ratio (e.g., 'ASPECT_16_9', 'ASPECT_1_1'). Cannot be used with resolution. Defaults to 'ASPECT_1_1' if unspecified.",
-    )
-    color_palette: Optional[Dict[str, Any]] = Field(
-        None, description='Optional. Color palette object. Only for V_2, V_2_TURBO.'
-    )
-    magic_prompt_option: Optional[str] = Field(
-        None, description="Optional. MagicPrompt usage ('AUTO', 'ON', 'OFF')."
-    )
-    model: str = Field(..., description="The model used (e.g., 'V_2', 'V_2A_TURBO')")
-    negative_prompt: Optional[str] = Field(
-        None,
-        description='Optional. Description of what to exclude. Only for V_1, V_1_TURBO, V_2, V_2_TURBO.',
-    )
-    num_images: Optional[int] = Field(
-        1,
-        description='Optional. Number of images to generate (1-8). Defaults to 1.',
-        ge=1,
-        le=8,
-    )
-    prompt: str = Field(
-        ..., description='Required. The prompt to use to generate the image.'
-    )
-    resolution: Optional[str] = Field(
-        None,
-        description="Optional. Resolution (e.g., 'RESOLUTION_1024_1024'). Only for model V_2. Cannot be used with aspect_ratio.",
-    )
-    seed: Optional[int] = Field(
-        None,
-        description='Optional. A number between 0 and 2147483647.',
-        ge=0,
-        le=2147483647,
-    )
-    style_type: Optional[str] = Field(
-        None,
-        description="Optional. Style type ('AUTO', 'GENERAL', 'REALISTIC', 'DESIGN', 'RENDER_3D', 'ANIME'). Only for models V_2 and above.",
-    )
-
-
-class IdeogramGenerateRequest(BaseModel):
-    image_request: ImageRequest = Field(
-        ..., description='The image generation request parameters.'
-    )
-
-
-class Datum(BaseModel):
-    is_image_safe: Optional[bool] = Field(
-        None, description='Indicates whether the image is considered safe.'
-    )
-    prompt: Optional[str] = Field(
-        None, description='The prompt used to generate this image.'
-    )
-    resolution: Optional[str] = Field(
-        None, description="The resolution of the generated image (e.g., '1024x1024')."
-    )
-    seed: Optional[int] = Field(
-        None, description='The seed value used for this generation.'
-    )
-    style_type: Optional[str] = Field(
-        None,
-        description="The style type used for generation (e.g., 'REALISTIC', 'ANIME').",
-    )
-    url: Optional[str] = Field(None, description='URL to the generated image.')
-
-
-class IdeogramGenerateResponse(BaseModel):
-    created: Optional[datetime] = Field(
-        None, description='Timestamp when the generation was created.'
-    )
-    data: Optional[List[Datum]] = Field(
-        None, description='Array of generated image information.'
-    )
-
-
-class StyleCode(RootModel[str]):
-    root: str = Field(..., pattern='^[0-9A-Fa-f]{8}$')
-
-
-class Datum1(BaseModel):
-    is_image_safe: Optional[bool] = None
-    prompt: Optional[str] = None
-    resolution: Optional[str] = None
-    seed: Optional[int] = None
-    style_type: Optional[str] = None
-    url: Optional[str] = None
-
-
-class IdeogramV3IdeogramResponse(BaseModel):
-    created: Optional[datetime] = None
-    data: Optional[List[Datum1]] = None
-
-
-class RenderingSpeed1(str, Enum):
-    TURBO = 'TURBO'
-    DEFAULT = 'DEFAULT'
-    QUALITY = 'QUALITY'
-
-
-class IdeogramV3ReframeRequest(BaseModel):
-    color_palette: Optional[Dict[str, Any]] = None
-    image: Optional[StrictBytes] = None
-    num_images: Optional[int] = Field(None, ge=1, le=8)
-    rendering_speed: Optional[RenderingSpeed1] = None
-    resolution: str
-    seed: Optional[int] = Field(None, ge=0, le=2147483647)
-    style_codes: Optional[List[str]] = None
-    style_reference_images: Optional[List[StrictBytes]] = None
-
-
-class MagicPrompt(str, Enum):
-    AUTO = 'AUTO'
-    ON = 'ON'
-    OFF = 'OFF'
-
-
-class StyleType(str, Enum):
-    AUTO = 'AUTO'
-    GENERAL = 'GENERAL'
-    REALISTIC = 'REALISTIC'
-    DESIGN = 'DESIGN'
-
-
-class IdeogramV3RemixRequest(BaseModel):
-    aspect_ratio: Optional[str] = None
-    color_palette: Optional[Dict[str, Any]] = None
-    image: Optional[StrictBytes] = None
-    image_weight: Optional[int] = Field(50, ge=1, le=100)
-    magic_prompt: Optional[MagicPrompt] = None
-    negative_prompt: Optional[str] = None
-    num_images: Optional[int] = Field(None, ge=1, le=8)
-    prompt: str
-    rendering_speed: Optional[RenderingSpeed1] = None
-    resolution: Optional[str] = None
-    seed: Optional[int] = Field(None, ge=0, le=2147483647)
-    style_codes: Optional[List[str]] = None
-    style_reference_images: Optional[List[StrictBytes]] = None
-    style_type: Optional[StyleType] = None
-
-
-class IdeogramV3ReplaceBackgroundRequest(BaseModel):
-    color_palette: Optional[Dict[str, Any]] = None
-    image: Optional[StrictBytes] = None
-    magic_prompt: Optional[MagicPrompt] = None
-    num_images: Optional[int] = Field(None, ge=1, le=8)
-    prompt: str
-    rendering_speed: Optional[RenderingSpeed1] = None
-    seed: Optional[int] = Field(None, ge=0, le=2147483647)
-    style_codes: Optional[List[str]] = None
-    style_reference_images: Optional[List[StrictBytes]] = None
-
-
-class ColorPalette(BaseModel):
-    name: str = Field(..., description='Name of the color palette', examples=['PASTEL'])
-
-
-class MagicPrompt2(str, Enum):
-    ON = 'ON'
-    OFF = 'OFF'
-
-
-class StyleType1(str, Enum):
-    AUTO = 'AUTO'
-    GENERAL = 'GENERAL'
-    REALISTIC = 'REALISTIC'
-    DESIGN = 'DESIGN'
-    FICTION = 'FICTION'
-
-
-class RenderingSpeed(str, Enum):
-    DEFAULT = 'DEFAULT'
-    TURBO = 'TURBO'
-    QUALITY = 'QUALITY'
-
-
-class IdeogramV3EditRequest(BaseModel):
-    color_palette: Optional[IdeogramColorPalette] = None
-    image: Optional[StrictBytes] = Field(
-        None,
-        description='The image being edited (max size 10MB); only JPEG, WebP and PNG formats are supported at this time.',
-    )
-    magic_prompt: Optional[str] = Field(
-        None,
-        description='Determine if MagicPrompt should be used in generating the request or not.',
-    )
-    mask: Optional[StrictBytes] = Field(
-        None,
-        description='A black and white image of the same size as the image being edited (max size 10MB). Black regions in the mask should match up with the regions of the image that you would like to edit; only JPEG, WebP and PNG formats are supported at this time.',
-    )
-    num_images: Optional[int] = Field(
-        None, description='The number of images to generate.'
-    )
-    prompt: str = Field(
-        ..., description='The prompt used to describe the edited result.'
-    )
-    rendering_speed: RenderingSpeed
-    seed: Optional[int] = Field(
-        None, description='Random seed. Set for reproducible generation.'
-    )
-    style_codes: Optional[List[StyleCode]] = Field(
-        None,
-        description='A list of 8 character hexadecimal codes representing the style of the image. Cannot be used in conjunction with style_reference_images or style_type.',
-    )
-    style_reference_images: Optional[List[StrictBytes]] = Field(
-        None,
-        description='A set of images to use as style references (maximum total size 10MB across all style references). The images should be in JPEG, PNG or WebP format.',
-    )
-    character_reference_images: Optional[List[str]] = Field(
-        None,
-        description='Generations with character reference are subject to the character reference pricing. A set of images to use as character references (maximum total size 10MB across all character references), currently only supports 1 character reference image. The images should be in JPEG, PNG or WebP format.'
-    )
-    character_reference_images_mask: Optional[List[str]] = Field(
-        None,
-        description='Optional masks for character reference images. When provided, must match the number of character_reference_images. Each mask should be a grayscale image of the same dimensions as the corresponding character reference image. The images should be in JPEG, PNG or WebP format.'
-    )
-
-
-class IdeogramV3Request(BaseModel):
-    aspect_ratio: Optional[str] = Field(
-        None, description='Aspect ratio in format WxH', examples=['1x3']
-    )
-    color_palette: Optional[ColorPalette] = None
-    magic_prompt: Optional[MagicPrompt2] = Field(
-        None, description='Whether to enable magic prompt enhancement'
-    )
-    negative_prompt: Optional[str] = Field(
-        None, description='Text prompt specifying what to avoid in the generation'
-    )
-    num_images: Optional[int] = Field(
-        None, description='Number of images to generate', ge=1
-    )
-    prompt: str = Field(..., description='The text prompt for image generation')
-    rendering_speed: RenderingSpeed
-    resolution: Optional[str] = Field(
-        None, description='Image resolution in format WxH', examples=['1280x800']
-    )
-    seed: Optional[int] = Field(
-        None, description='Seed value for reproducible generation'
-    )
-    style_codes: Optional[List[StyleCode]] = Field(
-        None, description='Array of style codes in hexadecimal format'
-    )
-    style_reference_images: Optional[List[str]] = Field(
-        None, description='Array of reference image URLs or identifiers'
-    )
-    style_type: Optional[StyleType1] = Field(
-        None, description='The type of style to apply'
-    )
-    character_reference_images: Optional[List[str]] = Field(
-        None,
-        description='Generations with character reference are subject to the character reference pricing. A set of images to use as character references (maximum total size 10MB across all character references), currently only supports 1 character reference image. The images should be in JPEG, PNG or WebP format.'
-    )
-    character_reference_images_mask: Optional[List[str]] = Field(
-        None,
-        description='Optional masks for character reference images. When provided, must match the number of character_reference_images. Each mask should be a grayscale image of the same dimensions as the corresponding character reference image. The images should be in JPEG, PNG or WebP format.'
-    )
--- a/comfy_api_nodes/apis/kling_api.py
+++ b/comfy_api_nodes/apis/kling_api.py
--- a/comfy_api_nodes/apis/luma_api.py
+++ b/comfy_api_nodes/apis/luma_api.py
--- a/comfy_api_nodes/apis/meshy.py
+++ b/comfy_api_nodes/apis/meshy.py
@ -1,160 +0,0 @@
-from typing import TypedDict
-
-from pydantic import BaseModel, Field
-
-from comfy_api.latest import Input
-
-
-class InputShouldRemesh(TypedDict):
-    should_remesh: str
-    topology: str
-    target_polycount: int
-
-
-class InputShouldTexture(TypedDict):
-    should_texture: str
-    enable_pbr: bool
-    texture_prompt: str
-    texture_image: Input.Image | None
-
-
-class MeshyTaskResponse(BaseModel):
-    result: str = Field(...)
-
-
-class MeshyTextToModelRequest(BaseModel):
-    mode: str = Field("preview")
-    prompt: str = Field(..., max_length=600)
-    art_style: str = Field(..., description="'realistic' or 'sculpture'")
-    ai_model: str = Field(...)
-    topology: str | None = Field(..., description="'quad' or 'triangle'")
-    target_polycount: int | None = Field(..., ge=100, le=300000)
-    should_remesh: bool = Field(
-        True,
-        description="False returns the original mesh, ignoring topology and polycount.",
-    )
-    symmetry_mode: str = Field(..., description="'auto', 'off' or 'on'")
-    pose_mode: str = Field(...)
-    seed: int = Field(...)
-    moderation: bool = Field(False)
-
-
-class MeshyRefineTask(BaseModel):
-    mode: str = Field("refine")
-    preview_task_id: str = Field(...)
-    enable_pbr: bool | None = Field(...)
-    texture_prompt: str | None = Field(...)
-    texture_image_url: str | None = Field(...)
-    ai_model: str = Field(...)
-    moderation: bool = Field(False)
-
-
-class MeshyImageToModelRequest(BaseModel):
-    image_url: str = Field(...)
-    ai_model: str = Field(...)
-    topology: str | None = Field(..., description="'quad' or 'triangle'")
-    target_polycount: int | None = Field(..., ge=100, le=300000)
-    symmetry_mode: str = Field(..., description="'auto', 'off' or 'on'")
-    should_remesh: bool = Field(
-        True,
-        description="False returns the original mesh, ignoring topology and polycount.",
-    )
-    should_texture: bool = Field(...)
-    enable_pbr: bool | None = Field(...)
-    pose_mode: str = Field(...)
-    texture_prompt: str | None = Field(None, max_length=600)
-    texture_image_url: str | None = Field(None)
-    seed: int = Field(...)
-    moderation: bool = Field(False)
-
-
-class MeshyMultiImageToModelRequest(BaseModel):
-    image_urls: list[str] = Field(...)
-    ai_model: str = Field(...)
-    topology: str | None = Field(..., description="'quad' or 'triangle'")
-    target_polycount: int | None = Field(..., ge=100, le=300000)
-    symmetry_mode: str = Field(..., description="'auto', 'off' or 'on'")
-    should_remesh: bool = Field(
-        True,
-        description="False returns the original mesh, ignoring topology and polycount.",
-    )
-    should_texture: bool = Field(...)
-    enable_pbr: bool | None = Field(...)
-    pose_mode: str = Field(...)
-    texture_prompt: str | None = Field(None, max_length=600)
-    texture_image_url: str | None = Field(None)
-    seed: int = Field(...)
-    moderation: bool = Field(False)
-
-
-class MeshyRiggingRequest(BaseModel):
-    input_task_id: str = Field(...)
-    height_meters: float = Field(...)
-    texture_image_url: str | None = Field(...)
-
-
-class MeshyAnimationRequest(BaseModel):
-    rig_task_id: str = Field(...)
-    action_id: int = Field(...)
-
-
-class MeshyTextureRequest(BaseModel):
-    input_task_id: str = Field(...)
-    ai_model: str = Field(...)
-    enable_original_uv: bool = Field(...)
-    enable_pbr: bool = Field(...)
-    text_style_prompt: str | None = Field(...)
-    image_style_url: str | None = Field(...)
-
-
-class MeshyModelsUrls(BaseModel):
-    glb: str = Field("")
-
-
-class MeshyRiggedModelsUrls(BaseModel):
-    rigged_character_glb_url: str = Field("")
-
-
-class MeshyAnimatedModelsUrls(BaseModel):
-    animation_glb_url: str = Field("")
-
-
-class MeshyResultTextureUrls(BaseModel):
-    base_color: str = Field(...)
-    metallic: str | None = Field(None)
-    normal: str | None = Field(None)
-    roughness: str | None = Field(None)
-
-
-class MeshyTaskError(BaseModel):
-    message: str | None = Field(None)
-
-
-class MeshyModelResult(BaseModel):
-    id: str = Field(...)
-    type: str = Field(...)
-    model_urls: MeshyModelsUrls = Field(MeshyModelsUrls())
-    thumbnail_url: str = Field(...)
-    video_url: str | None = Field(None)
-    status: str = Field(...)
-    progress: int = Field(0)
-    texture_urls: list[MeshyResultTextureUrls] | None = Field([])
-    task_error: MeshyTaskError | None = Field(None)
-
-
-class MeshyRiggedResult(BaseModel):
-    id: str = Field(...)
-    type: str = Field(...)
-    status: str = Field(...)
-    progress: int = Field(0)
-    result: MeshyRiggedModelsUrls = Field(MeshyRiggedModelsUrls())
-    task_error: MeshyTaskError | None = Field(None)
-
-
-class MeshyAnimationResult(BaseModel):
-    id: str = Field(...)
-    type: str = Field(...)
-    status: str = Field(...)
-    progress: int = Field(0)
-    result: MeshyAnimatedModelsUrls = Field(MeshyAnimatedModelsUrls())
-    task_error: MeshyTaskError | None = Field(None)
--- a/comfy_api_nodes/apis/minimax_api.py
+++ b/comfy_api_nodes/apis/minimax_api.py
--- a/comfy_api_nodes/apis/moonvalley.py
+++ b/comfy_api_nodes/apis/moonvalley.py
@ -1,152 +0,0 @@
-from enum import Enum
-from typing import Optional, Dict, Any
-
-from pydantic import BaseModel, Field, StrictBytes
-
-
-class MoonvalleyPromptResponse(BaseModel):
-    error: Optional[Dict[str, Any]] = None
-    frame_conditioning: Optional[Dict[str, Any]] = None
-    id: Optional[str] = None
-    inference_params: Optional[Dict[str, Any]] = None
-    meta: Optional[Dict[str, Any]] = None
-    model_params: Optional[Dict[str, Any]] = None
-    output_url: Optional[str] = None
-    prompt_text: Optional[str] = None
-    status: Optional[str] = None
-
-
-class MoonvalleyTextToVideoInferenceParams(BaseModel):
-    add_quality_guidance: Optional[bool] = Field(
-        True, description='Whether to add quality guidance'
-    )
-    caching_coefficient: Optional[float] = Field(
-        0.3, description='Caching coefficient for optimization'
-    )
-    caching_cooldown: Optional[int] = Field(
-        3, description='Number of caching cooldown steps'
-    )
-    caching_warmup: Optional[int] = Field(
-        3, description='Number of caching warmup steps'
-    )
-    clip_value: Optional[float] = Field(
-        3, description='CLIP value for generation control'
-    )
-    conditioning_frame_index: Optional[int] = Field(
-        0, description='Index of the conditioning frame'
-    )
-    cooldown_steps: Optional[int] = Field(
-        75, description='Number of cooldown steps (calculated based on num_frames)'
-    )
-    fps: Optional[int] = Field(
-        24, description='Frames per second of the generated video'
-    )
-    guidance_scale: Optional[float] = Field(
-        10, description='Guidance scale for generation control'
-    )
-    height: Optional[int] = Field(
-        1080, description='Height of the generated video in pixels'
-    )
-    negative_prompt: Optional[str] = Field(None, description='Negative prompt text')
-    num_frames: Optional[int] = Field(64, description='Number of frames to generate')
-    seed: Optional[int] = Field(
-        None, description='Random seed for generation (default: random)'
-    )
-    shift_value: Optional[float] = Field(
-        3, description='Shift value for generation control'
-    )
-    steps: Optional[int] = Field(80, description='Number of denoising steps')
-    use_guidance_schedule: Optional[bool] = Field(
-        True, description='Whether to use guidance scheduling'
-    )
-    use_negative_prompts: Optional[bool] = Field(
-        False, description='Whether to use negative prompts'
-    )
-    use_timestep_transform: Optional[bool] = Field(
-        True, description='Whether to use timestep transformation'
-    )
-    warmup_steps: Optional[int] = Field(
-        0, description='Number of warmup steps (calculated based on num_frames)'
-    )
-    width: Optional[int] = Field(
-        1920, description='Width of the generated video in pixels'
-    )
-
-
-class MoonvalleyTextToVideoRequest(BaseModel):
-    image_url: Optional[str] = None
-    inference_params: Optional[MoonvalleyTextToVideoInferenceParams] = None
-    prompt_text: Optional[str] = None
-    webhook_url: Optional[str] = None
-
-
-class MoonvalleyUploadFileRequest(BaseModel):
-    file: Optional[StrictBytes] = None
-
-
-class MoonvalleyUploadFileResponse(BaseModel):
-    access_url: Optional[str] = None
-
-
-class MoonvalleyVideoToVideoInferenceParams(BaseModel):
-    add_quality_guidance: Optional[bool] = Field(
-        True, description='Whether to add quality guidance'
-    )
-    caching_coefficient: Optional[float] = Field(
-        0.3, description='Caching coefficient for optimization'
-    )
-    caching_cooldown: Optional[int] = Field(
-        3, description='Number of caching cooldown steps'
-    )
-    caching_warmup: Optional[int] = Field(
-        3, description='Number of caching warmup steps'
-    )
-    clip_value: Optional[float] = Field(
-        3, description='CLIP value for generation control'
-    )
-    conditioning_frame_index: Optional[int] = Field(
-        0, description='Index of the conditioning frame'
-    )
-    cooldown_steps: Optional[int] = Field(
-        36, description='Number of cooldown steps (calculated based on num_frames)'
-    )
-    guidance_scale: Optional[float] = Field(
-        15, description='Guidance scale for generation control'
-    )
-    negative_prompt: Optional[str] = Field(None, description='Negative prompt text')
-    seed: Optional[int] = Field(
-        None, description='Random seed for generation (default: random)'
-    )
-    shift_value: Optional[float] = Field(
-        3, description='Shift value for generation control'
-    )
-    steps: Optional[int] = Field(80, description='Number of denoising steps')
-    use_guidance_schedule: Optional[bool] = Field(
-        True, description='Whether to use guidance scheduling'
-    )
-    use_negative_prompts: Optional[bool] = Field(
-        False, description='Whether to use negative prompts'
-    )
-    use_timestep_transform: Optional[bool] = Field(
-        True, description='Whether to use timestep transformation'
-    )
-    warmup_steps: Optional[int] = Field(
-        24, description='Number of warmup steps (calculated based on num_frames)'
-    )
-
-
-class ControlType(str, Enum):
-    motion_control = 'motion_control'
-    pose_control = 'pose_control'
-
-
-class MoonvalleyVideoToVideoRequest(BaseModel):
-    control_type: ControlType = Field(
-        ..., description='Supported types for video control'
-    )
-    inference_params: Optional[MoonvalleyVideoToVideoInferenceParams] = None
-    prompt_text: str = Field(..., description='Describes the video to generate')
-    video_url: str = Field(..., description='Url to control video')
-    webhook_url: Optional[str] = Field(
-        None, description='Optional webhook URL for notifications'
-    )
--- a/comfy_api_nodes/apis/openai.py
+++ b/comfy_api_nodes/apis/openai.py
@ -1,170 +0,0 @@
-from pydantic import BaseModel, Field
-
-
-class Datum2(BaseModel):
-    b64_json: str | None = Field(None, description="Base64 encoded image data")
-    revised_prompt: str | None = Field(None, description="Revised prompt")
-    url: str | None = Field(None, description="URL of the image")
-
-
-class InputTokensDetails(BaseModel):
-    image_tokens: int | None = Field(None)
-    text_tokens: int | None = Field(None)
-
-
-class Usage(BaseModel):
-    input_tokens: int | None = Field(None)
-    input_tokens_details: InputTokensDetails | None = Field(None)
-    output_tokens: int | None = Field(None)
-    total_tokens: int | None = Field(None)
-
-
-class OpenAIImageGenerationResponse(BaseModel):
-    data: list[Datum2] | None = Field(None)
-    usage: Usage | None = Field(None)
-
-
-class OpenAIImageEditRequest(BaseModel):
-    background: str | None = Field(None, description="Background transparency")
-    model: str = Field(...)
-    moderation: str | None = Field(None)
-    n: int | None = Field(None, description="The number of images to generate")
-    output_compression: int | None = Field(None, description="Compression level for JPEG or WebP (0-100)")
-    output_format: str | None = Field(None)
-    prompt: str = Field(...)
-    quality: str | None = Field(None, description="Size of the image (e.g., 1024x1024, 1536x1024, auto)")
-    size: str | None = Field(None, description="Size of the output image")
-
-
-class OpenAIImageGenerationRequest(BaseModel):
-    background: str | None = Field(None, description="Background transparency")
-    model: str | None = Field(None)
-    moderation: str | None = Field(None)
-    n: int | None = Field(
-        None,
-        description="The number of images to generate.",
-    )
-    output_compression: int | None = Field(None, description="Compression level for JPEG or WebP (0-100)")
-    output_format: str | None = Field(None)
-    prompt: str = Field(...)
-    quality: str | None = Field(None, description="The quality of the generated image")
-    size: str | None = Field(None, description="Size of the image (e.g., 1024x1024, 1536x1024, auto)")
-    style: str | None = Field(None, description="Style of the image (only for dall-e-3)")
-
-
-class ModelResponseProperties(BaseModel):
-    instructions: str | None = Field(None)
-    max_output_tokens: int | None = Field(None)
-    model: str | None = Field(None)
-    temperature: float | None = Field(1, description="Controls randomness in the response", ge=0.0, le=2.0)
-    top_p: float | None = Field(
-        1,
-        description="Controls diversity of the response via nucleus sampling",
-        ge=0.0,
-        le=1.0,
-    )
-    truncation: str | None = Field("disabled", description="Allowed values: 'auto' or 'disabled'")
-
-
-class ResponseProperties(BaseModel):
-    instructions: str | None = Field(None)
-    max_output_tokens: int | None = Field(None)
-    model: str | None = Field(None)
-    previous_response_id: str | None = Field(None)
-    truncation: str | None = Field("disabled", description="Allowed values: 'auto' or 'disabled'")
-
-
-class ResponseError(BaseModel):
-    code: str = Field(...)
-    message: str = Field(...)
-
-
-class OutputTokensDetails(BaseModel):
-    reasoning_tokens: int = Field(..., description="The number of reasoning tokens.")
-
-
-class CachedTokensDetails(BaseModel):
-    cached_tokens: int = Field(
-        ...,
-        description="The number of tokens that were retrieved from the cache.",
-    )
-
-
-class ResponseUsage(BaseModel):
-    input_tokens: int = Field(..., description="The number of input tokens.")
-    input_tokens_details: CachedTokensDetails = Field(...)
-    output_tokens: int = Field(..., description="The number of output tokens.")
-    output_tokens_details: OutputTokensDetails = Field(...)
-    total_tokens: int = Field(..., description="The total number of tokens used.")
-
-
-class InputTextContent(BaseModel):
-    text: str = Field(..., description="The text input to the model.")
-    type: str = Field("input_text")
-
-
-class OutputContent(BaseModel):
-    type: str = Field(..., description="The type of output content")
-    text: str | None = Field(None, description="The text content")
-    data: str | None = Field(None, description="Base64-encoded audio data")
-    transcript: str | None = Field(None, description="Transcript of the audio")
-
-
-class OutputMessage(BaseModel):
-    type: str = Field(..., description="The type of output item")
-    content: list[OutputContent] | None = Field(None, description="The content of the message")
-    role: str | None = Field(None, description="The role of the message")
-
-
-class OpenAIResponse(ModelResponseProperties, ResponseProperties):
-    created_at: float | None = Field(
-        None,
-        description="Unix timestamp (in seconds) of when this Response was created.",
-    )
-    error: ResponseError | None = Field(None)
-    id: str | None = Field(None, description="Unique identifier for this Response.")
-    object: str | None = Field(None, description="The object type of this resource - always set to `response`.")
-    output: list[OutputMessage] | None = Field(None)
-    parallel_tool_calls: bool | None = Field(True)
-    status: str | None = Field(
-        None,
-        description="One of `completed`, `failed`, `in_progress`, or `incomplete`.",
-    )
-    usage: ResponseUsage | None = Field(None)
-
-
-class InputImageContent(BaseModel):
-    detail: str = Field(..., description="One of `high`, `low`, or `auto`. Defaults to `auto`.")
-    file_id: str | None = Field(None)
-    image_url: str | None = Field(None)
-    type: str = Field(..., description="The type of the input item. Always `input_image`.")
-
-
-class InputFileContent(BaseModel):
-    file_data: str | None = Field(None)
-    file_id: str | None = Field(None)
-    filename: str | None = Field(None, description="The name of the file to be sent to the model.")
-    type: str = Field(..., description="The type of the input item. Always `input_file`.")
-
-
-class InputMessage(BaseModel):
-    content: list[InputTextContent | InputImageContent | InputFileContent] = Field(
-        ...,
-        description="A list of one or many input items to the model, containing different content types.",
-    )
-    role: str | None = Field(None)
-    type: str | None = Field(None)
-
-
-class OpenAICreateResponse(ModelResponseProperties, ResponseProperties):
-    include: str | None = Field(None)
-    input: list[InputMessage] = Field(...)
-    parallel_tool_calls: bool | None = Field(
-        True, description="Whether to allow the model to run tool calls in parallel."
-    )
-    store: bool | None = Field(
-        True,
-        description="Whether to store the generated model response for later retrieval via API.",
-    )
-    stream: bool | None = Field(False)
-    usage: ResponseUsage | None = Field(None)
--- a/comfy_api_nodes/apis/openai_api.py
+++ b/comfy_api_nodes/apis/openai_api.py
@ -0,0 +1,52 @@
+from pydantic import BaseModel, Field
+
+
+class Datum2(BaseModel):
+    b64_json: str | None = Field(None, description="Base64 encoded image data")
+    revised_prompt: str | None = Field(None, description="Revised prompt")
+    url: str | None = Field(None, description="URL of the image")
+
+
+class InputTokensDetails(BaseModel):
+    image_tokens: int | None = None
+    text_tokens: int | None = None
+
+
+class Usage(BaseModel):
+    input_tokens: int | None = None
+    input_tokens_details: InputTokensDetails | None = None
+    output_tokens: int | None = None
+    total_tokens: int | None = None
+
+
+class OpenAIImageGenerationResponse(BaseModel):
+    data: list[Datum2] | None = None
+    usage: Usage | None = None
+
+
+class OpenAIImageEditRequest(BaseModel):
+    background: str | None = Field(None, description="Background transparency")
+    model: str = Field(...)
+    moderation: str | None = Field(None)
+    n: int | None = Field(None, description="The number of images to generate")
+    output_compression: int | None = Field(None, description="Compression level for JPEG or WebP (0-100)")
+    output_format: str | None = Field(None)
+    prompt: str = Field(...)
+    quality: str | None = Field(None, description="Size of the image (e.g., 1024x1024, 1536x1024, auto)")
+    size: str | None = Field(None, description="Size of the output image")
+
+
+class OpenAIImageGenerationRequest(BaseModel):
+    background: str | None = Field(None, description="Background transparency")
+    model: str | None = Field(None)
+    moderation: str | None = Field(None)
+    n: int | None = Field(
+        None,
+        description="The number of images to generate.",
+    )
+    output_compression: int | None = Field(None, description="Compression level for JPEG or WebP (0-100)")
+    output_format: str | None = Field(None)
+    prompt: str = Field(...)
+    quality: str | None = Field(None, description="The quality of the generated image")
+    size: str | None = Field(None, description="Size of the image (e.g., 1024x1024, 1536x1024, auto)")
+    style: str | None = Field(None, description="Style of the image (only for dall-e-3)")
--- a/comfy_api_nodes/apis/pixverse_api.py
+++ b/comfy_api_nodes/apis/pixverse_api.py
--- a/comfy_api_nodes/apis/recraft_api.py
+++ b/comfy_api_nodes/apis/recraft_api.py
--- a/comfy_api_nodes/apis/rodin_api.py
+++ b/comfy_api_nodes/apis/rodin_api.py
--- a/comfy_api_nodes/apis/runway.py
+++ b/comfy_api_nodes/apis/runway.py
@ -1,127 +0,0 @@
-from enum import Enum
-from typing import Optional, List, Union
-from datetime import datetime
-
-from pydantic import BaseModel, Field, RootModel
-
-
-class RunwayAspectRatioEnum(str, Enum):
-    field_1280_720 = '1280:720'
-    field_720_1280 = '720:1280'
-    field_1104_832 = '1104:832'
-    field_832_1104 = '832:1104'
-    field_960_960 = '960:960'
-    field_1584_672 = '1584:672'
-    field_1280_768 = '1280:768'
-    field_768_1280 = '768:1280'
-
-
-class Position(str, Enum):
-    first = 'first'
-    last = 'last'
-
-
-class RunwayPromptImageDetailedObject(BaseModel):
-    position: Position = Field(
-        ...,
-        description="The position of the image in the output video. 'last' is currently supported for gen3a_turbo only.",
-    )
-    uri: str = Field(
-        ..., description='A HTTPS URL or data URI containing an encoded image.'
-    )
-
-
-class RunwayPromptImageObject(
-    RootModel[Union[str, List[RunwayPromptImageDetailedObject]]]
-):
-    root: Union[str, List[RunwayPromptImageDetailedObject]] = Field(
-        ...,
-        description='Image(s) to use for the video generation. Can be a single URI or an array of image objects with positions.',
-    )
-
-
-class RunwayModelEnum(str, Enum):
-    gen4_turbo = 'gen4_turbo'
-    gen3a_turbo = 'gen3a_turbo'
-
-
-class RunwayDurationEnum(int, Enum):
-    integer_5 = 5
-    integer_10 = 10
-
-
-class RunwayImageToVideoRequest(BaseModel):
-    duration: RunwayDurationEnum
-    model: RunwayModelEnum
-    promptImage: RunwayPromptImageObject
-    promptText: Optional[str] = Field(
-        None, description='Text prompt for the generation', max_length=1000
-    )
-    ratio: RunwayAspectRatioEnum
-    seed: int = Field(
-        ..., description='Random seed for generation', ge=0, le=4294967295
-    )
-
-
-class RunwayImageToVideoResponse(BaseModel):
-    id: Optional[str] = Field(None, description='Task ID')
-
-
-class RunwayTaskStatusEnum(str, Enum):
-    SUCCEEDED = 'SUCCEEDED'
-    RUNNING = 'RUNNING'
-    FAILED = 'FAILED'
-    PENDING = 'PENDING'
-    CANCELLED = 'CANCELLED'
-    THROTTLED = 'THROTTLED'
-
-
-class RunwayTaskStatusResponse(BaseModel):
-    createdAt: datetime = Field(..., description='Task creation timestamp')
-    id: str = Field(..., description='Task ID')
-    output: Optional[List[str]] = Field(None, description='Array of output video URLs')
-    progress: Optional[float] = Field(
-        None,
-        description='Float value between 0 and 1 representing the progress of the task. Only available if status is RUNNING.',
-        ge=0.0,
-        le=1.0,
-    )
-    status: RunwayTaskStatusEnum
-
-
-class Model4(str, Enum):
-    gen4_image = 'gen4_image'
-
-
-class ReferenceImage(BaseModel):
-    uri: Optional[str] = Field(
-        None, description='A HTTPS URL or data URI containing an encoded image'
-    )
-
-
-class RunwayTextToImageAspectRatioEnum(str, Enum):
-    field_1920_1080 = '1920:1080'
-    field_1080_1920 = '1080:1920'
-    field_1024_1024 = '1024:1024'
-    field_1360_768 = '1360:768'
-    field_1080_1080 = '1080:1080'
-    field_1168_880 = '1168:880'
-    field_1440_1080 = '1440:1080'
-    field_1080_1440 = '1080:1440'
-    field_1808_768 = '1808:768'
-    field_2112_912 = '2112:912'
-
-
-class RunwayTextToImageRequest(BaseModel):
-    model: Model4 = Field(..., description='Model to use for generation')
-    promptText: str = Field(
-        ..., description='Text prompt for the image generation', max_length=1000
-    )
-    ratio: RunwayTextToImageAspectRatioEnum
-    referenceImages: Optional[List[ReferenceImage]] = Field(
-        None, description='Array of reference images to guide the generation'
-    )
-
-
-class RunwayTextToImageResponse(BaseModel):
-    id: Optional[str] = Field(None, description='Task ID')
--- a/comfy_api_nodes/apis/stability_api.py
+++ b/comfy_api_nodes/apis/stability_api.py
--- a/comfy_api_nodes/apis/topaz_api.py
+++ b/comfy_api_nodes/apis/topaz_api.py
@ -41,7 +41,7 @@ class Resolution(BaseModel):
    height: int = Field(...)


-class CreateVideoRequestSource(BaseModel):
+class CreateCreateVideoRequestSource(BaseModel):
    container: str = Field(...)
    size: int = Field(..., description="Size of the video file in bytes")
    duration: int = Field(..., description="Duration of the video file in seconds")
@ -89,7 +89,7 @@ class Overrides(BaseModel):


 class CreateVideoRequest(BaseModel):
-    source: CreateVideoRequestSource = Field(...)
+    source: CreateCreateVideoRequestSource = Field(...)
    filters: list[Union[VideoFrameInterpolationFilter, VideoEnhancementFilter]] = Field(...)
    output: OutputInformationVideo = Field(...)
    overrides: Overrides = Field(Overrides(isPaidDiffusion=True))
--- a/comfy_api_nodes/apis/tripo_api.py
+++ b/comfy_api_nodes/apis/tripo_api.py
--- a/comfy_api_nodes/apis/veo_api.py
+++ b/comfy_api_nodes/apis/veo_api.py
--- a/comfy_api_nodes/canary.py
+++ b/comfy_api_nodes/canary.py
@ -0,0 +1,10 @@
+import av
+
+ver = av.__version__.split(".")
+if int(ver[0]) < 14:
+    raise Exception("INSTALL NEW VERSION OF PYAV TO USE API NODES.")
+
+if int(ver[0]) == 14 and int(ver[1]) < 2:
+    raise Exception("INSTALL NEW VERSION OF PYAV TO USE API NODES.")
+
+NODE_CLASS_MAPPINGS = {}
--- a/comfy_api_nodes/mapper_utils.py
+++ b/comfy_api_nodes/mapper_utils.py
@ -0,0 +1,116 @@
+from enum import Enum
+
+from pydantic.fields import FieldInfo
+from pydantic import BaseModel
+from pydantic_core import PydanticUndefined
+
+from comfy.comfy_types.node_typing import IO, InputTypeOptions
+
+NodeInput = tuple[IO, InputTypeOptions]
+
+
+def _create_base_config(field_info: FieldInfo) -> InputTypeOptions:
+    config = {}
+    if hasattr(field_info, "default") and field_info.default is not PydanticUndefined:
+        config["default"] = field_info.default
+    if hasattr(field_info, "description") and field_info.description is not None:
+        config["tooltip"] = field_info.description
+    return config
+
+
+def _get_number_constraints_config(field_info: FieldInfo) -> dict:
+    config = {}
+    if hasattr(field_info, "metadata"):
+        metadata = field_info.metadata
+        for constraint in metadata:
+            if hasattr(constraint, "ge"):
+                config["min"] = constraint.ge
+            if hasattr(constraint, "le"):
+                config["max"] = constraint.le
+            if hasattr(constraint, "multiple_of"):
+                config["step"] = constraint.multiple_of
+    return config
+
+
+def _model_field_to_image_input(field_info: FieldInfo, **kwargs) -> NodeInput:
+    return IO.IMAGE, {
+        **_create_base_config(field_info),
+        **kwargs,
+    }
+
+
+def _model_field_to_string_input(field_info: FieldInfo, **kwargs) -> NodeInput:
+    return IO.STRING, {
+        **_create_base_config(field_info),
+        **kwargs,
+    }
+
+
+def _model_field_to_float_input(field_info: FieldInfo, **kwargs) -> NodeInput:
+    return IO.FLOAT, {
+        **_create_base_config(field_info),
+        **_get_number_constraints_config(field_info),
+        **kwargs,
+    }
+
+
+def _model_field_to_int_input(field_info: FieldInfo, **kwargs) -> NodeInput:
+    return IO.INT, {
+        **_create_base_config(field_info),
+        **_get_number_constraints_config(field_info),
+        **kwargs,
+    }
+
+
+def _model_field_to_combo_input(
+    field_info: FieldInfo, enum_type: type[Enum] = None, **kwargs
+) -> NodeInput:
+    combo_config = {}
+    if enum_type is not None:
+        combo_config["options"] = [option.value for option in enum_type]
+    combo_config = {
+        **combo_config,
+        **_create_base_config(field_info),
+        **kwargs,
+    }
+    return IO.COMBO, combo_config
+
+
+def model_field_to_node_input(
+    input_type: IO, base_model: type[BaseModel], field_name: str, **kwargs
+) -> NodeInput:
+    """
+    Maps a field from a Pydantic model to a Comfy node input.
+
+    Args:
+        input_type: The type of the input.
+        base_model: The Pydantic model to map the field from.
+        field_name: The name of the field to map.
+        **kwargs: Additional key/values to include in the input options.
+
+    Note:
+        For combo inputs, pass an `Enum` to the `enum_type` keyword argument to populate the options automatically.
+
+    Example:
+        >>> model_field_to_node_input(IO.STRING, MyModel, "my_field", multiline=True)
+        >>> model_field_to_node_input(IO.COMBO, MyModel, "my_field", enum_type=MyEnum)
+        >>> model_field_to_node_input(IO.FLOAT, MyModel, "my_field", slider=True)
+    """
+    field_info: FieldInfo = base_model.model_fields[field_name]
+    result: NodeInput
+
+    if input_type == IO.IMAGE:
+        result = _model_field_to_image_input(field_info, **kwargs)
+    elif input_type == IO.STRING:
+        result = _model_field_to_string_input(field_info, **kwargs)
+    elif input_type == IO.FLOAT:
+        result = _model_field_to_float_input(field_info, **kwargs)
+    elif input_type == IO.INT:
+        result = _model_field_to_int_input(field_info, **kwargs)
+    elif input_type == IO.COMBO:
+        result = _model_field_to_combo_input(field_info, **kwargs)
+    else:
+        message = f"Invalid input type: {input_type}"
+        raise ValueError(message)
+
+    return result
--- a/comfy_api_nodes/nodes_bfl.py
+++ b/comfy_api_nodes/nodes_bfl.py
@ -3,7 +3,7 @@ from pydantic import BaseModel
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.bfl import (
+from comfy_api_nodes.apis.bfl_api import (
    BFLFluxExpandImageRequest,
    BFLFluxFillImageRequest,
    BFLFluxKontextProGenerateRequest,
--- a/comfy_api_nodes/nodes_bytedance.py
+++ b/comfy_api_nodes/nodes_bytedance.py
@ -5,7 +5,7 @@ import torch
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.bytedance import (
+from comfy_api_nodes.apis.bytedance_api import (
    RECOMMENDED_PRESETS,
    RECOMMENDED_PRESETS_SEEDREAM_4,
    VIDEO_TASKS_EXECUTION_TIME,
@ -477,12 +477,7 @@ class ByteDanceTextToVideoNode(IO.ComfyNode):
            inputs=[
                IO.Combo.Input(
                    "model",
-                    options=[
-                        "seedance-1-5-pro-251215",
-                        "seedance-1-0-pro-250528",
-                        "seedance-1-0-lite-t2v-250428",
-                        "seedance-1-0-pro-fast-251015",
-                    ],
+                    options=["seedance-1-0-pro-250528", "seedance-1-0-lite-t2v-250428", "seedance-1-0-pro-fast-251015"],
                    default="seedance-1-0-pro-fast-251015",
                ),
                IO.String.Input(
@ -533,12 +528,6 @@ class ByteDanceTextToVideoNode(IO.ComfyNode):
                    tooltip='Whether to add an "AI generated" watermark to the video.',
                    optional=True,
                ),
-                IO.Boolean.Input(
-                    "generate_audio",
-                    default=False,
-                    tooltip="This parameter is ignored for any model except seedance-1-5-pro.",
-                    optional=True,
-                ),
            ],
            outputs=[
                IO.Video.Output(),
@ -563,10 +552,7 @@ class ByteDanceTextToVideoNode(IO.ComfyNode):
        seed: int,
        camera_fixed: bool,
        watermark: bool,
-        generate_audio: bool = False,
    ) -> IO.NodeOutput:
-        if model == "seedance-1-5-pro-251215" and duration < 4:
-            raise ValueError("Minimum supported duration for Seedance 1.5 Pro is 4 seconds.")
        validate_string(prompt, strip_whitespace=True, min_length=1)
        raise_if_text_params(prompt, ["resolution", "ratio", "duration", "seed", "camerafixed", "watermark"])

@ -581,11 +567,7 @@ class ByteDanceTextToVideoNode(IO.ComfyNode):
        )
        return await process_video_task(
            cls,
-            payload=Text2VideoTaskCreationRequest(
-                model=model,
-                content=[TaskTextContent(text=prompt)],
-                generate_audio=generate_audio if model == "seedance-1-5-pro-251215" else None,
-            ),
+            payload=Text2VideoTaskCreationRequest(model=model, content=[TaskTextContent(text=prompt)]),
            estimated_duration=max(1, math.ceil(VIDEO_TASKS_EXECUTION_TIME[model][resolution] * (duration / 10.0))),
        )

@ -602,12 +584,7 @@ class ByteDanceImageToVideoNode(IO.ComfyNode):
            inputs=[
                IO.Combo.Input(
                    "model",
-                    options=[
-                        "seedance-1-5-pro-251215",
-                        "seedance-1-0-pro-250528",
-                        "seedance-1-0-lite-i2v-250428",
-                        "seedance-1-0-pro-fast-251015",
-                    ],
+                    options=["seedance-1-0-pro-250528", "seedance-1-0-lite-t2v-250428", "seedance-1-0-pro-fast-251015"],
                    default="seedance-1-0-pro-fast-251015",
                ),
                IO.String.Input(
@ -662,12 +639,6 @@ class ByteDanceImageToVideoNode(IO.ComfyNode):
                    tooltip='Whether to add an "AI generated" watermark to the video.',
                    optional=True,
                ),
-                IO.Boolean.Input(
-                    "generate_audio",
-                    default=False,
-                    tooltip="This parameter is ignored for any model except seedance-1-5-pro.",
-                    optional=True,
-                ),
            ],
            outputs=[
                IO.Video.Output(),
@ -693,10 +664,7 @@ class ByteDanceImageToVideoNode(IO.ComfyNode):
        seed: int,
        camera_fixed: bool,
        watermark: bool,
-        generate_audio: bool = False,
    ) -> IO.NodeOutput:
-        if model == "seedance-1-5-pro-251215" and duration < 4:
-            raise ValueError("Minimum supported duration for Seedance 1.5 Pro is 4 seconds.")
        validate_string(prompt, strip_whitespace=True, min_length=1)
        raise_if_text_params(prompt, ["resolution", "ratio", "duration", "seed", "camerafixed", "watermark"])
        validate_image_dimensions(image, min_width=300, min_height=300, max_width=6000, max_height=6000)
@ -718,7 +686,6 @@ class ByteDanceImageToVideoNode(IO.ComfyNode):
            payload=Image2VideoTaskCreationRequest(
                model=model,
                content=[TaskTextContent(text=prompt), TaskImageContent(image_url=TaskImageContentUrl(url=image_url))],
-                generate_audio=generate_audio if model == "seedance-1-5-pro-251215" else None,
            ),
            estimated_duration=max(1, math.ceil(VIDEO_TASKS_EXECUTION_TIME[model][resolution] * (duration / 10.0))),
        )
@ -736,7 +703,7 @@ class ByteDanceFirstLastFrameNode(IO.ComfyNode):
            inputs=[
                IO.Combo.Input(
                    "model",
-                    options=["seedance-1-5-pro-251215", "seedance-1-0-pro-250528", "seedance-1-0-lite-i2v-250428"],
+                    options=["seedance-1-0-pro-250528", "seedance-1-0-lite-i2v-250428"],
                    default="seedance-1-0-lite-i2v-250428",
                ),
                IO.String.Input(
@ -795,12 +762,6 @@ class ByteDanceFirstLastFrameNode(IO.ComfyNode):
                    tooltip='Whether to add an "AI generated" watermark to the video.',
                    optional=True,
                ),
-                IO.Boolean.Input(
-                    "generate_audio",
-                    default=False,
-                    tooltip="This parameter is ignored for any model except seedance-1-5-pro.",
-                    optional=True,
-                ),
            ],
            outputs=[
                IO.Video.Output(),
@ -827,10 +788,7 @@ class ByteDanceFirstLastFrameNode(IO.ComfyNode):
        seed: int,
        camera_fixed: bool,
        watermark: bool,
-        generate_audio: bool = False,
    ) -> IO.NodeOutput:
-        if model == "seedance-1-5-pro-251215" and duration < 4:
-            raise ValueError("Minimum supported duration for Seedance 1.5 Pro is 4 seconds.")
        validate_string(prompt, strip_whitespace=True, min_length=1)
        raise_if_text_params(prompt, ["resolution", "ratio", "duration", "seed", "camerafixed", "watermark"])
        for i in (first_frame, last_frame):
@ -863,7 +821,6 @@ class ByteDanceFirstLastFrameNode(IO.ComfyNode):
                    TaskImageContent(image_url=TaskImageContentUrl(url=str(download_urls[0])), role="first_frame"),
                    TaskImageContent(image_url=TaskImageContentUrl(url=str(download_urls[1])), role="last_frame"),
                ],
-                generate_audio=generate_audio if model == "seedance-1-5-pro-251215" else None,
            ),
            estimated_duration=max(1, math.ceil(VIDEO_TASKS_EXECUTION_TIME[model][resolution] * (duration / 10.0))),
        )
@ -939,41 +896,7 @@ class ByteDanceImageReferenceNode(IO.ComfyNode):
                IO.Hidden.unique_id,
            ],
            is_api_node=True,
-            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["model", "duration", "resolution"]),
-                expr="""
-                (
-                  $priceByModel := {
-                    "seedance-1-0-pro": {
-                      "480p":[0.23,0.24],
-                      "720p":[0.51,0.56]
-                    },
-                    "seedance-1-0-lite": {
-                      "480p":[0.17,0.18],
-                      "720p":[0.37,0.41]
-                    }
-                  };
-                  $model := widgets.model;
-                  $modelKey :=
-                    $contains($model, "seedance-1-0-pro")  ? "seedance-1-0-pro" :
-                    "seedance-1-0-lite";
-                  $resolution := widgets.resolution;
-                  $resKey :=
-                    $contains($resolution, "720") ? "720p" :
-                    "480p";
-                  $modelPrices := $lookup($priceByModel, $modelKey);
-                  $baseRange := $lookup($modelPrices, $resKey);
-                  $min10s := $baseRange[0];
-                  $max10s := $baseRange[1];
-                  $scale := widgets.duration / 10;
-                  $minCost := $min10s * $scale;
-                  $maxCost := $max10s * $scale;
-                  ($minCost = $maxCost)
-                    ? {"type":"usd","usd": $minCost}
-                    : {"type":"range_usd","min_usd": $minCost, "max_usd": $maxCost}
-                )
-                """,
-            ),
+            price_badge=PRICE_BADGE_VIDEO,
        )

    @classmethod
@ -1044,15 +967,10 @@ def raise_if_text_params(prompt: str, text_params: list[str]) -> None:


 PRICE_BADGE_VIDEO = IO.PriceBadge(
-    depends_on=IO.PriceBadgeDepends(widgets=["model", "duration", "resolution", "generate_audio"]),
+    depends_on=IO.PriceBadgeDepends(widgets=["model", "duration", "resolution"]),
    expr="""
    (
      $priceByModel := {
-        "seedance-1-5-pro": {
-          "480p":[0.12,0.12],
-          "720p":[0.26,0.26],
-          "1080p":[0.58,0.59]
-        },
        "seedance-1-0-pro": {
          "480p":[0.23,0.24],
          "720p":[0.51,0.56],
@ -1071,7 +989,6 @@ PRICE_BADGE_VIDEO = IO.PriceBadge(
      };
      $model := widgets.model;
      $modelKey :=
-        $contains($model, "seedance-1-5-pro")      ? "seedance-1-5-pro" :
        $contains($model, "seedance-1-0-pro-fast") ? "seedance-1-0-pro-fast" :
        $contains($model, "seedance-1-0-pro")      ? "seedance-1-0-pro" :
        "seedance-1-0-lite";
@ -1085,12 +1002,11 @@ PRICE_BADGE_VIDEO = IO.PriceBadge(
      $min10s := $baseRange[0];
      $max10s := $baseRange[1];
      $scale := widgets.duration / 10;
-      $audioMultiplier := ($modelKey = "seedance-1-5-pro" and widgets.generate_audio) ? 2 : 1;
-      $minCost := $min10s * $scale * $audioMultiplier;
-      $maxCost := $max10s * $scale * $audioMultiplier;
+      $minCost := $min10s * $scale;
+      $maxCost := $max10s * $scale;
      ($minCost = $maxCost)
-        ? {"type":"usd","usd": $minCost, "format": { "approximate": true }}
-        : {"type":"range_usd","min_usd": $minCost, "max_usd": $maxCost, "format": { "approximate": true }}
+        ? {"type":"usd","usd": $minCost}
+        : {"type":"range_usd","min_usd": $minCost, "max_usd": $maxCost}
    )
    """,
 )
--- a/comfy_api_nodes/nodes_gemini.py
+++ b/comfy_api_nodes/nodes_gemini.py
@ -14,7 +14,7 @@ from typing_extensions import override

 import folder_paths
 from comfy_api.latest import IO, ComfyExtension, Input, Types
-from comfy_api_nodes.apis.gemini import (
+from comfy_api_nodes.apis.gemini_api import (
    GeminiContent,
    GeminiFileData,
    GeminiGenerateContentRequest,
--- a/comfy_api_nodes/nodes_ideogram.py
+++ b/comfy_api_nodes/nodes_ideogram.py
@ -4,7 +4,7 @@ from comfy_api.latest import IO, ComfyExtension
 from PIL import Image
 import numpy as np
 import torch
-from comfy_api_nodes.apis.ideogram import (
+from comfy_api_nodes.apis import (
    IdeogramGenerateRequest,
    IdeogramGenerateResponse,
    ImageRequest,
--- a/comfy_api_nodes/nodes_kling.py
+++ b/comfy_api_nodes/nodes_kling.py
@ -49,7 +49,7 @@ from comfy_api_nodes.apis import (
    KlingCharacterEffectModelName,
    KlingSingleImageEffectModelName,
 )
-from comfy_api_nodes.apis.kling import (
+from comfy_api_nodes.apis.kling_api import (
    ImageToVideoWithAudioRequest,
    MotionControlRequest,
    OmniImageParamImage,
--- a/comfy_api_nodes/nodes_luma.py
+++ b/comfy_api_nodes/nodes_luma.py
@ -4,7 +4,7 @@ import torch
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension
-from comfy_api_nodes.apis.luma import (
+from comfy_api_nodes.apis.luma_api import (
    LumaAspectRatio,
    LumaCharacterRef,
    LumaConceptChain,
--- a/comfy_api_nodes/nodes_meshy.py
+++ b/comfy_api_nodes/nodes_meshy.py
@ -1,790 +0,0 @@
-import os
-
-from typing_extensions import override
-
-from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.meshy import (
-    InputShouldRemesh,
-    InputShouldTexture,
-    MeshyAnimationRequest,
-    MeshyAnimationResult,
-    MeshyImageToModelRequest,
-    MeshyModelResult,
-    MeshyMultiImageToModelRequest,
-    MeshyRefineTask,
-    MeshyRiggedResult,
-    MeshyRiggingRequest,
-    MeshyTaskResponse,
-    MeshyTextToModelRequest,
-    MeshyTextureRequest,
-)
-from comfy_api_nodes.util import (
-    ApiEndpoint,
-    download_url_to_bytesio,
-    poll_op,
-    sync_op,
-    upload_images_to_comfyapi,
-    validate_string,
-)
-from folder_paths import get_output_directory
-
-
-class MeshyTextToModelNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyTextToModelNode",
-            display_name="Meshy: Text to Model",
-            category="api node/3d/Meshy",
-            inputs=[
-                IO.Combo.Input("model", options=["latest"]),
-                IO.String.Input("prompt", multiline=True, default=""),
-                IO.Combo.Input("style", options=["realistic", "sculpture"]),
-                IO.DynamicCombo.Input(
-                    "should_remesh",
-                    options=[
-                        IO.DynamicCombo.Option(
-                            "true",
-                            [
-                                IO.Combo.Input("topology", options=["triangle", "quad"]),
-                                IO.Int.Input(
-                                    "target_polycount",
-                                    default=300000,
-                                    min=100,
-                                    max=300000,
-                                    display_mode=IO.NumberDisplay.number,
-                                ),
-                            ],
-                        ),
-                        IO.DynamicCombo.Option("false", []),
-                    ],
-                    tooltip="When set to false, returns an unprocessed triangular mesh.",
-                ),
-                IO.Combo.Input("symmetry_mode", options=["auto", "on", "off"]),
-                IO.Combo.Input(
-                    "pose_mode",
-                    options=["", "A-pose", "T-pose"],
-                    tooltip="Specify the pose mode for the generated model.",
-                ),
-                IO.Int.Input(
-                    "seed",
-                    default=0,
-                    min=0,
-                    max=2147483647,
-                    display_mode=IO.NumberDisplay.number,
-                    control_after_generate=True,
-                    tooltip="Seed controls whether the node should re-run; "
-                    "results are non-deterministic regardless of seed.",
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.8}""",
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        model: str,
-        prompt: str,
-        style: str,
-        should_remesh: InputShouldRemesh,
-        symmetry_mode: str,
-        pose_mode: str,
-        seed: int,
-    ) -> IO.NodeOutput:
-        validate_string(prompt, field_name="prompt", min_length=1, max_length=600)
-        response = await sync_op(
-            cls,
-            ApiEndpoint(path="/proxy/meshy/openapi/v2/text-to-3d", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyTextToModelRequest(
-                prompt=prompt,
-                art_style=style,
-                ai_model=model,
-                topology=should_remesh.get("topology", None),
-                target_polycount=should_remesh.get("target_polycount", None),
-                should_remesh=should_remesh["should_remesh"] == "true",
-                symmetry_mode=symmetry_mode,
-                pose_mode=pose_mode.lower(),
-                seed=seed,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{response.result}"),
-            response_model=MeshyModelResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyRefineNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyRefineNode",
-            display_name="Meshy: Refine Draft Model",
-            category="api node/3d/Meshy",
-            description="Refine a previously created draft model.",
-            inputs=[
-                IO.Combo.Input("model", options=["latest"]),
-                IO.Custom("MESHY_TASK_ID").Input("meshy_task_id"),
-                IO.Boolean.Input(
-                    "enable_pbr",
-                    default=False,
-                    tooltip="Generate PBR Maps (metallic, roughness, normal) in addition to the base color. "
-                    "Note: this should be set to false when using Sculpture style, "
-                    "as Sculpture style generates its own set of PBR maps.",
-                ),
-                IO.String.Input(
-                    "texture_prompt",
-                    default="",
-                    multiline=True,
-                    tooltip="Provide a text prompt to guide the texturing process. "
-                    "Maximum 600 characters. Cannot be used at the same time as 'texture_image'.",
-                ),
-                IO.Image.Input(
-                    "texture_image",
-                    tooltip="Only one of 'texture_image' or 'texture_prompt' may be used at the same time.",
-                    optional=True,
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.4}""",
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        model: str,
-        meshy_task_id: str,
-        enable_pbr: bool,
-        texture_prompt: str,
-        texture_image: Input.Image | None = None,
-    ) -> IO.NodeOutput:
-        if texture_prompt and texture_image is not None:
-            raise ValueError("texture_prompt and texture_image cannot be used at the same time")
-        texture_image_url = None
-        if texture_prompt:
-            validate_string(texture_prompt, field_name="texture_prompt", max_length=600)
-        if texture_image is not None:
-            texture_image_url = (await upload_images_to_comfyapi(cls, texture_image, wait_label="Uploading texture"))[0]
-        response = await sync_op(
-            cls,
-            endpoint=ApiEndpoint(path="/proxy/meshy/openapi/v2/text-to-3d", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyRefineTask(
-                preview_task_id=meshy_task_id,
-                enable_pbr=enable_pbr,
-                texture_prompt=texture_prompt if texture_prompt else None,
-                texture_image_url=texture_image_url,
-                ai_model=model,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v2/text-to-3d/{response.result}"),
-            response_model=MeshyModelResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyImageToModelNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyImageToModelNode",
-            display_name="Meshy: Image to Model",
-            category="api node/3d/Meshy",
-            inputs=[
-                IO.Combo.Input("model", options=["latest"]),
-                IO.Image.Input("image"),
-                IO.DynamicCombo.Input(
-                    "should_remesh",
-                    options=[
-                        IO.DynamicCombo.Option(
-                            "true",
-                            [
-                                IO.Combo.Input("topology", options=["triangle", "quad"]),
-                                IO.Int.Input(
-                                    "target_polycount",
-                                    default=300000,
-                                    min=100,
-                                    max=300000,
-                                    display_mode=IO.NumberDisplay.number,
-                                ),
-                            ],
-                        ),
-                        IO.DynamicCombo.Option("false", []),
-                    ],
-                    tooltip="When set to false, returns an unprocessed triangular mesh.",
-                ),
-                IO.Combo.Input("symmetry_mode", options=["auto", "on", "off"]),
-                IO.DynamicCombo.Input(
-                    "should_texture",
-                    options=[
-                        IO.DynamicCombo.Option(
-                            "true",
-                            [
-                                IO.Boolean.Input(
-                                    "enable_pbr",
-                                    default=False,
-                                    tooltip="Generate PBR Maps (metallic, roughness, normal) "
-                                    "in addition to the base color.",
-                                ),
-                                IO.String.Input(
-                                    "texture_prompt",
-                                    default="",
-                                    multiline=True,
-                                    tooltip="Provide a text prompt to guide the texturing process. "
-                                    "Maximum 600 characters. Cannot be used at the same time as 'texture_image'.",
-                                ),
-                                IO.Image.Input(
-                                    "texture_image",
-                                    tooltip="Only one of 'texture_image' or 'texture_prompt' "
-                                    "may be used at the same time.",
-                                    optional=True,
-                                ),
-                            ],
-                        ),
-                        IO.DynamicCombo.Option("false", []),
-                    ],
-                    tooltip="Determines whether textures are generated. "
-                    "Setting it to false skips the texture phase and returns a mesh without textures.",
-                ),
-                IO.Combo.Input(
-                    "pose_mode",
-                    options=["", "A-pose", "T-pose"],
-                    tooltip="Specify the pose mode for the generated model.",
-                ),
-                IO.Int.Input(
-                    "seed",
-                    default=0,
-                    min=0,
-                    max=2147483647,
-                    display_mode=IO.NumberDisplay.number,
-                    control_after_generate=True,
-                    tooltip="Seed controls whether the node should re-run; "
-                    "results are non-deterministic regardless of seed.",
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["should_texture"]),
-                expr="""
-                (
-                  $prices := {"true": 1.2, "false": 0.8};
-                  {"type":"usd","usd": $lookup($prices, widgets.should_texture)}
-                )
-                """,
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        model: str,
-        image: Input.Image,
-        should_remesh: InputShouldRemesh,
-        symmetry_mode: str,
-        should_texture: InputShouldTexture,
-        pose_mode: str,
-        seed: int,
-    ) -> IO.NodeOutput:
-        texture = should_texture["should_texture"] == "true"
-        texture_image_url = texture_prompt = None
-        if texture:
-            if should_texture["texture_prompt"] and should_texture["texture_image"] is not None:
-                raise ValueError("texture_prompt and texture_image cannot be used at the same time")
-            if should_texture["texture_prompt"]:
-                validate_string(should_texture["texture_prompt"], field_name="texture_prompt", max_length=600)
-                texture_prompt = should_texture["texture_prompt"]
-            if should_texture["texture_image"] is not None:
-                texture_image_url = (
-                    await upload_images_to_comfyapi(
-                        cls, should_texture["texture_image"], wait_label="Uploading texture"
-                    )
-                )[0]
-        response = await sync_op(
-            cls,
-            ApiEndpoint(path="/proxy/meshy/openapi/v1/image-to-3d", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyImageToModelRequest(
-                image_url=(await upload_images_to_comfyapi(cls, image, wait_label="Uploading base image"))[0],
-                ai_model=model,
-                topology=should_remesh.get("topology", None),
-                target_polycount=should_remesh.get("target_polycount", None),
-                symmetry_mode=symmetry_mode,
-                should_remesh=should_remesh["should_remesh"] == "true",
-                should_texture=texture,
-                enable_pbr=should_texture.get("enable_pbr", None),
-                pose_mode=pose_mode.lower(),
-                texture_prompt=texture_prompt,
-                texture_image_url=texture_image_url,
-                seed=seed,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v1/image-to-3d/{response.result}"),
-            response_model=MeshyModelResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyMultiImageToModelNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyMultiImageToModelNode",
-            display_name="Meshy: Multi-Image to Model",
-            category="api node/3d/Meshy",
-            inputs=[
-                IO.Combo.Input("model", options=["latest"]),
-                IO.Autogrow.Input(
-                    "images",
-                    template=IO.Autogrow.TemplatePrefix(IO.Image.Input("image"), prefix="image", min=2, max=4),
-                ),
-                IO.DynamicCombo.Input(
-                    "should_remesh",
-                    options=[
-                        IO.DynamicCombo.Option(
-                            "true",
-                            [
-                                IO.Combo.Input("topology", options=["triangle", "quad"]),
-                                IO.Int.Input(
-                                    "target_polycount",
-                                    default=300000,
-                                    min=100,
-                                    max=300000,
-                                    display_mode=IO.NumberDisplay.number,
-                                ),
-                            ],
-                        ),
-                        IO.DynamicCombo.Option("false", []),
-                    ],
-                    tooltip="When set to false, returns an unprocessed triangular mesh.",
-                ),
-                IO.Combo.Input("symmetry_mode", options=["auto", "on", "off"]),
-                IO.DynamicCombo.Input(
-                    "should_texture",
-                    options=[
-                        IO.DynamicCombo.Option(
-                            "true",
-                            [
-                                IO.Boolean.Input(
-                                    "enable_pbr",
-                                    default=False,
-                                    tooltip="Generate PBR Maps (metallic, roughness, normal) "
-                                    "in addition to the base color.",
-                                ),
-                                IO.String.Input(
-                                    "texture_prompt",
-                                    default="",
-                                    multiline=True,
-                                    tooltip="Provide a text prompt to guide the texturing process. "
-                                    "Maximum 600 characters. Cannot be used at the same time as 'texture_image'.",
-                                ),
-                                IO.Image.Input(
-                                    "texture_image",
-                                    tooltip="Only one of 'texture_image' or 'texture_prompt' "
-                                    "may be used at the same time.",
-                                    optional=True,
-                                ),
-                            ],
-                        ),
-                        IO.DynamicCombo.Option("false", []),
-                    ],
-                    tooltip="Determines whether textures are generated. "
-                    "Setting it to false skips the texture phase and returns a mesh without textures.",
-                ),
-                IO.Combo.Input(
-                    "pose_mode",
-                    options=["", "A-pose", "T-pose"],
-                    tooltip="Specify the pose mode for the generated model.",
-                ),
-                IO.Int.Input(
-                    "seed",
-                    default=0,
-                    min=0,
-                    max=2147483647,
-                    display_mode=IO.NumberDisplay.number,
-                    control_after_generate=True,
-                    tooltip="Seed controls whether the node should re-run; "
-                    "results are non-deterministic regardless of seed.",
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MESHY_TASK_ID").Output(display_name="meshy_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["should_texture"]),
-                expr="""
-                (
-                  $prices := {"true": 0.6, "false": 0.2};
-                  {"type":"usd","usd": $lookup($prices, widgets.should_texture)}
-                )
-                """,
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        model: str,
-        images: IO.Autogrow.Type,
-        should_remesh: InputShouldRemesh,
-        symmetry_mode: str,
-        should_texture: InputShouldTexture,
-        pose_mode: str,
-        seed: int,
-    ) -> IO.NodeOutput:
-        texture = should_texture["should_texture"] == "true"
-        texture_image_url = texture_prompt = None
-        if texture:
-            if should_texture["texture_prompt"] and should_texture["texture_image"] is not None:
-                raise ValueError("texture_prompt and texture_image cannot be used at the same time")
-            if should_texture["texture_prompt"]:
-                validate_string(should_texture["texture_prompt"], field_name="texture_prompt", max_length=600)
-                texture_prompt = should_texture["texture_prompt"]
-            if should_texture["texture_image"] is not None:
-                texture_image_url = (
-                    await upload_images_to_comfyapi(
-                        cls, should_texture["texture_image"], wait_label="Uploading texture"
-                    )
-                )[0]
-        response = await sync_op(
-            cls,
-            ApiEndpoint(path="/proxy/meshy/openapi/v1/multi-image-to-3d", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyMultiImageToModelRequest(
-                image_urls=await upload_images_to_comfyapi(
-                    cls, list(images.values()), wait_label="Uploading base images"
-                ),
-                ai_model=model,
-                topology=should_remesh.get("topology", None),
-                target_polycount=should_remesh.get("target_polycount", None),
-                symmetry_mode=symmetry_mode,
-                should_remesh=should_remesh["should_remesh"] == "true",
-                should_texture=texture,
-                enable_pbr=should_texture.get("enable_pbr", None),
-                pose_mode=pose_mode.lower(),
-                texture_prompt=texture_prompt,
-                texture_image_url=texture_image_url,
-                seed=seed,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v1/multi-image-to-3d/{response.result}"),
-            response_model=MeshyModelResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyRigModelNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyRigModelNode",
-            display_name="Meshy: Rig Model",
-            category="api node/3d/Meshy",
-            description="Provides a rigged character in standard formats. "
-            "Auto-rigging is currently not suitable for untextured meshes, non-humanoid assets, "
-            "or humanoid assets with unclear limb and body structure.",
-            inputs=[
-                IO.Custom("MESHY_TASK_ID").Input("meshy_task_id"),
-                IO.Float.Input(
-                    "height_meters",
-                    min=0.1,
-                    max=15.0,
-                    default=1.7,
-                    tooltip="The approximate height of the character model in meters. "
-                    "This aids in scaling and rigging accuracy.",
-                ),
-                IO.Image.Input(
-                    "texture_image",
-                    tooltip="The model's UV-unwrapped base color texture image.",
-                    optional=True,
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MESHY_RIGGED_TASK_ID").Output(display_name="rig_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.2}""",
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        meshy_task_id: str,
-        height_meters: float,
-        texture_image: Input.Image | None = None,
-    ) -> IO.NodeOutput:
-        texture_image_url = None
-        if texture_image is not None:
-            texture_image_url = (await upload_images_to_comfyapi(cls, texture_image, wait_label="Uploading texture"))[0]
-        response = await sync_op(
-            cls,
-            endpoint=ApiEndpoint(path="/proxy/meshy/openapi/v1/rigging", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyRiggingRequest(
-                input_task_id=meshy_task_id,
-                height_meters=height_meters,
-                texture_image_url=texture_image_url,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v1/rigging/{response.result}"),
-            response_model=MeshyRiggedResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(
-            result.result.rigged_character_glb_url, os.path.join(get_output_directory(), model_file)
-        )
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyAnimateModelNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyAnimateModelNode",
-            display_name="Meshy: Animate Model",
-            category="api node/3d/Meshy",
-            description="Apply a specific animation action to a previously rigged character.",
-            inputs=[
-                IO.Custom("MESHY_RIGGED_TASK_ID").Input("rig_task_id"),
-                IO.Int.Input(
-                    "action_id",
-                    default=0,
-                    min=0,
-                    max=696,
-                    tooltip="Visit https://docs.meshy.ai/en/api/animation-library for a list of available values.",
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.12}""",
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        rig_task_id: str,
-        action_id: int,
-    ) -> IO.NodeOutput:
-        response = await sync_op(
-            cls,
-            endpoint=ApiEndpoint(path="/proxy/meshy/openapi/v1/animations", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyAnimationRequest(
-                rig_task_id=rig_task_id,
-                action_id=action_id,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v1/animations/{response.result}"),
-            response_model=MeshyAnimationResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.result.animation_glb_url, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyTextureNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="MeshyTextureNode",
-            display_name="Meshy: Texture Model",
-            category="api node/3d/Meshy",
-            inputs=[
-                IO.Combo.Input("model", options=["latest"]),
-                IO.Custom("MESHY_TASK_ID").Input("meshy_task_id"),
-                IO.Boolean.Input(
-                    "enable_original_uv",
-                    default=True,
-                    tooltip="Use the original UV of the model instead of generating new UVs. "
-                    "When enabled, Meshy preserves existing textures from the uploaded model. "
-                    "If the model has no original UV, the quality of the output might not be as good.",
-                ),
-                IO.Boolean.Input("pbr", default=False),
-                IO.String.Input(
-                    "text_style_prompt",
-                    default="",
-                    multiline=True,
-                    tooltip="Describe your desired texture style of the object using text. Maximum 600 characters."
-                    "Maximum 600 characters. Cannot be used at the same time as 'image_style'.",
-                ),
-                IO.Image.Input(
-                    "image_style",
-                    optional=True,
-                    tooltip="A 2d image to guide the texturing process. "
-                    "Can not be used at the same time with 'text_style_prompt'.",
-                ),
-            ],
-            outputs=[
-                IO.String.Output(display_name="model_file"),
-                IO.Custom("MODEL_TASK_ID").Output(display_name="meshy_task_id"),
-            ],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            is_output_node=True,
-            price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.4}""",
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        model: str,
-        meshy_task_id: str,
-        enable_original_uv: bool,
-        pbr: bool,
-        text_style_prompt: str,
-        image_style: Input.Image | None = None,
-    ) -> IO.NodeOutput:
-        if text_style_prompt and image_style is not None:
-            raise ValueError("text_style_prompt and image_style cannot be used at the same time")
-        if not text_style_prompt and image_style is None:
-            raise ValueError("Either text_style_prompt or image_style is required")
-        image_style_url = None
-        if image_style is not None:
-            image_style_url = (await upload_images_to_comfyapi(cls, image_style, wait_label="Uploading style"))[0]
-        response = await sync_op(
-            cls,
-            endpoint=ApiEndpoint(path="/proxy/meshy/openapi/v1/retexture", method="POST"),
-            response_model=MeshyTaskResponse,
-            data=MeshyTextureRequest(
-                input_task_id=meshy_task_id,
-                ai_model=model,
-                enable_original_uv=enable_original_uv,
-                enable_pbr=pbr,
-                text_style_prompt=text_style_prompt if text_style_prompt else None,
-                image_style_url=image_style_url,
-            ),
-        )
-        result = await poll_op(
-            cls,
-            ApiEndpoint(path=f"/proxy/meshy/openapi/v1/retexture/{response.result}"),
-            response_model=MeshyModelResult,
-            status_extractor=lambda r: r.status,
-            progress_extractor=lambda r: r.progress,
-        )
-        model_file = f"meshy_model_{response.result}.glb"
-        await download_url_to_bytesio(result.model_urls.glb, os.path.join(get_output_directory(), model_file))
-        return IO.NodeOutput(model_file, response.result)
-
-
-class MeshyExtension(ComfyExtension):
-    @override
-    async def get_node_list(self) -> list[type[IO.ComfyNode]]:
-        return [
-            MeshyTextToModelNode,
-            MeshyRefineNode,
-            MeshyImageToModelNode,
-            MeshyMultiImageToModelNode,
-            MeshyRigModelNode,
-            MeshyAnimateModelNode,
-            MeshyTextureNode,
-        ]
-
-
-async def comfy_entrypoint() -> MeshyExtension:
-    return MeshyExtension()
--- a/comfy_api_nodes/nodes_minimax.py
+++ b/comfy_api_nodes/nodes_minimax.py
@ -4,7 +4,7 @@ import torch
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension
-from comfy_api_nodes.apis.minimax import (
+from comfy_api_nodes.apis.minimax_api import (
    MinimaxFileRetrieveResponse,
    MiniMaxModel,
    MinimaxTaskResultResponse,
--- a/comfy_api_nodes/nodes_moonvalley.py
+++ b/comfy_api_nodes/nodes_moonvalley.py
@ -3,7 +3,7 @@ import logging
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.moonvalley import (
+from comfy_api_nodes.apis import (
    MoonvalleyPromptResponse,
    MoonvalleyTextToVideoInferenceParams,
    MoonvalleyTextToVideoRequest,
--- a/comfy_api_nodes/nodes_openai.py
+++ b/comfy_api_nodes/nodes_openai.py
@ -10,18 +10,24 @@ from typing_extensions import override

 import folder_paths
 from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.openai import (
+from comfy_api_nodes.apis import (
+    CreateModelResponseProperties,
+    Detail,
+    InputContent,
    InputFileContent,
    InputImageContent,
    InputMessage,
+    InputMessageContentList,
    InputTextContent,
-    ModelResponseProperties,
+    Item,
    OpenAICreateResponse,
+    OpenAIResponse,
+    OutputContent,
+)
+from comfy_api_nodes.apis.openai_api import (
    OpenAIImageEditRequest,
    OpenAIImageGenerationRequest,
    OpenAIImageGenerationResponse,
-    OpenAIResponse,
-    OutputContent,
 )
 from comfy_api_nodes.util import (
    ApiEndpoint,
@ -260,7 +266,7 @@ class OpenAIDalle3(IO.ComfyNode):
                    "seed",
                    default=0,
                    min=0,
-                    max=2**31 - 1,
+                    max=2 ** 31 - 1,
                    step=1,
                    display_mode=IO.NumberDisplay.number,
                    control_after_generate=True,
@ -378,7 +384,7 @@ class OpenAIGPTImage1(IO.ComfyNode):
                    "seed",
                    default=0,
                    min=0,
-                    max=2**31 - 1,
+                    max=2 ** 31 - 1,
                    step=1,
                    display_mode=IO.NumberDisplay.number,
                    control_after_generate=True,
@ -494,8 +500,8 @@ class OpenAIGPTImage1(IO.ComfyNode):
            files = []
            batch_size = image.shape[0]
            for i in range(batch_size):
-                single_image = image[i : i + 1]
-                scaled_image = downscale_image_tensor(single_image, total_pixels=2048 * 2048).squeeze()
+                single_image = image[i: i + 1]
+                scaled_image = downscale_image_tensor(single_image, total_pixels=2048*2048).squeeze()

                image_np = (scaled_image.numpy() * 255).astype(np.uint8)
                img = Image.fromarray(image_np)
@ -517,7 +523,7 @@ class OpenAIGPTImage1(IO.ComfyNode):
                rgba_mask = torch.zeros(height, width, 4, device="cpu")
                rgba_mask[:, :, 3] = 1 - mask.squeeze().cpu()

-                scaled_mask = downscale_image_tensor(rgba_mask.unsqueeze(0), total_pixels=2048 * 2048).squeeze()
+                scaled_mask = downscale_image_tensor(rgba_mask.unsqueeze(0), total_pixels=2048*2048).squeeze()

                mask_np = (scaled_mask.numpy() * 255).astype(np.uint8)
                mask_img = Image.fromarray(mask_np)
@ -690,23 +696,29 @@ class OpenAIChatNode(IO.ComfyNode):
        )

    @classmethod
-    def get_message_content_from_response(cls, response: OpenAIResponse) -> list[OutputContent]:
+    def get_message_content_from_response(
+        cls, response: OpenAIResponse
+    ) -> list[OutputContent]:
        """Extract message content from the API response."""
        for output in response.output:
-            if output.type == "message":
-                return output.content
+            if output.root.type == "message":
+                return output.root.content
        raise TypeError("No output message found in response")

    @classmethod
-    def get_text_from_message_content(cls, message_content: list[OutputContent]) -> str:
+    def get_text_from_message_content(
+        cls, message_content: list[OutputContent]
+    ) -> str:
        """Extract text content from message content."""
        for content_item in message_content:
-            if content_item.type == "output_text":
-                return str(content_item.text)
+            if content_item.root.type == "output_text":
+                return str(content_item.root.text)
        return "No text output found in response"

    @classmethod
-    def tensor_to_input_image_content(cls, image: torch.Tensor, detail_level: str = "auto") -> InputImageContent:
+    def tensor_to_input_image_content(
+        cls, image: torch.Tensor, detail_level: Detail = "auto"
+    ) -> InputImageContent:
        """Convert a tensor to an input image content object."""
        return InputImageContent(
            detail=detail_level,
@ -720,9 +732,9 @@ class OpenAIChatNode(IO.ComfyNode):
        prompt: str,
        image: torch.Tensor | None = None,
        files: list[InputFileContent] | None = None,
-    ) -> list[InputTextContent | InputImageContent | InputFileContent]:
+    ) -> InputMessageContentList:
        """Create a list of input message contents from prompt and optional image."""
-        content_list: list[InputTextContent | InputImageContent | InputFileContent] = [
+        content_list: list[InputContent | InputTextContent | InputImageContent | InputFileContent] = [
            InputTextContent(text=prompt, type="input_text"),
        ]
        if image is not None:
@ -734,9 +746,13 @@ class OpenAIChatNode(IO.ComfyNode):
                        type="input_image",
                    )
                )
+
        if files is not None:
            content_list.extend(files)
-        return content_list
+
+        return InputMessageContentList(
+            root=content_list,
+        )

    @classmethod
    async def execute(
@ -746,7 +762,7 @@ class OpenAIChatNode(IO.ComfyNode):
        model: SupportedOpenAIModel = SupportedOpenAIModel.gpt_5.value,
        images: torch.Tensor | None = None,
        files: list[InputFileContent] | None = None,
-        advanced_options: ModelResponseProperties | None = None,
+        advanced_options: CreateModelResponseProperties | None = None,
    ) -> IO.NodeOutput:
        validate_string(prompt, strip_whitespace=False)

@ -757,28 +773,36 @@ class OpenAIChatNode(IO.ComfyNode):
            response_model=OpenAIResponse,
            data=OpenAICreateResponse(
                input=[
-                    InputMessage(
-                        content=cls.create_input_message_contents(prompt, images, files),
-                        role="user",
+                    Item(
+                        root=InputMessage(
+                            content=cls.create_input_message_contents(
+                                prompt, images, files
+                            ),
+                            role="user",
+                        )
                    ),
                ],
                store=True,
                stream=False,
                model=model,
                previous_response_id=None,
-                **(advanced_options.model_dump(exclude_none=True) if advanced_options else {}),
+                **(
+                    advanced_options.model_dump(exclude_none=True)
+                    if advanced_options
+                    else {}
+                ),
            ),
        )
        response_id = create_response.id

        # Get result output
        result_response = await poll_op(
-            cls,
-            ApiEndpoint(path=f"{RESPONSES_ENDPOINT}/{response_id}"),
-            response_model=OpenAIResponse,
-            status_extractor=lambda response: response.status,
-            completed_statuses=["incomplete", "completed"],
-        )
+                cls,
+                ApiEndpoint(path=f"{RESPONSES_ENDPOINT}/{response_id}"),
+                response_model=OpenAIResponse,
+                status_extractor=lambda response: response.status,
+                completed_statuses=["incomplete", "completed"]
+            )
        return IO.NodeOutput(cls.get_text_from_message_content(cls.get_message_content_from_response(result_response)))


@ -899,7 +923,7 @@ class OpenAIChatConfig(IO.ComfyNode):
            remove depending on model choice.
        """
        return IO.NodeOutput(
-            ModelResponseProperties(
+            CreateModelResponseProperties(
                instructions=instructions,
                truncation=truncation,
                max_output_tokens=max_output_tokens,
--- a/comfy_api_nodes/nodes_pixverse.py
+++ b/comfy_api_nodes/nodes_pixverse.py
@ -1,7 +1,7 @@
 import torch
 from typing_extensions import override
 from comfy_api.latest import IO, ComfyExtension
-from comfy_api_nodes.apis.pixverse import (
+from comfy_api_nodes.apis.pixverse_api import (
    PixverseTextVideoRequest,
    PixverseImageVideoRequest,
    PixverseTransitionVideoRequest,
--- a/comfy_api_nodes/nodes_recraft.py
+++ b/comfy_api_nodes/nodes_recraft.py
@ -8,7 +8,7 @@ from typing_extensions import override

 from comfy.utils import ProgressBar
 from comfy_api.latest import IO, ComfyExtension
-from comfy_api_nodes.apis.recraft import (
+from comfy_api_nodes.apis.recraft_api import (
    RecraftColor,
    RecraftColorChain,
    RecraftControls,
--- a/comfy_api_nodes/nodes_rodin.py
+++ b/comfy_api_nodes/nodes_rodin.py
@ -14,7 +14,7 @@ from typing import Optional
 from io import BytesIO
 from typing_extensions import override
 from PIL import Image
-from comfy_api_nodes.apis.rodin import (
+from comfy_api_nodes.apis.rodin_api import (
    Rodin3DGenerateRequest,
    Rodin3DGenerateResponse,
    Rodin3DCheckStatusRequest,
--- a/comfy_api_nodes/nodes_runway.py
+++ b/comfy_api_nodes/nodes_runway.py
@ -16,7 +16,7 @@ from enum import Enum
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input, InputImpl
-from comfy_api_nodes.apis.runway import (
+from comfy_api_nodes.apis import (
    RunwayImageToVideoRequest,
    RunwayImageToVideoResponse,
    RunwayTaskStatusResponse as TaskStatusResponse,
--- a/comfy_api_nodes/nodes_stability.py
+++ b/comfy_api_nodes/nodes_stability.py
@ -3,7 +3,7 @@ from typing import Optional
 from typing_extensions import override

 from comfy_api.latest import ComfyExtension, Input, IO
-from comfy_api_nodes.apis.stability import (
+from comfy_api_nodes.apis.stability_api import (
    StabilityUpscaleConservativeRequest,
    StabilityUpscaleCreativeRequest,
    StabilityAsyncResponse,
--- a/comfy_api_nodes/nodes_topaz.py
+++ b/comfy_api_nodes/nodes_topaz.py
@ -5,24 +5,7 @@ import aiohttp
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.topaz import (
-    CreateVideoRequest,
-    CreateVideoRequestSource,
-    CreateVideoResponse,
-    ImageAsyncTaskResponse,
-    ImageDownloadResponse,
-    ImageEnhanceRequest,
-    ImageStatusResponse,
-    OutputInformationVideo,
-    Resolution,
-    VideoAcceptResponse,
-    VideoCompleteUploadRequest,
-    VideoCompleteUploadRequestPart,
-    VideoCompleteUploadResponse,
-    VideoEnhancementFilter,
-    VideoFrameInterpolationFilter,
-    VideoStatusResponse,
-)
+from comfy_api_nodes.apis import topaz_api
 from comfy_api_nodes.util import (
    ApiEndpoint,
    download_url_to_image_tensor,
@ -170,13 +153,13 @@ class TopazImageEnhance(IO.ComfyNode):
        if get_number_of_images(image) != 1:
            raise ValueError("Only one input image is supported.")
        download_url = await upload_images_to_comfyapi(
-            cls, image, max_images=1, mime_type="image/png", total_pixels=4096 * 4096
+            cls, image, max_images=1, mime_type="image/png", total_pixels=4096*4096
        )
        initial_response = await sync_op(
            cls,
            ApiEndpoint(path="/proxy/topaz/image/v1/enhance-gen/async", method="POST"),
-            response_model=ImageAsyncTaskResponse,
-            data=ImageEnhanceRequest(
+            response_model=topaz_api.ImageAsyncTaskResponse,
+            data=topaz_api.ImageEnhanceRequest(
                model=model,
                prompt=prompt,
                subject_detection=subject_detection,
@ -198,7 +181,7 @@ class TopazImageEnhance(IO.ComfyNode):
        await poll_op(
            cls,
            poll_endpoint=ApiEndpoint(path=f"/proxy/topaz/image/v1/status/{initial_response.process_id}"),
-            response_model=ImageStatusResponse,
+            response_model=topaz_api.ImageStatusResponse,
            status_extractor=lambda x: x.status,
            progress_extractor=lambda x: getattr(x, "progress", 0),
            price_extractor=lambda x: x.credits * 0.08,
@ -210,7 +193,7 @@ class TopazImageEnhance(IO.ComfyNode):
        results = await sync_op(
            cls,
            ApiEndpoint(path=f"/proxy/topaz/image/v1/download/{initial_response.process_id}"),
-            response_model=ImageDownloadResponse,
+            response_model=topaz_api.ImageDownloadResponse,
            monitor_progress=False,
        )
        return IO.NodeOutput(await download_url_to_image_tensor(results.download_url))
@ -348,7 +331,7 @@ class TopazVideoEnhance(IO.ComfyNode):
            if target_height % 2 != 0:
                target_height += 1
            filters.append(
-                VideoEnhancementFilter(
+                topaz_api.VideoEnhancementFilter(
                    model=UPSCALER_MODELS_MAP[upscaler_model],
                    creativity=(upscaler_creativity if UPSCALER_MODELS_MAP[upscaler_model] == "slc-1" else None),
                    isOptimizedMode=(True if UPSCALER_MODELS_MAP[upscaler_model] == "slc-1" else None),
@ -357,7 +340,7 @@ class TopazVideoEnhance(IO.ComfyNode):
        if interpolation_enabled:
            target_frame_rate = interpolation_frame_rate
            filters.append(
-                VideoFrameInterpolationFilter(
+                topaz_api.VideoFrameInterpolationFilter(
                    model=interpolation_model,
                    slowmo=interpolation_slowmo,
                    fps=interpolation_frame_rate,
@ -368,19 +351,19 @@ class TopazVideoEnhance(IO.ComfyNode):
        initial_res = await sync_op(
            cls,
            ApiEndpoint(path="/proxy/topaz/video/", method="POST"),
-            response_model=CreateVideoResponse,
-            data=CreateVideoRequest(
-                source=CreateVideoRequestSource(
+            response_model=topaz_api.CreateVideoResponse,
+            data=topaz_api.CreateVideoRequest(
+                source=topaz_api.CreateCreateVideoRequestSource(
                    container="mp4",
                    size=get_fs_object_size(src_video_stream),
                    duration=int(duration_sec),
                    frameCount=video.get_frame_count(),
                    frameRate=src_frame_rate,
-                    resolution=Resolution(width=src_width, height=src_height),
+                    resolution=topaz_api.Resolution(width=src_width, height=src_height),
                ),
                filters=filters,
-                output=OutputInformationVideo(
-                    resolution=Resolution(width=target_width, height=target_height),
+                output=topaz_api.OutputInformationVideo(
+                    resolution=topaz_api.Resolution(width=target_width, height=target_height),
                    frameRate=target_frame_rate,
                    audioCodec="AAC",
                    audioTransfer="Copy",
@ -396,7 +379,7 @@ class TopazVideoEnhance(IO.ComfyNode):
                path=f"/proxy/topaz/video/{initial_res.requestId}/accept",
                method="PATCH",
            ),
-            response_model=VideoAcceptResponse,
+            response_model=topaz_api.VideoAcceptResponse,
            wait_label="Preparing upload",
            final_label_on_success="Upload started",
        )
@ -419,10 +402,10 @@ class TopazVideoEnhance(IO.ComfyNode):
                path=f"/proxy/topaz/video/{initial_res.requestId}/complete-upload",
                method="PATCH",
            ),
-            response_model=VideoCompleteUploadResponse,
-            data=VideoCompleteUploadRequest(
+            response_model=topaz_api.VideoCompleteUploadResponse,
+            data=topaz_api.VideoCompleteUploadRequest(
                uploadResults=[
-                    VideoCompleteUploadRequestPart(
+                    topaz_api.VideoCompleteUploadRequestPart(
                        partNum=1,
                        eTag=upload_etag,
                    ),
@ -434,7 +417,7 @@ class TopazVideoEnhance(IO.ComfyNode):
        final_response = await poll_op(
            cls,
            ApiEndpoint(path=f"/proxy/topaz/video/{initial_res.requestId}/status"),
-            response_model=VideoStatusResponse,
+            response_model=topaz_api.VideoStatusResponse,
            status_extractor=lambda x: x.status,
            progress_extractor=lambda x: getattr(x, "progress", 0),
            price_extractor=lambda x: (x.estimates.cost[0] * 0.08 if x.estimates and x.estimates.cost[0] else None),
--- a/comfy_api_nodes/nodes_tripo.py
+++ b/comfy_api_nodes/nodes_tripo.py
@ -5,7 +5,7 @@ import torch
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension
-from comfy_api_nodes.apis.tripo import (
+from comfy_api_nodes.apis.tripo_api import (
    TripoAnimateRetargetRequest,
    TripoAnimateRigRequest,
    TripoConvertModelRequest,
--- a/comfy_api_nodes/nodes_veo2.py
+++ b/comfy_api_nodes/nodes_veo2.py
@ -4,7 +4,7 @@ from io import BytesIO
 from typing_extensions import override

 from comfy_api.latest import IO, ComfyExtension, Input, InputImpl
-from comfy_api_nodes.apis.veo import (
+from comfy_api_nodes.apis.veo_api import (
    VeoGenVidPollRequest,
    VeoGenVidPollResponse,
    VeoGenVidRequest,
--- a/comfy_api_nodes/redocly-dev.yaml
+++ b/comfy_api_nodes/redocly-dev.yaml
@ -0,0 +1,10 @@
+# This file is used to filter the Comfy Org OpenAPI spec for schemas related to API Nodes.
+# This is used for development purposes to generate stubs for unreleased API endpoints.
+apis:
+  filter:
+    root: openapi.yaml
+    decorators:
+      filter-in:
+        property: tags
+        value: ['API Nodes']
+        matchStrategy: all
--- a/comfy_api_nodes/redocly.yaml
+++ b/comfy_api_nodes/redocly.yaml
@ -0,0 +1,10 @@
+# This file is used to filter the Comfy Org OpenAPI spec for schemas related to API Nodes.
+
+apis:
+  filter:
+    root: openapi.yaml
+    decorators:
+      filter-in:
+        property: tags
+        value: ['API Nodes', 'Released']
+        matchStrategy: all
--- a/comfy_api_nodes/util/upload_helpers.py
+++ b/comfy_api_nodes/util/upload_helpers.py
@ -43,7 +43,7 @@ class UploadResponse(BaseModel):

 async def upload_images_to_comfyapi(
    cls: type[IO.ComfyNode],
-    image: torch.Tensor | list[torch.Tensor],
+    image: torch.Tensor,
    *,
    max_images: int = 8,
    mime_type: str | None = None,
@ -55,28 +55,15 @@ async def upload_images_to_comfyapi(
    Uploads images to ComfyUI API and returns download URLs.
    To upload multiple images, stack them in the batch dimension first.
    """
-    tensors: list[torch.Tensor] = []
-    if isinstance(image, list):
-        for img in image:
-            is_batch = len(img.shape) > 3
-            if is_batch:
-                tensors.extend(img[i] for i in range(img.shape[0]))
-            else:
-                tensors.append(img)
-    else:
-        is_batch = len(image.shape) > 3
-        if is_batch:
-            tensors.extend(image[i] for i in range(image.shape[0]))
-        else:
-            tensors.append(image)
-
    # if batched, try to upload each file if max_images is greater than 0
    download_urls: list[str] = []
-    num_to_upload = min(len(tensors), max_images)
+    is_batch = len(image.shape) > 3
+    batch_len = image.shape[0] if is_batch else 1
+    num_to_upload = min(batch_len, max_images)
    batch_start_ts = time.monotonic()

    for idx in range(num_to_upload):
-        tensor = tensors[idx]
+        tensor = image[idx] if is_batch else image
        img_io = tensor_to_bytesio(tensor, total_pixels=total_pixels, mime_type=mime_type)

        effective_label = wait_label
--- a/comfyui_version.py
+++ b/comfyui_version.py
@ -1,3 +1,3 @@
 # This file is automatically generated by the build process when version is
 # updated in pyproject.toml.
-__version__ = "0.9.2"
+__version__ = "0.9.1"
--- a/nodes.py
+++ b/nodes.py
@ -5,7 +5,6 @@ import torch
 import os
 import sys
 import json
-import glob
 import hashlib
 import inspect
 import traceback
@ -789,7 +788,6 @@ class VAELoader:

    #TODO: scale factor?
    def load_vae(self, vae_name):
-        metadata = None
        if vae_name == "pixel_space":
            sd = {}
            sd["pixel_space_vae"] = torch.tensor(1.0)
@ -2385,12 +2383,37 @@ async def init_builtin_extra_nodes():

 async def init_builtin_api_nodes():
    api_nodes_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "comfy_api_nodes")
-    api_nodes_files = sorted(glob.glob(os.path.join(api_nodes_dir, "nodes_*.py")))
+    api_nodes_files = [
+        "nodes_ideogram.py",
+        "nodes_openai.py",
+        "nodes_minimax.py",
+        "nodes_veo2.py",
+        "nodes_kling.py",
+        "nodes_bfl.py",
+        "nodes_bytedance.py",
+        "nodes_ltxv.py",
+        "nodes_luma.py",
+        "nodes_recraft.py",
+        "nodes_pixverse.py",
+        "nodes_stability.py",
+        "nodes_runway.py",
+        "nodes_sora.py",
+        "nodes_topaz.py",
+        "nodes_tripo.py",
+        "nodes_moonvalley.py",
+        "nodes_rodin.py",
+        "nodes_gemini.py",
+        "nodes_vidu.py",
+        "nodes_wan.py",
+    ]
+
+    if not await load_custom_node(os.path.join(api_nodes_dir, "canary.py"), module_parent="comfy_api_nodes"):
+        return api_nodes_files

    import_failed = []
    for node_file in api_nodes_files:
-        if not await load_custom_node(node_file, module_parent="comfy_api_nodes"):
-            import_failed.append(os.path.basename(node_file))
+        if not await load_custom_node(os.path.join(api_nodes_dir, node_file), module_parent="comfy_api_nodes"):
+            import_failed.append(node_file)

    return import_failed

--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [project]
 name = "ComfyUI"
-version = "0.9.2"
+version = "0.9.1"
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"
--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,5 @@
 comfyui-frontend-package==1.36.14
-comfyui-workflow-templates==0.8.11
+comfyui-workflow-templates==0.8.4
 comfyui-embedded-docs==0.4.0
 torch
 torchsde
@ -21,7 +21,7 @@ psutil
 alembic
 SQLAlchemy
 av>=14.2.0
-comfy-kitchen>=0.2.7
+comfy-kitchen>=0.2.6

 #non essential dependencies:
 kornia>=0.7.1
--- a/server.py
+++ b/server.py
@ -721,10 +721,7 @@ class PromptServer():

        @routes.get("/object_info")
        async def get_object_info(request):
-            try:
-                seed_assets(["models"])
-            except Exception as e:
-                logging.error(f"Failed to seed assets: {e}")
+            seed_assets(["models"])
            with folder_paths.cache_helper:
                out = {}
                for x in nodes.NODE_CLASS_MAPPINGS:
--- a/tests-unit/comfy_api_nodes_test/mapper_utils_test.py
+++ b/tests-unit/comfy_api_nodes_test/mapper_utils_test.py
@ -0,0 +1,297 @@
+from typing import Optional
+from enum import Enum
+
+from pydantic import BaseModel, Field
+
+from comfy.comfy_types.node_typing import IO
+from comfy_api_nodes.mapper_utils import model_field_to_node_input
+
+
+def test_model_field_to_float_input():
+    """Tests mapping a float field with constraints."""
+
+    class ModelWithFloatField(BaseModel):
+        cfg_scale: Optional[float] = Field(
+            default=0.5,
+            description="Flexibility in video generation",
+            ge=0.0,
+            le=1.0,
+            multiple_of=0.001,
+        )
+
+    expected_output = (
+        IO.FLOAT,
+        {
+            "default": 0.5,
+            "tooltip": "Flexibility in video generation",
+            "min": 0.0,
+            "max": 1.0,
+            "step": 0.001,
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.FLOAT, ModelWithFloatField, "cfg_scale"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_float_input_no_constraints():
+    """Tests mapping a float field with no constraints."""
+
+    class ModelWithFloatField(BaseModel):
+        cfg_scale: Optional[float] = Field(default=0.5)
+
+    expected_output = (
+        IO.FLOAT,
+        {
+            "default": 0.5,
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.FLOAT, ModelWithFloatField, "cfg_scale"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_int_input():
+    """Tests mapping an int field with constraints."""
+
+    class ModelWithIntField(BaseModel):
+        num_frames: Optional[int] = Field(
+            default=10,
+            description="Number of frames to generate",
+            ge=1,
+            le=100,
+            multiple_of=1,
+        )
+
+    expected_output = (
+        IO.INT,
+        {
+            "default": 10,
+            "tooltip": "Number of frames to generate",
+            "min": 1,
+            "max": 100,
+            "step": 1,
+        },
+    )
+
+    actual_output = model_field_to_node_input(IO.INT, ModelWithIntField, "num_frames")
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_string_input():
+    """Tests mapping a string field."""
+
+    class ModelWithStringField(BaseModel):
+        prompt: Optional[str] = Field(
+            default="A beautiful sunset over a calm ocean",
+            description="A prompt for the video generation",
+        )
+
+    expected_output = (
+        IO.STRING,
+        {
+            "default": "A beautiful sunset over a calm ocean",
+            "tooltip": "A prompt for the video generation",
+        },
+    )
+
+    actual_output = model_field_to_node_input(IO.STRING, ModelWithStringField, "prompt")
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_string_input_multiline():
+    """Tests mapping a string field."""
+
+    class ModelWithStringField(BaseModel):
+        prompt: Optional[str] = Field(
+            default="A beautiful sunset over a calm ocean",
+            description="A prompt for the video generation",
+        )
+
+    expected_output = (
+        IO.STRING,
+        {
+            "default": "A beautiful sunset over a calm ocean",
+            "tooltip": "A prompt for the video generation",
+            "multiline": True,
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.STRING, ModelWithStringField, "prompt", multiline=True
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_combo_input():
+    """Tests mapping a combo field."""
+
+    class MockEnum(str, Enum):
+        option_1 = "option 1"
+        option_2 = "option 2"
+        option_3 = "option 3"
+
+    class ModelWithComboField(BaseModel):
+        model_name: Optional[MockEnum] = Field("option 1", description="Model Name")
+
+    expected_output = (
+        IO.COMBO,
+        {
+            "options": ["option 1", "option 2", "option 3"],
+            "default": "option 1",
+            "tooltip": "Model Name",
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.COMBO, ModelWithComboField, "model_name", enum_type=MockEnum
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_combo_input_no_options():
+    """Tests mapping a combo field with no options."""
+
+    class ModelWithComboField(BaseModel):
+        model_name: Optional[str] = Field(description="Model Name")
+
+    expected_output = (
+        IO.COMBO,
+        {
+            "tooltip": "Model Name",
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.COMBO, ModelWithComboField, "model_name"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_image_input():
+    """Tests mapping an image field."""
+
+    class ModelWithImageField(BaseModel):
+        image: Optional[str] = Field(
+            default=None,
+            description="An image for the video generation",
+        )
+
+    expected_output = (
+        IO.IMAGE,
+        {
+            "default": None,
+            "tooltip": "An image for the video generation",
+        },
+    )
+
+    actual_output = model_field_to_node_input(IO.IMAGE, ModelWithImageField, "image")
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_node_input_no_description():
+    """Tests mapping a field with no description."""
+
+    class ModelWithNoDescriptionField(BaseModel):
+        field: Optional[str] = Field(default="default value")
+
+    expected_output = (
+        IO.STRING,
+        {
+            "default": "default value",
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.STRING, ModelWithNoDescriptionField, "field"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_node_input_no_default():
+    """Tests mapping a field with no default."""
+
+    class ModelWithNoDefaultField(BaseModel):
+        field: Optional[str] = Field(description="A field with no default")
+
+    expected_output = (
+        IO.STRING,
+        {
+            "tooltip": "A field with no default",
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.STRING, ModelWithNoDefaultField, "field"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_node_input_no_metadata():
+    """Tests mapping a field with no metadata or properties defined on the schema."""
+
+    class ModelWithNoMetadataField(BaseModel):
+        field: Optional[str] = Field()
+
+    expected_output = (
+        IO.STRING,
+        {},
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.STRING, ModelWithNoMetadataField, "field"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]
+
+
+def test_model_field_to_node_input_default_is_none():
+    """
+    Tests mapping a field with a default of `None`.
+    I.e., the default field should be included as the schema explicitly sets it to `None`.
+    """
+
+    class ModelWithNoneDefaultField(BaseModel):
+        field: Optional[str] = Field(
+            default=None, description="A field with a default of None"
+        )
+
+    expected_output = (
+        IO.STRING,
+        {
+            "default": None,
+            "tooltip": "A field with a default of None",
+        },
+    )
+
+    actual_output = model_field_to_node_input(
+        IO.STRING, ModelWithNoneDefaultField, "field"
+    )
+
+    assert actual_output[0] == expected_output[0]
+    assert actual_output[1] == expected_output[1]