Merge branch 'dev' into meta_class

3 files changed, 29 insertions, 17 deletions

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 665dbe89..c98ab480 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -145,7 +145,6 @@ class Script(scripts.Script):
         process_width = p.width

         process_height = p.height

 

-        p.mask_blur = mask_blur*4

         p.inpaint_full_res = False

         p.inpainting_fill = 1

         p.do_not_save_samples = True

@@ -156,6 +155,19 @@ class Script(scripts.Script):
         up = pixels if "up" in direction else 0

         down = pixels if "down" in direction else 0

 

+        if left > 0 or right > 0:

+            mask_blur_x = mask_blur

+        else:

+            mask_blur_x = 0

+

+        if up > 0 or down > 0:

+            mask_blur_y = mask_blur

+        else:

+            mask_blur_y = 0

+

+        p.mask_blur_x = mask_blur_x*4

+        p.mask_blur_y = mask_blur_y*4

+

         init_img = p.init_images[0]

         target_w = math.ceil((init_img.width + left + right) / 64) * 64

         target_h = math.ceil((init_img.height + up + down) / 64) * 64

@@ -191,10 +203,10 @@ class Script(scripts.Script):
                 mask = Image.new("RGB", (process_res_w, process_res_h), "white")

                 draw = ImageDraw.Draw(mask)

                 draw.rectangle((

-                    expand_pixels + mask_blur if is_left else 0,

-                    expand_pixels + mask_blur if is_top else 0,

-                    mask.width - expand_pixels - mask_blur if is_right else res_w,

-                    mask.height - expand_pixels - mask_blur if is_bottom else res_h,

+                    expand_pixels + mask_blur_x if is_left else 0,

+                    expand_pixels + mask_blur_y if is_top else 0,

+                    mask.width - expand_pixels - mask_blur_x if is_right else res_w,

+                    mask.height - expand_pixels - mask_blur_y if is_bottom else res_h,

                 ), fill="black")

 

                 np_image = (np.asarray(img) / 255.0).astype(np.float64)

@@ -224,10 +236,10 @@ class Script(scripts.Script):
             latent_mask = Image.new("RGB", (p.width, p.height), "white")

             draw = ImageDraw.Draw(latent_mask)

             draw.rectangle((

-                expand_pixels + mask_blur * 2 if is_left else 0,

-                expand_pixels + mask_blur * 2 if is_top else 0,

-                mask.width - expand_pixels - mask_blur * 2 if is_right else res_w,

-                mask.height - expand_pixels - mask_blur * 2 if is_bottom else res_h,

+                expand_pixels + mask_blur_x * 2 if is_left else 0,

+                expand_pixels + mask_blur_y * 2 if is_top else 0,

+                mask.width - expand_pixels - mask_blur_x * 2 if is_right else res_w,

+                mask.height - expand_pixels - mask_blur_y * 2 if is_bottom else res_h,

             ), fill="black")

             p.latent_mask = latent_mask

 

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index b918a764..50320d55 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -1,13 +1,11 @@
 import copy

 import random

-import sys

-import traceback

 import shlex

 

 import modules.scripts as scripts

 import gradio as gr

 

-from modules import sd_samplers

+from modules import sd_samplers, errors

 from modules.processing import Processed, process_images

 from modules.shared import state

 

@@ -123,8 +121,7 @@ class Script(scripts.Script):
         return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]

 

     def run(self, p, checkbox_iterate, checkbox_iterate_batch, prompt_txt: str):

-        lines = [x.strip() for x in prompt_txt.splitlines()]

-        lines = [x for x in lines if len(x) > 0]

+        lines = [x for x in (x.strip() for x in prompt_txt.splitlines()) if x]

 

         p.do_not_save_grid = True

 

@@ -136,8 +133,7 @@ class Script(scripts.Script):
                 try:

                     args = cmdargs(line)

                 except Exception:

-                    print(f"Error parsing line {line} as commandline:", file=sys.stderr)

-                    print(traceback.format_exc(), file=sys.stderr)

+                    errors.report(f"Error parsing line {line} as commandline", exc_info=True)

                     args = {"prompt": line}

             else:

                 args = {"prompt": line}

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index da820b39..7821cc65 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -10,7 +10,7 @@ import numpy as np
 import modules.scripts as scripts

 import gradio as gr

 

-from modules import images, sd_samplers, processing, sd_models, sd_vae

+from modules import images, sd_samplers, processing, sd_models, sd_vae, sd_samplers_kdiffusion

 from modules.processing import process_images, Processed, StableDiffusionProcessingTxt2Img

 from modules.shared import opts, state

 import modules.shared as shared

@@ -220,6 +220,10 @@ axis_options = [
     AxisOption("Sigma min", float, apply_field("s_tmin")),

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

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

+    AxisOption("Schedule type", str, apply_override("k_sched_type"), choices=lambda: list(sd_samplers_kdiffusion.k_diffusion_scheduler)),

+    AxisOption("Schedule min sigma", float, apply_override("sigma_min")),

+    AxisOption("Schedule max sigma", float, apply_override("sigma_max")),

+    AxisOption("Schedule rho", float, apply_override("rho")),

     AxisOption("Eta", float, apply_field("eta")),

     AxisOption("Clip skip", int, apply_clip_skip),

     AxisOption("Denoising", float, apply_field("denoising_strength")),