From 255be75d30f41e089e499ec1c8462d6bf64dec24 Mon Sep 17 00:00:00 2001
From: aperullo <18688190+aperullo@users.noreply.github.com>
Date: Tue, 11 Oct 2022 06:16:57 -0400
Subject: [PATCH 1/4] Error if prompt missing SR token to prevent mis-gens
 (#2209)

---
 scripts/xy_grid.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 42e1489c4..10a82dc9f 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -27,9 +27,16 @@ def apply_field(field):
 
 
 def apply_prompt(p, x, xs):
+
+    orig_prompt = p.prompt
+    orig_negative_prompt = p.negative_prompt
+
     p.prompt = p.prompt.replace(xs[0], x)
     p.negative_prompt = p.negative_prompt.replace(xs[0], x)
 
+    if p.prompt == orig_prompt and p.negative_prompt == orig_negative_prompt:
+        raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt. Did you forget to add the token?")
+
 
 def apply_order(p, x, xs):
     token_order = []

From 4b460fcb1a0224772949556fe0469da93245c532 Mon Sep 17 00:00:00 2001
From: Rory Grieve <rhrg500@gmail.com>
Date: Tue, 11 Oct 2022 11:23:47 +0100
Subject: [PATCH 2/4] Reset init img in loopback at start of each batch (#2214)

Before a new batch would use the last image from the previous batch. Now
each batch will use the original image for the init image at the start of the
batch.
---
 scripts/loopback.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/loopback.py b/scripts/loopback.py
index e90b58d46..d8c68af89 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

From a8490e4019c359ff24824e004059744d7164361b Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:42:41 +0100
Subject: [PATCH 3/4] revert sr warning

---
 scripts/xy_grid.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 10a82dc9f..99b3c4f64 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -35,7 +35,8 @@ def apply_prompt(p, x, xs):
     p.negative_prompt = p.negative_prompt.replace(xs[0], x)
 
     if p.prompt == orig_prompt and p.negative_prompt == orig_negative_prompt:
-        raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt. Did you forget to add the token?")
+        pass
+        #raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt. Did you forget to add the token?")
 
 
 def apply_order(p, x, xs):

From 1a0a6a84c3149e236211d547471f5416cd1129f3 Mon Sep 17 00:00:00 2001
From: DepFA <35278260+dfaker@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:59:56 +0100
Subject: [PATCH 4/4] add incorrect start word guard to xy_grid (#2259)

---
 scripts/xy_grid.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 99b3c4f64..9d4d6187e 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -27,17 +27,12 @@ def apply_field(field):
 
 
 def apply_prompt(p, x, xs):
-
-    orig_prompt = p.prompt
-    orig_negative_prompt = p.negative_prompt
+    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)
 
-    if p.prompt == orig_prompt and p.negative_prompt == orig_negative_prompt:
-        pass
-        #raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt. Did you forget to add the token?")
-
 
 def apply_order(p, x, xs):
     token_order = []