Merge remote-tracking branch 'upstream/master' into token_count

1 files changed, 11 insertions, 2 deletions

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 3a2e103f..7c01231f 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -2,6 +2,7 @@ from collections import namedtuple
 from copy import copy

 import random

 

+from PIL import Image

 import numpy as np

 

 import modules.scripts as scripts

@@ -86,7 +87,12 @@ axis_options = [
     AxisOption("Prompt S/R", str, apply_prompt, format_value),

     AxisOption("Sampler", str, apply_sampler, format_value),

     AxisOption("Checkpoint name", str, apply_checkpoint, format_value),

-    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label), #  as it is now all AxisOptionImg2Img items must go after AxisOption ones

+    AxisOption("Sigma Churn", float, apply_field("s_churn"),  format_value_add_label),

+    AxisOption("Sigma min",   float, apply_field("s_tmin"),   format_value_add_label),

+    AxisOption("Sigma max",   float, apply_field("s_tmax"),   format_value_add_label),

+    AxisOption("Sigma noise", float, apply_field("s_noise"),  format_value_add_label),

+    AxisOption("DDIM Eta",    float, apply_field("ddim_eta"), format_value_add_label),

+    AxisOptionImg2Img("Denoising", float, apply_field("denoising_strength"), format_value_add_label),#  as it is now all AxisOptionImg2Img items must go after AxisOption ones

 ]

 

 

@@ -108,7 +114,10 @@ def draw_xy_grid(p, xs, ys, x_labels, y_labels, cell, draw_legend):
             if first_pocessed is None:

                 first_pocessed = processed

 

-            res.append(processed.images[0])

+            try:

+              res.append(processed.images[0])

+            except:

+              res.append(Image.new(res[0].mode, res[0].size))

 

     grid = images.image_grid(res, rows=len(ys))

     if draw_legend: