From 3e068de0dcec811d515402fc184f70709a785e4f Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:48:49 +0900
Subject: reorder training preprocessing modules in extras tab

using the order from before the rework
11d23e8ca55c097ecfa255a05b63f194e25f08be
---
 scripts/postprocessing_caption.py               | 2 +-
 scripts/postprocessing_create_flipped_copies.py | 2 +-
 scripts/postprocessing_focal_crop.py            | 2 +-
 scripts/processing_autosized_crop.py            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/postprocessing_caption.py b/scripts/postprocessing_caption.py
index 9482a03c..5592a898 100644
--- a/scripts/postprocessing_caption.py
+++ b/scripts/postprocessing_caption.py
@@ -4,7 +4,7 @@ import gradio as gr
 
 class ScriptPostprocessingCeption(scripts_postprocessing.ScriptPostprocessing):
     name = "Caption"
-    order = 4000
+    order = 4040
 
     def ui(self):
         with ui_components.InputAccordion(False, label="Caption") as enable:
diff --git a/scripts/postprocessing_create_flipped_copies.py b/scripts/postprocessing_create_flipped_copies.py
index 3425571d..b673003b 100644
--- a/scripts/postprocessing_create_flipped_copies.py
+++ b/scripts/postprocessing_create_flipped_copies.py
@@ -6,7 +6,7 @@ import gradio as gr
 
 class ScriptPostprocessingCreateFlippedCopies(scripts_postprocessing.ScriptPostprocessing):
     name = "Create flipped copies"
-    order = 4000
+    order = 4030
 
     def ui(self):
         with ui_components.InputAccordion(False, label="Create flipped copies") as enable:
diff --git a/scripts/postprocessing_focal_crop.py b/scripts/postprocessing_focal_crop.py
index d3baf298..cff1dbc5 100644
--- a/scripts/postprocessing_focal_crop.py
+++ b/scripts/postprocessing_focal_crop.py
@@ -7,7 +7,7 @@ from modules.textual_inversion import autocrop
 
 class ScriptPostprocessingFocalCrop(scripts_postprocessing.ScriptPostprocessing):
     name = "Auto focal point crop"
-    order = 4000
+    order = 4010
 
     def ui(self):
         with ui_components.InputAccordion(False, label="Auto focal point crop") as enable:
diff --git a/scripts/processing_autosized_crop.py b/scripts/processing_autosized_crop.py
index c0980226..7e674989 100644
--- a/scripts/processing_autosized_crop.py
+++ b/scripts/processing_autosized_crop.py
@@ -28,7 +28,7 @@ def multicrop_pic(image: Image, mindim, maxdim, minarea, maxarea, objective, thr
 
 class ScriptPostprocessingAutosizedCrop(scripts_postprocessing.ScriptPostprocessing):
     name = "Auto-sized crop"
-    order = 4000
+    order = 4020
 
     def ui(self):
         with ui_components.InputAccordion(False, label="Auto-sized crop") as enable:
-- 
cgit v1.2.1


From de1809bd14450cfc41623b6021c7087fb385ab6f Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:08:35 +0900
Subject: handle axis_type is None

---
 scripts/xyz_grid.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index b2250c04..e5083874 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -476,6 +476,8 @@ class Script(scripts.Script):
         fill_z_button.click(fn=fill, inputs=[z_type, csv_mode], outputs=[z_values, z_values_dropdown])
 
         def select_axis(axis_type, axis_values, axis_values_dropdown, csv_mode):
+            axis_type = axis_type or 0  # if axle type is None set to 0
+
             choices = self.current_axis_options[axis_type].choices
             has_choices = choices is not None
 
@@ -526,6 +528,8 @@ class Script(scripts.Script):
         return [x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size, csv_mode]
 
     def run(self, p, x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size, csv_mode):
+        x_type, y_type, z_type = x_type or 0, y_type or 0, z_type or 0  # if axle type is None set to 0
+
         if not no_fixed_seeds:
             modules.processing.fix_seed(p)
 
-- 
cgit v1.2.1