From 4ff6067dad0f971eb4c1dac0c0f85bf6bbb698cf Mon Sep 17 00:00:00 2001 From: Vito Sansevero Date: Wed, 23 Jul 2025 13:29:46 -0700 Subject: [PATCH] refactor(compact_node): update sampler return type --- kikotools/tools/sampler_combo/compact_node.py | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/kikotools/tools/sampler_combo/compact_node.py b/kikotools/tools/sampler_combo/compact_node.py index 24c9690..642b4f0 100644 --- a/kikotools/tools/sampler_combo/compact_node.py +++ b/kikotools/tools/sampler_combo/compact_node.py @@ -60,14 +60,14 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode): } } - RETURN_TYPES = (SAMPLERS, SCHEDULERS, "INT", "FLOAT") + RETURN_TYPES = ("SAMPLER", SCHEDULERS, "INT", "FLOAT") RETURN_NAMES = ("sampler", "scheduler", "steps", "cfg") FUNCTION = "get_combo" CATEGORY = "ComfyAssets" def get_combo( self, sampler: str, sched: str, steps: int, cfg: float - ) -> Tuple[str, str, int, float]: + ) -> Tuple[object, str, int, float]: """ Get compact sampler combo configuration. @@ -78,17 +78,32 @@ class SamplerComboCompactNode(ComfyAssetsBaseNode): cfg: CFG scale value Returns: - Tuple of (sampler, scheduler, steps, cfg) + Tuple of (sampler_object, scheduler, steps, cfg) """ try: # Use the same validation logic but with compact interface result = get_sampler_combo(sampler, sched, steps, cfg) - return result + # 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]) except Exception as e: # Graceful fallback self.handle_error(f"Error in compact combo: {str(e)}") - return ("euler", "normal", 20, 7.0) + 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) def __str__(self) -> str: """String representation of the compact node."""