Moved comfy_api.v3 stuff onto comfy_api.latest

comfy_api/latest/__init__.py

@@ -5,6 +5,9 @@ from comfy_api.internal import ComfyAPIBase
 from comfy_api.internal.singleton import ProxiedSingleton
 from comfy_api.internal.async_to_sync import create_sync_class
 from comfy_api.latest.input import ImageInput
+from comfy_api.latest._io import _IO as io  #noqa: F401
+from comfy_api.latest._ui import _UI as ui  #noqa: F401
+from comfy_api.latest._resources import _RESOURCES as resources  #noqa: F401
 from comfy_execution.utils import get_executing_context
 from comfy_execution.progress import get_progress_state
 from PIL import Image

comfy_api/latest/_io.py

@@ -24,7 +24,7 @@ from comfy.sd import StyleModel as StyleModel_
 from comfy_api.input import VideoInput
 from comfy_api.internal import (_ComfyNodeInternal, _NodeOutputInternal, classproperty, copy_class, first_real_override, is_class,
     prune_dict, shallow_clone_class)
-from comfy_api.v3._resources import Resources, ResourcesLocal
+from comfy_api.latest._resources import Resources, ResourcesLocal
 from comfy_execution.graph import ExecutionBlocker
 
 # from comfy_extras.nodes_images import SVG as SVG_ # NOTE: needs to be moved before can be imported due to circular reference

comfy_api/latest/_ui.py

@@ -17,7 +17,7 @@ import folder_paths
 
 # used for image preview
 from comfy.cli_args import args
-from comfy_api.v3._io import ComfyNode, FolderType, Image, _UIOutput
+from comfy_api.latest._io import ComfyNode, FolderType, Image, _UIOutput
 
 
 class SavedResult(dict):

comfy_api/v3/__init__.py

@@ -1,9 +0,0 @@
-from comfy_api.v3._io import _IO
-from comfy_api.v3._ui import _UI
-from comfy_api.v3._resources import _RESOURCES
-
-io = _IO
-ui = _UI
-resources = _RESOURCES
-
-__all__ = ["io", "ui", "resources"]

comfy_extras/nodes_v3_test.py

@@ -1,6 +1,6 @@
 import torch
 import time
-from comfy_api.v3 import io, ui, resources, _io
+from comfy_api.latest import io, ui, resources, _io
 import logging  # noqa
 import folder_paths
 import comfy.utils

comfy_extras/v3/nodes_ace.py

@@ -4,7 +4,7 @@ import torch
 
 import comfy.model_management
 import node_helpers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class TextEncodeAceStepAudio(io.ComfyNode):

comfy_extras/v3/nodes_advanced_samplers.py

@@ -6,7 +6,7 @@ import comfy.model_patcher
 import comfy.samplers
 import comfy.utils
 from comfy.k_diffusion.sampling import to_d
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 @torch.no_grad()

comfy_extras/v3/nodes_align_your_steps.py

@@ -3,7 +3,7 @@
 import numpy as np
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 NOISE_LEVELS = {
     "SD1": [

comfy_extras/v3/nodes_apg.py

@@ -1,6 +1,6 @@
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def project(v0, v1):

comfy_extras/v3/nodes_attention_multiply.py

@@ -1,4 +1,4 @@
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def attention_multiply(attn, model, q, k, v, out):

comfy_extras/v3/nodes_audio.py

@@ -9,7 +9,7 @@ import torchaudio
 import comfy.model_management
 import folder_paths
 import node_helpers
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 class ConditioningStableAudio(io.ComfyNode):

comfy_extras/v3/nodes_camera_trajectory.py

@@ -6,7 +6,7 @@ from einops import rearrange
 
 import comfy.model_management
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 CAMERA_DICT = {
     "base_T_norm": 1.5,

comfy_extras/v3/nodes_canny.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from kornia.filters import canny
 
 import comfy.model_management
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class Canny(io.ComfyNode):

comfy_extras/v3/nodes_cfg.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def optimized_scale(positive, negative):

comfy_extras/v3/nodes_clip_sdxl.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class CLIPTextEncodeSDXL(io.ComfyNode):

comfy_extras/v3/nodes_compositing.py

@@ -5,7 +5,7 @@ from enum import Enum
 import torch
 
 import comfy.utils
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def resize_mask(mask, shape):

comfy_extras/v3/nodes_cond.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class CLIPTextEncodeControlnet(io.ComfyNode):

comfy_extras/v3/nodes_controlnet.py

@@ -1,6 +1,6 @@
 import comfy.utils
 from comfy.cldm.control_types import UNION_CONTROLNET_TYPES
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class ControlNetApplyAdvanced(io.ComfyNode):

comfy_extras/v3/nodes_cosmos.py

@@ -6,7 +6,7 @@ import comfy.latent_formats
 import comfy.model_management
 import comfy.utils
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def vae_encode_with_padding(vae, image, width, height, length, padding=0):

comfy_extras/v3/nodes_differential_diffusion.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class DifferentialDiffusion(io.ComfyNode):

comfy_extras/v3/nodes_edit_model.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import node_helpers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class ReferenceLatent(io.ComfyNode):

comfy_extras/v3/nodes_flux.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import comfy.utils
 import node_helpers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 PREFERED_KONTEXT_RESOLUTIONS = [
     (672, 1568),

comfy_extras/v3/nodes_freelunch.py

@@ -6,7 +6,7 @@ import logging
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def Fourier_filter(x, threshold, scale):

comfy_extras/v3/nodes_fresca.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import torch
 import torch.fft as fft
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def Fourier_filter(x, scale_low=1.0, scale_high=1.5, freq_cutoff=20):

comfy_extras/v3/nodes_gits.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import numpy as np
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def loglinear_interp(t_steps, num_steps):

comfy_extras/v3/nodes_hidream.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import comfy.model_management
 import comfy.sd
 import folder_paths
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class CLIPTextEncodeHiDream(io.ComfyNode):

comfy_extras/v3/nodes_hunyuan.py

@@ -5,7 +5,7 @@ import torch
 import comfy.model_management
 import node_helpers
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 PROMPT_TEMPLATE_ENCODE_VIDEO_I2V = (
     "<|start_header_id|>system<|end_header_id|>\n\n<image>\nDescribe the video by detailing the following aspects according to the reference image: "

comfy_extras/v3/nodes_hypernetwork.py

@@ -6,7 +6,7 @@ import torch
 
 import comfy.utils
 import folder_paths
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def load_hypernetwork_patch(path, strength):

comfy_extras/v3/nodes_hypertile.py

@@ -7,7 +7,7 @@ import math
 from einops import rearrange
 from torch import randint
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def random_divisor(value: int, min_value: int, /, max_options: int = 1) -> int:

comfy_extras/v3/nodes_images.py

@@ -9,7 +9,7 @@ import comfy.utils
 import folder_paths
 import node_helpers
 import nodes
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 from server import PromptServer
 
 

comfy_extras/v3/nodes_ip2p.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class InstructPixToPixConditioning(io.ComfyNode):

comfy_extras/v3/nodes_latent.py

@@ -4,7 +4,7 @@ import torch
 
 import comfy.utils
 import comfy_extras.nodes_post_processing
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def reshape_latent_to(target_shape, latent, repeat_batch=True):

comfy_extras/v3/nodes_load_3d.py

@@ -6,7 +6,7 @@ from pathlib import Path
 import folder_paths
 import nodes
 from comfy_api.input_impl import VideoFromFile
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 def normalize_path(path):

comfy_extras/v3/nodes_lora_extract.py

@@ -9,7 +9,7 @@ import torch
 import comfy.model_management
 import comfy.utils
 import folder_paths
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 CLAMP_QUANTILE = 0.99
 

comfy_extras/v3/nodes_lotus.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import torch
 
 import comfy.model_management as mm
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class LotusConditioning(io.ComfyNode):

comfy_extras/v3/nodes_lt.py

@@ -16,7 +16,7 @@ from comfy.ldm.lightricks.symmetric_patchifier import (
     SymmetricPatchifier,
     latent_to_pixel_coords,
 )
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def conditioning_get_any_value(conditioning, key, default=None):

comfy_extras/v3/nodes_lumina2.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class CLIPTextEncodeLumina2(io.ComfyNode):

comfy_extras/v3/nodes_mask.py

@@ -7,7 +7,7 @@ import torch
 import comfy.utils
 import node_helpers
 import nodes
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 def composite(destination, source, x, y, mask=None, multiplier=8, resize_source=False):

comfy_extras/v3/nodes_mochi.py

@@ -4,7 +4,7 @@ import torch
 
 import comfy.model_management
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class EmptyMochiLatentVideo(io.ComfyNode):

comfy_extras/v3/nodes_model_advanced.py

@@ -7,7 +7,7 @@ import comfy.model_sampling
 import comfy.sd
 import node_helpers
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class LCM(comfy.model_sampling.EPS):

comfy_extras/v3/nodes_model_downscale.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import comfy.utils
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class PatchModelAddDownscale(io.ComfyNode):

comfy_extras/v3/nodes_morphology.py

@@ -13,7 +13,7 @@ from kornia.morphology import (
 )
 
 import comfy.model_management
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class ImageRGBToYUV(io.ComfyNode):

comfy_extras/v3/nodes_optimalsteps.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import numpy as np
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 # from https://github.com/bebebe666/OptimalSteps
 

comfy_extras/v3/nodes_pag.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import comfy.model_patcher
 import comfy.samplers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 #Modified/simplified version of the node from: https://github.com/pamparamm/sd-perturbed-attention
 #If you want the one with more options see the above repo.

comfy_extras/v3/nodes_perpneg.py

@@ -9,7 +9,7 @@ import comfy.sampler_helpers
 import comfy.samplers
 import comfy.utils
 import node_helpers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def perp_neg(x, noise_pred_pos, noise_pred_neg, noise_pred_nocond, neg_scale, cond_scale):

comfy_extras/v3/nodes_photomaker.py

@@ -9,7 +9,7 @@ import comfy.model_management
 import comfy.ops
 import comfy.utils
 import folder_paths
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 # code for model from:
 # https://github.com/TencentARC/PhotoMaker/blob/main/photomaker/model.py under Apache License Version 2.0

comfy_extras/v3/nodes_pixart.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class CLIPTextEncodePixArtAlpha(io.ComfyNode):

comfy_extras/v3/nodes_post_processing.py

@@ -10,7 +10,7 @@ from PIL import Image
 import comfy.model_management
 import comfy.utils
 import node_helpers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def gaussian_kernel(kernel_size: int, sigma: float, device=None):

comfy_extras/v3/nodes_preview_any.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 class PreviewAny(io.ComfyNode):

comfy_extras/v3/nodes_primitive.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import sys
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class String(io.ComfyNode):

comfy_extras/v3/nodes_rebatch.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class ImageRebatch(io.ComfyNode):

comfy_extras/v3/nodes_sag.py

@@ -9,7 +9,7 @@ from torch import einsum
 
 import comfy.samplers
 from comfy.ldm.modules.attention import optimized_attention
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 # from comfy/ldm/modules/attention.py

comfy_extras/v3/nodes_sd3.py

@@ -6,7 +6,7 @@ import comfy.model_management
 import comfy.sd
 import folder_paths
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 from comfy_extras.v3.nodes_slg import SkipLayerGuidanceDiT
 
 

comfy_extras/v3/nodes_sdupscale.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import torch
 
 import comfy.utils
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class SD_4XUpscale_Conditioning(io.ComfyNode):

comfy_extras/v3/nodes_slg.py

@@ -4,7 +4,7 @@ import re
 
 import comfy.model_patcher
 import comfy.samplers
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class SkipLayerGuidanceDiT(io.ComfyNode):

comfy_extras/v3/nodes_stable_cascade.py

@@ -20,7 +20,7 @@ import torch
 
 import comfy.utils
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class StableCascade_EmptyLatentImage(io.ComfyNode):

comfy_extras/v3/nodes_tcfg.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def score_tangential_damping(cond_score: torch.Tensor, uncond_score: torch.Tensor) -> torch.Tensor:

comfy_extras/v3/nodes_tomesd.py

@@ -7,7 +7,7 @@ from typing import Callable, Tuple
 
 import torch
 
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 def do_nothing(x: torch.Tensor, mode:str=None):

comfy_extras/v3/nodes_torch_compile.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from comfy_api.torch_helpers import set_torch_compile_wrapper
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class TorchCompileModel(io.ComfyNode):

comfy_extras/v3/nodes_train.py

@@ -18,7 +18,7 @@ import comfy_extras.nodes_custom_sampler
 import folder_paths
 import node_helpers
 from comfy.weight_adapter import adapter_maps, adapters
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 def make_batch_extra_option_dict(d, indicies, full_size=None):

comfy_extras/v3/nodes_upscale_model.py

@@ -8,7 +8,7 @@ from spandrel import ImageModelDescriptor, ModelLoader
 import comfy.utils
 import folder_paths
 from comfy import model_management
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 try:
     from spandrel import MAIN_REGISTRY

comfy_extras/v3/nodes_video.py

@@ -12,7 +12,7 @@ from comfy.cli_args import args
 from comfy_api.input import AudioInput, ImageInput, VideoInput
 from comfy_api.input_impl import VideoFromComponents, VideoFromFile
 from comfy_api.util import VideoCodec, VideoComponents, VideoContainer
-from comfy_api.v3 import io, ui
+from comfy_api.latest import io, ui
 
 
 class CreateVideo(io.ComfyNode):

comfy_extras/v3/nodes_video_model.py

@@ -8,7 +8,7 @@ import comfy_extras.nodes_model_merging
 import folder_paths
 import node_helpers
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class ConditioningSetAreaPercentageVideo(io.ComfyNode):

comfy_extras/v3/nodes_wan.py

@@ -8,7 +8,7 @@ import comfy.model_management
 import comfy.utils
 import node_helpers
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class TrimVideoLatent(io.ComfyNode):

comfy_extras/v3/nodes_webcam.py

@@ -7,7 +7,7 @@ from PIL import Image, ImageOps, ImageSequence
 import folder_paths
 import node_helpers
 import nodes
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 
 class WebcamCapture(io.ComfyNode):

execution.py

@@ -33,7 +33,7 @@ from comfy_execution.validation import validate_node_input
 from comfy_execution.progress import get_progress_state, reset_progress_state, add_progress_handler, WebUIProgressHandler
 from comfy_execution.utils import CurrentNodeContext
 from comfy_api.internal import _ComfyNodeInternal, _NodeOutputInternal, first_real_override, is_class, make_locked_method_func
-from comfy_api.v3 import io, resources
+from comfy_api.latest import io, resources
 
 
 class ExecutionResult(Enum):

nodes.py

@@ -29,7 +29,7 @@ import comfy.controlnet
 from comfy.comfy_types import IO, ComfyNodeABC, InputTypeDict, FileLocator
 from comfy_api.internal import register_versions, ComfyAPIWithVersion
 from comfy_api.version_list import supported_versions
-from comfy_api.v3 import io
+from comfy_api.latest import io
 
 import comfy.clip_vision