Merge remote-tracking branch 'origin/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

3 files changed, 34 insertions, 7 deletions

diff --git a/scripts/postprocessing_upscale.py b/scripts/postprocessing_upscale.py
index edb70ac0..eb42a29e 100644
--- a/scripts/postprocessing_upscale.py
+++ b/scripts/postprocessing_upscale.py
@@ -29,7 +29,7 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing):
                                 upscaling_resize_w = gr.Slider(minimum=64, maximum=2048, step=8, label="Width", value=512, elem_id="extras_upscaling_resize_w")

                                 upscaling_resize_h = gr.Slider(minimum=64, maximum=2048, step=8, label="Height", value=512, elem_id="extras_upscaling_resize_h")

                             with gr.Column(elem_id="upscaling_dimensions_row", scale=1, elem_classes="dimensions-tools"):

-                                upscaling_res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="upscaling_res_switch_btn")

+                                upscaling_res_switch_btn = ToolButton(value=switch_values_symbol, elem_id="upscaling_res_switch_btn", tooltip="Switch width/height")

                                 upscaling_crop = gr.Checkbox(label='Crop to fit', value=True, elem_id="extras_upscaling_crop")

 

             with FormRow():

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 50320d55..a4a2f24d 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -5,11 +5,17 @@ import shlex
 import modules.scripts as scripts

 import gradio as gr

 

-from modules import sd_samplers, errors

+from modules import sd_samplers, errors, sd_models

 from modules.processing import Processed, process_images

 from modules.shared import state

 

 

+def process_model_tag(tag):

+    info = sd_models.get_closet_checkpoint_match(tag)

+    assert info is not None, f'Unknown checkpoint: {tag}'

+    return info.name

+

+

 def process_string_tag(tag):

     return tag

 

@@ -27,7 +33,7 @@ def process_boolean_tag(tag):
 

 

 prompt_tags = {

-    "sd_model": None,

+    "sd_model": process_model_tag,

     "outpath_samples": process_string_tag,

     "outpath_grids": process_string_tag,

     "prompt_for_display": process_string_tag,

@@ -108,6 +114,7 @@ class Script(scripts.Script):
     def ui(self, is_img2img):

         checkbox_iterate = gr.Checkbox(label="Iterate seed every line", value=False, elem_id=self.elem_id("checkbox_iterate"))

         checkbox_iterate_batch = gr.Checkbox(label="Use same random seed for all lines", value=False, elem_id=self.elem_id("checkbox_iterate_batch"))

+        prompt_position = gr.Radio(["start", "end"], label="Insert prompts at the", elem_id=self.elem_id("prompt_position"), value="start")

 

         prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1, elem_id=self.elem_id("prompt_txt"))

         file = gr.File(label="Upload prompt inputs", type='binary', elem_id=self.elem_id("file"))

@@ -118,9 +125,9 @@ class Script(scripts.Script):
         # We don't shrink back to 1, because that causes the control to ignore [enter], and it may

         # be unclear to the user that shift-enter is needed.

         prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt], show_progress=False)

-        return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]

+        return [checkbox_iterate, checkbox_iterate_batch, prompt_position, prompt_txt]

 

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

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

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

 

         p.do_not_save_grid = True

@@ -156,7 +163,22 @@ class Script(scripts.Script):
 

             copy_p = copy.copy(p)

             for k, v in args.items():

-                setattr(copy_p, k, v)

+                if k == "sd_model":

+                    copy_p.override_settings['sd_model_checkpoint'] = v

+                else:

+                    setattr(copy_p, k, v)

+

+            if args.get("prompt") and p.prompt:

+                if prompt_position == "start":

+                    copy_p.prompt = args.get("prompt") + " " + p.prompt

+                else:

+                    copy_p.prompt = p.prompt + " " + args.get("prompt")

+

+            if args.get("negative_prompt") and p.negative_prompt:

+                if prompt_position == "start":

+                    copy_p.negative_prompt = args.get("negative_prompt") + " " + p.negative_prompt

+                else:

+                    copy_p.negative_prompt = p.negative_prompt + " " + args.get("negative_prompt")

 

             proc = process_images(copy_p)

             images += proc.images

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 939d8605..0dc255bc 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -205,13 +205,14 @@ def csv_string_to_list_strip(data_str):
 

 

 class AxisOption:

-    def __init__(self, label, type, apply, format_value=format_value_add_label, confirm=None, cost=0.0, choices=None):

+    def __init__(self, label, type, apply, format_value=format_value_add_label, confirm=None, cost=0.0, choices=None, prepare=None):

         self.label = label

         self.type = type

         self.apply = apply

         self.format_value = format_value

         self.confirm = confirm

         self.cost = cost

+        self.prepare = prepare

         self.choices = choices

 

 

@@ -536,6 +537,8 @@ class Script(scripts.Script):
 

             if opt.choices is not None and not csv_mode:

                 valslist = vals_dropdown

+            elif opt.prepare is not None:

+                valslist = opt.prepare(vals)

             else:

                 valslist = csv_string_to_list_strip(vals)

 

@@ -773,6 +776,8 @@ class Script(scripts.Script):
                 # TODO: See previous comment about intentional data misalignment.

                 adj_g = g-1 if g > 0 else g

                 images.save_image(processed.images[g], p.outpath_grids, "xyz_grid", info=processed.infotexts[g], extension=opts.grid_format, prompt=processed.all_prompts[adj_g], seed=processed.all_seeds[adj_g], grid=True, p=processed)

+                if not include_sub_grids:  # if not include_sub_grids then skip saving after the first grid

+                    break

 

         if not include_sub_grids:

             # Done with sub-grids, drop all related information: