Merge branch 'master' of github.com:AUTOMATIC1111/stable-diffusion-webui

1 files changed, 19 insertions, 3 deletions

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 32fe6bdb..e8386ed2 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -9,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

@@ -44,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,

@@ -66,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)

 

@@ -124,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: