Merge branch 'dev' into release_candidate

1 files changed, 3 insertions, 6 deletions

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index f168389c..b918a764 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -1,6 +1,4 @@
 import copy

-import math

-import os

 import random

 import sys

 import traceback

@@ -11,8 +9,7 @@ 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

+from modules.shared import state

 

 

 def process_string_tag(tag):

@@ -158,7 +155,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 +164,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