From 5da1ba0e91a81804dc911d34c9a2e6956a23199c Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 10 Oct 2022 21:24:11 +0300
Subject: remove batch size restriction from X/Y plot

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

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 771eb8e4..42e1489c 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -205,7 +205,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):
-- 
cgit v1.2.3


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: Error if prompt missing SR token to prevent mis-gens (#2209)

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

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 42e1489c..10a82dc9 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 = []
-- 
cgit v1.2.3


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: revert sr warning

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

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 10a82dc9..99b3c4f6 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):
-- 
cgit v1.2.3


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: add incorrect start word guard to xy_grid (#2259)

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

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 99b3c4f6..9d4d6187 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 = []
-- 
cgit v1.2.3


From 530103b586109c11fd068eb70ef09503ec6a4caf Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 11 Oct 2022 14:53:02 +0300
Subject: fixes related to merge

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

(limited to 'scripts/xy_grid.py')

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 42e1489c..0af5993c 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
-- 
cgit v1.2.3