aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authoryfszzx <yfszzx@gmail.com>2022-10-11 12:23:41 +0000
committeryfszzx <yfszzx@gmail.com>2022-10-11 12:23:41 +0000
commit594ab4ba53a80a0a3606565404e6d1fbb60f6629 (patch)
tree2821eef661e6568b65d8d29c268b657a17dcd423 /scripts
parent7b1db45e1fda8603d4617affd976066be5e5b821 (diff)
parentdce7fc902ae2c6d9ffa71db67471abdcda72f82c (diff)
downloadstable-diffusion-webui-gfx803-594ab4ba53a80a0a3606565404e6d1fbb60f6629.tar.gz
stable-diffusion-webui-gfx803-594ab4ba53a80a0a3606565404e6d1fbb60f6629.tar.bz2
stable-diffusion-webui-gfx803-594ab4ba53a80a0a3606565404e6d1fbb60f6629.zip
images history improvement
Diffstat (limited to 'scripts')
-rw-r--r--scripts/loopback.py4
-rw-r--r--scripts/xy_grid.py11
2 files changed, 13 insertions, 2 deletions
diff --git a/scripts/loopback.py b/scripts/loopback.py
index e90b58d4..d8c68af8 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -38,6 +38,7 @@ class Script(scripts.Script):
grids = []
all_images = []
+ original_init_image = p.init_images
state.job_count = loops * batch_count
initial_color_corrections = [processing.setup_color_correction(p.init_images[0])]
@@ -45,6 +46,9 @@ class Script(scripts.Script):
for n in range(batch_count):
history = []
+ # Reset to original init image at the start of each batch
+ p.init_images = original_init_image
+
for i in range(loops):
p.n_iter = 1
p.batch_size = 1
diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 771eb8e4..16918c99 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -10,7 +10,8 @@ import numpy as np
import modules.scripts as scripts
import gradio as gr
-from modules import images, hypernetwork
+from modules import images
+from modules.hypernetwork import hypernetwork
from modules.processing import process_images, Processed, get_correct_sampler
from modules.shared import opts, cmd_opts, state
import modules.shared as shared
@@ -27,6 +28,9 @@ def apply_field(field):
def apply_prompt(p, x, xs):
+ if xs[0] not in p.prompt and xs[0] not in p.negative_prompt:
+ raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt.")
+
p.prompt = p.prompt.replace(xs[0], x)
p.negative_prompt = p.negative_prompt.replace(xs[0], x)
@@ -205,7 +209,10 @@ class Script(scripts.Script):
if not no_fixed_seeds:
modules.processing.fix_seed(p)
- p.batch_size = 1
+ if not opts.return_grid:
+ p.batch_size = 1
+
+
CLIP_stop_at_last_layers = opts.CLIP_stop_at_last_layers
def process_axis(opt, vals):