Merge branch 'dev' into patch-1

1 files changed, 6 insertions, 13 deletions

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

-import math

-import os

 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 PIL import Image

-from modules.shared import opts, cmd_opts, state

+from modules.shared import state

 

 

 def process_string_tag(tag):

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

 

@@ -139,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}

@@ -158,7 +151,7 @@ class Script(scripts.Script):
         images = []

         all_prompts = []

         infotexts = []

-        for n, args in enumerate(jobs):

+        for args in jobs:

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

 

             copy_p = copy.copy(p)

@@ -167,7 +160,7 @@ 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