added progressbar

added an option to disable progressbar
added interrupt support to DDIM/PLMS

3 files changed, 11 insertions, 0 deletions

diff --git a/scripts/poor_mans_outpainting.py b/scripts/poor_mans_outpainting.py
index 98e1def0..149d8ac5 100644
--- a/scripts/poor_mans_outpainting.py
+++ b/scripts/poor_mans_outpainting.py
@@ -78,6 +78,8 @@ class Script(scripts.Script):
         batch_count = len(work)

         print(f"Poor man's outpainting will process a total of {len(work)} images tiled as {len(grid.tiles[0][2])}x{len(grid.tiles)}.")

 

+        state.job_count = batch_count

+

         for i in range(batch_count):

             p.init_images = [work[i]]

             p.image_mask = work_mask[i]

@@ -93,6 +95,8 @@ class Script(scripts.Script):
             p.seed = processed.seed + 1

             work_results += processed.images

 

+            state.nextjob()

+

         image_index = 0

         for y, h, row in grid.tiles:

             for tiledata in row:

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index ed31dd36..720d7583 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -20,6 +20,8 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
 

     first_pocessed = None

 

+    state.job_count = len(xs) * len(ys)

+

     for iy, y in enumerate(ys):

         for ix, x in enumerate(xs):

             state.job = f"{ix + iy * len(xs) + 1} out of {len(xs) * len(ys)}"

@@ -29,6 +31,7 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
                 first_pocessed = processed

 

             res.append(processed.images[0])

+            state.nextjob()

 

     grid = images.image_grid(res, rows=len(ys))

     grid = images.draw_grid_annotations(grid, res[0].width, res[0].height, hor_texts, ver_texts)

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 4a00b4a4..87692983 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -67,6 +67,8 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
 

     first_pocessed = None

 

+    state.job_count = len(xs) * len(ys)

+

     for iy, y in enumerate(ys):

         for ix, x in enumerate(xs):

             state.job = f"{ix + iy * len(xs) + 1} out of {len(xs) * len(ys)}"

@@ -77,6 +79,8 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
 

             res.append(processed.images[0])

 

+            state.nextjob()

+

     grid = images.image_grid(res, rows=len(ys))

     grid = images.draw_grid_annotations(grid, res[0].width, res[0].height, hor_texts, ver_texts)