diff --git a/Nodes/Dashboard.py b/Nodes/Dashboard.py index 3103cf9..39a116b 100644 --- a/Nodes/Dashboard.py +++ b/Nodes/Dashboard.py @@ -694,6 +694,8 @@ class PrimereAutoSamplerSettings: "override_steps": ("BOOLEAN", {"default": False, "label_off": "Set by sampler settings", "label_on": "Set by model filename"}), "cfg": ("FLOAT", {"default": 7, "min": 0.1, "max": 100, "step": 0.01}), "rescale_cfg": ("FLOAT", {"default": 1, "min": 0.0, "max": 1.0, "step": 0.01}), + "align_your_steps": ("BOOLEAN", {"default": False, "label_on": "Use AlignYourSteps", "label_off": "Ignore AlignYourSteps"}), + "model_sampling": ("FLOAT", {"default": 2.5, "min": 0.0, "max": 10.0, "step": 0.01}), "last_layer": ("INT", {"default": 0, "min": -24, "max": 0, "step": 1}), "sigma_max": ("FLOAT", {"default": 120, "min": 1, "max": 200, "step": 0.001}), "sigma_min": ("FLOAT", {"default": 1, "min": 0.001, "max": 100, "step": 0.001}), diff --git a/Nodes/Outputs.py b/Nodes/Outputs.py index 42a352f..08b9d97 100644 --- a/Nodes/Outputs.py +++ b/Nodes/Outputs.py @@ -471,9 +471,9 @@ class PrimereKSampler: "variation_extender": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.01}), "variation_batch_step": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 0.5, "step": 0.01}), "variation_level": ("BOOLEAN", {"default": False, "label_on": "Maximize", "label_off": "Off"}), - "model_sampling": ("FLOAT", {"default": 2.5, "min": 0.0, "max": 10.0, "step": 0.01}), + # "model_sampling": ("FLOAT", {"default": 2.5, "min": 0.0, "max": 10.0, "step": 0.01}), "device": (["DEFAULT", "GPU", "CPU"], {"default": 'DEFAULT'}), - "align_your_steps": ("BOOLEAN", {"default": False, "label_on": "Use AlignYourSteps", "label_off": "Ignore AlignYourSteps"}), + # "align_your_steps": ("BOOLEAN", {"default": False, "label_on": "Use AlignYourSteps", "label_off": "Ignore AlignYourSteps"}), }, "optional": { "model_concept": ("STRING", {"default": "Auto", "forceInput": True}), @@ -492,6 +492,9 @@ class PrimereKSampler: def pk_sampler(self, model, seed, steps, cfg, sampler_name, scheduler_name, positive, negative, latent_image, extra_pnginfo, prompt, model_concept = "Auto", workflow_tuple = None, denoise=1.0, variation_extender = 0, variation_batch_step = 0, variation_level = False, model_sampling = 2.5, device = 'DEFAULT', align_your_steps = False): timestamp_start = time.time() + if workflow_tuple is not None: + align_your_steps = workflow_tuple.get('align_your_steps', align_your_steps) + model_sampling = workflow_tuple.get('model_sampling', model_sampling) if workflow_tuple is not None and len(workflow_tuple) > 0 and 'exif_status' in workflow_tuple and workflow_tuple['exif_status'] == 'SUCCEED': if 'sampler_settings' in workflow_tuple and len(workflow_tuple['sampler_settings']) > 0 and 'setup_states' in workflow_tuple and 'sampler_setup' in workflow_tuple['setup_states']: if workflow_tuple['setup_states']['sampler_setup'] == True: