Merge branch 'master' into tensorboard

1 files changed, 57 insertions, 26 deletions

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 1266be6f..2751f98a 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -1,6 +1,7 @@
 import copy

 import math

 import os

+import random

 import sys

 import traceback

 import shlex

@@ -8,6 +9,7 @@ import shlex
 import modules.scripts as scripts

 import gradio as gr

 

+from modules import sd_samplers

 from modules.processing import Processed, process_images

 from PIL import Image

 from modules.shared import opts, cmd_opts, state

@@ -43,6 +45,7 @@ prompt_tags = {
     "seed_resize_from_h": process_int_tag,

     "seed_resize_from_w": process_int_tag,

     "sampler_index": process_int_tag,

+    "sampler_name": process_string_tag,

     "batch_size": process_int_tag,

     "n_iter": process_int_tag,

     "steps": process_int_tag,

@@ -65,14 +68,28 @@ def cmdargs(line):
         arg = args[pos]

 

         assert arg.startswith("--"), f'must start with "--": {arg}'

+        assert pos+1 < len(args), f'missing argument for command line option {arg}'

+

         tag = arg[2:]

 

+        if tag == "prompt" or tag == "negative_prompt":

+            pos += 1

+            prompt = args[pos]

+            pos += 1

+            while pos < len(args) and not args[pos].startswith("--"):

+                prompt += " "

+                prompt += args[pos]

+                pos += 1

+            res[tag] = prompt

+            continue

+

+

         func = prompt_tags.get(tag, None)

         assert func, f'unknown commandline option: {arg}'

 

-        assert pos+1 < len(args), f'missing argument for command line option {arg}'

-

         val = args[pos+1]

+        if tag == "sampler_name":

+            val = sd_samplers.samplers_map.get(val.lower(), None)

 

         res[tag] = func(val)

 

@@ -81,32 +98,36 @@ def cmdargs(line):
     return res

 

 

+def load_prompt_file(file):

+    if file is None:

+        lines = []

+    else:

+        lines = [x.strip() for x in file.decode('utf8', errors='ignore').split("\n")]

+

+    return None, "\n".join(lines), gr.update(lines=7)

+

+

 class Script(scripts.Script):

     def title(self):

         return "Prompts from file or textbox"

 

-    def ui(self, is_img2img):

-        # This checkbox would look nicer as two tabs, but there are two problems:

-        # 1) There is a bug in Gradio 3.3 that prevents visibility from working on Tabs

-        # 2) Even with Gradio 3.3.1, returning a control (like Tabs) that can't be used as input

-        #    causes a AttributeError: 'Tabs' object has no attribute 'preprocess' assert,

-        #    due to the way Script assumes all controls returned can be used as inputs.

-        # Therefore, there's no good way to use grouping components right now,

-        # so we will use a checkbox! :)

-        checkbox_txt = gr.Checkbox(label="Show Textbox", value=False)

-        file = gr.File(label="File with inputs", type='bytes')

-        prompt_txt = gr.TextArea(label="Prompts")

-        checkbox_txt.change(fn=lambda x: [gr.File.update(visible = not x), gr.TextArea.update(visible = x)], inputs=[checkbox_txt], outputs=[file, prompt_txt])

-        return [checkbox_txt, file, prompt_txt]

-

-    def on_show(self, checkbox_txt, file, prompt_txt):

-        return [ gr.Checkbox.update(visible = True), gr.File.update(visible = not checkbox_txt), gr.TextArea.update(visible = checkbox_txt) ]

-

-    def run(self, p, checkbox_txt, data: bytes, prompt_txt: str):

-        if checkbox_txt:

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

-        else:

-            lines = [x.strip() for x in data.decode('utf8', errors='ignore').split("\n")]

+    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_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='bytes', elem_id=self.elem_id("file"))

+

+        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt])

+

+        # We start at one line. When the text changes, we jump to seven lines, or two lines if no \n.

+        # 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])

+        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]

 

         p.do_not_save_grid = True

@@ -119,7 +140,7 @@ class Script(scripts.Script):
                 try:

                     args = cmdargs(line)

                 except Exception:

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

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

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

                     args = {"prompt": line}

             else:

@@ -134,9 +155,14 @@ class Script(scripts.Script):
             jobs.append(args)

 

         print(f"Will process {len(lines)} lines in {job_count} jobs.")

+        if (checkbox_iterate or checkbox_iterate_batch) and p.seed == -1:

+            p.seed = int(random.randrange(4294967294))

+

         state.job_count = job_count

 

         images = []

+        all_prompts = []

+        infotexts = []

         for n, args in enumerate(jobs):

             state.job = f"{state.job_no + 1} out of {state.job_count}"

 

@@ -146,5 +172,10 @@ class Script(scripts.Script):
 

             proc = process_images(copy_p)

             images += proc.images

+            

+            if checkbox_iterate:

+                p.seed = p.seed + (p.batch_size * p.n_iter)

+            all_prompts += proc.all_prompts

+            infotexts += proc.infotexts

 

-        return Processed(p, images, p.seed, "")

+        return Processed(p, images, p.seed, "", all_prompts=all_prompts, infotexts=infotexts)