diff --git a/js/ttNxyPlotAdv.js b/js/ttNxyPlotAdv.js index a3c50d4..ed3e61d 100644 --- a/js/ttNxyPlotAdv.js +++ b/js/ttNxyPlotAdv.js @@ -83,7 +83,7 @@ function _recursiveGetInputIDs(node) { while (IDsToCheck.length > 0) { const currentID = IDsToCheck.pop(); const currentNode = node.graph._nodes_by_id[currentID]; - if (currentNode.getTitle() === 'advanced xyPlot') { + if (currentNode.type === "ttN advanced xyPlot") { continue } _addInputIDs(currentNode, inputIDs, IDsToCheck); @@ -118,7 +118,7 @@ function getNodesWidgetsDict(xyNode, plotLines=false) { for (const iID of inputIDS) { const iNode = app.graph._nodes_by_id[iID]; const iNodeTitle = iNode.getTitle() - if (iNodeTitle === 'advanced xyPlot') { + if (iNode.type === 'ttN advanced xyPlot') { continue } const options = getWidgetsOptions(iNode) diff --git a/ttNpy/tinyterraNodes.py b/ttNpy/tinyterraNodes.py index 20fa233..56586bf 100644 --- a/ttNpy/tinyterraNodes.py +++ b/ttNpy/tinyterraNodes.py @@ -46,7 +46,6 @@ from comfy.sd import CLIP, VAE from spandrel import ModelLoader, ImageModelDescriptor from .adv_encode import advanced_encode from comfy.model_patcher import ModelPatcher -from comfy_extras.nodes_align_your_steps import AlignYourStepsScheduler from nodes import MAX_RESOLUTION, ControlNetApplyAdvanced from nodes import NODE_CLASS_MAPPINGS as COMFY_CLASS_MAPPINGS @@ -59,7 +58,7 @@ UPSCALE_METHODS = ["None", "[hiresFix] nearest-exact", "[hiresFix] bilinear", "[hiresFix] area", "[hiresFix] bicubic", "[hiresFix] lanczos", "[hiresFix] bislerp"] UPSCALE_MODELS = folder_paths.get_filename_list("upscale_models") + ["None"] CROP_METHODS = ["disabled", "center"] -CUSTOM_SCHEDULERS = ["AYS SD1", "AYS SDXL", "AYS SVD"] +CUSTOM_SCHEDULERS = ["AYS SD1", "AYS SDXL", "AYS SVD", "GITS"] class ttNloader: def __init__(self): @@ -416,8 +415,16 @@ class ttNsampler: force_full_denoise=force_full_denoise, noise_mask=noise_mask, callback=callback, disable_pbar=disable_pbar, seed=seed) else: sampler = comfy.samplers.sampler_object(sampler_name) - model_type = scheduler.split(' ')[1] - sigmas = AlignYourStepsScheduler().get_sigmas(model_type, steps, denoise)[0] + + if scheduler.startswith("AYS"): + from comfy_extras.nodes_align_your_steps import AlignYourStepsScheduler + + model_type = scheduler.split(' ')[1] + sigmas = AlignYourStepsScheduler().get_sigmas(model_type, steps, denoise)[0] + elif scheduler.startswith("GITS"): + from comfy_extras.nodes_gits import GITSScheduler + + sigmas = GITSScheduler().get_sigmas(1.2, steps, denoise)[0] samples = comfy.sample.sample_custom(model, noise, cfg, sampler, sigmas, positive, negative, latent_image, noise_mask=noise_mask, callback=callback, disable_pbar=disable_pbar, seed=seed)