From a88232f59aa6da41c4851a45cc4fbef667ee1585 Mon Sep 17 00:00:00 2001 From: Vito Sansevero Date: Tue, 7 Oct 2025 07:20:47 -0700 Subject: [PATCH] refactor(compact_node): simplify sampler return logic --- kikotools/tools/sampler_combo/compact_node.py | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/kikotools/tools/sampler_combo/compact_node.py b/kikotools/tools/sampler_combo/compact_node.py index 5705e42..6fff6b7 100644 --- a/kikotools/tools/sampler_combo/compact_node.py +++ b/kikotools/tools/sampler_combo/compact_node.py @@ -59,7 +59,7 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode): } } - RETURN_TYPES = ("SAMPLER", SCHEDULERS, "INT", "FLOAT") + RETURN_TYPES = (SAMPLERS, SCHEDULERS, "INT", "FLOAT") RETURN_NAMES = ("sampler", "scheduler", "steps", "cfg") FUNCTION = "get_combo" CATEGORY = "🫶 ComfyAssets/🌀 Samplers" @@ -82,27 +82,13 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode): try: # Use the same validation logic but with compact interface result = get_sampler_combo(sampler, sched, steps, cfg) - # Create the sampler object - try: - import comfy.samplers - - sampler_obj = comfy.samplers.sampler_object(result[0]) - except ImportError: - # Return sampler name for testing - sampler_obj = result[0] - return (sampler_obj, result[1], result[2], result[3]) + # Return the sampler name as string, not object + return result except Exception as e: # Graceful fallback self.handle_error(f"Error in compact combo: {str(e)}") - try: - import comfy.samplers - - sampler_obj = comfy.samplers.sampler_object("euler") - except ImportError: - # Return sampler name for testing - sampler_obj = "euler" - return (sampler_obj, "normal", 20, 7.0) + return ("euler", "normal", 20, 7.0) def __str__(self) -> str: """String representation of the compact node."""