From 88bcbb8ae7b61b00a728fc5d044e4507999cdf2b Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Tue, 21 May 2024 16:51:28 -0700
Subject: [PATCH 1/4] Filtered Prompts and Better A1111 State Intigration
 Update

Commit includes a feature to filter prompts from the `prompt_array` and better integration with A1111 shared state.

Filtered Prompts:
-New UI textbox that will allow users to specifically designate keywords that should not be tested.
-Textbox will use the separator for string interpretation.
-Designed to work with the shared state `job_count` system.

Improved Shared State Integration:
-Script will communicate with the state job system, allowing loading bars to operate correctly and log steps to be calculated for overall jobs.
-Script will now obey the skip command, allowing users to skip a `job_no` (every image rendered is a `job_no`, while the overall jobs is `job_count`)
-Script will now obey the `interrupted` and `stopping_generation` commands. Allowing users to prematurely terminate the job loop.
---
 scripts/test_my_prompt_custom_script.py | 43 ++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/scripts/test_my_prompt_custom_script.py b/scripts/test_my_prompt_custom_script.py
index a0f20ed..115d3de 100644
--- a/scripts/test_my_prompt_custom_script.py
+++ b/scripts/test_my_prompt_custom_script.py
@@ -23,12 +23,13 @@ class Script(scripts.Script):
     def ui(self, is_img2img):
         neg_pos = gr.Dropdown(label="Test negative or positive", choices=["Positive","Negative"], value="Positive")
         skip_x_first = gr.Slider(minimum=0, maximum=128, step=1, label='Skip X first words', value=0)
+        excluded_keywords = gr.Textbox(label="Excluded Keywords", lines=1, value="", placeholder="Exact keywords is advised.")
         separator = gr.Textbox(label="Separator used", lines=1, value=", ")
         grid_option = gr.Radio(choices=list(self.grid_options_mapping.keys()), label='Grid generation', value=self.default_grid_opt)
         font_size = gr.Slider(minimum=12, maximum=64, step=1, label='Font size', value=32)
-        return [neg_pos,skip_x_first,separator,grid_option,font_size]
+        return [neg_pos,skip_x_first,separator,grid_option,font_size,excluded_keywords]
 
-    def run(self, p,neg_pos,skip_x_first,separator,grid_option,font_size):
+    def run(self, p,neg_pos,skip_x_first,separator,grid_option,font_size,excluded_keywords):
         def write_on_image(img, msg):
             ix,iy = img.size
             draw = ImageDraw.Draw(img)
@@ -57,12 +58,36 @@ class Script(scripts.Script):
             initial_prompt =  p.negative_prompt
             prompt_array = p.negative_prompt
 
-        prompt_array = prompt_array.split(separator)
-        print("total images :", len(prompt_array))
+        prompt_array = [word for word in prompt_array.split(separator) if word.strip()]  # Remove empty prompts
+        excluded_keywords_list = [word.strip() for word in excluded_keywords.split(separator) if word.strip()] if excluded_keywords else []
+
+        # Job tracking setup
+        filtered_prompt_array = [word for word in prompt_array if word.strip() not in excluded_keywords_list]
+        total_jobs = len(filtered_prompt_array) + 1 - skip_x_first 
+        state.job_count = total_jobs
+        print("total images :", total_jobs)
+
         for g in range(len(prompt_array)+1):
             f = g-1
             if f >= 0 and f < skip_x_first:
                 continue
+                
+            # Check for stopping_generation
+            if state.stopping_generation: # Unsure if this works, 
+                print("Stopping generation as requested.")
+                break
+
+            # Check for skipped job
+            if state.skipped:
+                print("Job skipped.")
+                state.skipped = False
+                continue
+                
+            # Check for excluded keywords
+            if f >= 0 and prompt_array[f].strip() in excluded_keywords_list:
+                print(f"Skipping job due to excluded keyword: {prompt_array[f].strip()}")
+                continue
+                
             if f >= 0:
                 new_prompt =  separator.join([prompt_array[x] for x in range(len(prompt_array)) if x is not f])
             else:
@@ -86,6 +111,16 @@ class Script(scripts.Script):
 
             if opts.samples_save:
                 images.save_image(proc.images[0], p.outpath_samples, "", proc.seed, proc.prompt, opts.samples_format, info= proc.info, p=p)
+                
+            # Update job number
+            state.job_no = g - skip_x_first + 1
+            print(f"Job {state.job_no}/{state.job_count} completed.")
+            state.job = f"{state.job_no + 1} out of {state.job_count}"
+            
+            # Check for interruption
+            if state.interrupted:
+                print("Job interrupted. Ending process.")
+                break
 
         grid_flags = self.grid_options_mapping[grid_option]
         unwanted_grid_because_of_img_count = len(proc.images) < 2 and opts.grid_only_if_multiple

From 7298733ec48e7770ef4fee470877a3e77795791a Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Tue, 21 May 2024 17:15:31 -0700
Subject: [PATCH 2/4] Update test_my_prompt_custom_script.py

Removed a comment that questioned the functionality of a new code logic, since it was already tested and determined that it worked.
---
 scripts/test_my_prompt_custom_script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test_my_prompt_custom_script.py b/scripts/test_my_prompt_custom_script.py
index 115d3de..9558e19 100644
--- a/scripts/test_my_prompt_custom_script.py
+++ b/scripts/test_my_prompt_custom_script.py
@@ -73,7 +73,7 @@ class Script(scripts.Script):
                 continue
                 
             # Check for stopping_generation
-            if state.stopping_generation: # Unsure if this works, 
+            if state.stopping_generation:  
                 print("Stopping generation as requested.")
                 break
 

From 92170783c5e8ee79c522a1eefc330d0b6e7f1a9e Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Tue, 21 May 2024 23:25:16 -0700
Subject: [PATCH 3/4] Bug Fix test_my_prompt_custom_script.py

Discovered a `job_no` calculation error when `excluded_keyword` was used. I think this should be resolved by keeping track of the number of times a job was skipped due to an excluded keyword and subtracting the number from the `job_no` update calculation. I think this should work because jobs that are skipped due to excluded keywords should not be counted. This bug would sometimes cause the number of jobs `job_no` to be larger than the total jobs `job_count`.
---
 scripts/test_my_prompt_custom_script.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/test_my_prompt_custom_script.py b/scripts/test_my_prompt_custom_script.py
index 9558e19..d89c929 100644
--- a/scripts/test_my_prompt_custom_script.py
+++ b/scripts/test_my_prompt_custom_script.py
@@ -66,7 +66,8 @@ class Script(scripts.Script):
         total_jobs = len(filtered_prompt_array) + 1 - skip_x_first 
         state.job_count = total_jobs
         print("total images :", total_jobs)
-
+        exluded_jobs = 0 # Used to fix job_no when excluded job is used
+        
         for g in range(len(prompt_array)+1):
             f = g-1
             if f >= 0 and f < skip_x_first:
@@ -85,6 +86,7 @@ class Script(scripts.Script):
                 
             # Check for excluded keywords
             if f >= 0 and prompt_array[f].strip() in excluded_keywords_list:
+                exluded_jobs = exluded_jobs + 1
                 print(f"Skipping job due to excluded keyword: {prompt_array[f].strip()}")
                 continue
                 
@@ -113,7 +115,7 @@ class Script(scripts.Script):
                 images.save_image(proc.images[0], p.outpath_samples, "", proc.seed, proc.prompt, opts.samples_format, info= proc.info, p=p)
                 
             # Update job number
-            state.job_no = g - skip_x_first + 1
+            state.job_no = (g - skip_x_first + 1) - exluded_jobs
             print(f"Job {state.job_no}/{state.job_count} completed.")
             state.job = f"{state.job_no + 1} out of {state.job_count}"
             

From b775eb56cfc86d72630cca125d0fb8ca51eb7471 Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Wed, 22 May 2024 00:09:39 -0700
Subject: [PATCH 4/4] Bug fix for a Bug Fix test_my_prompt_custom_script.py

Changed the checks for `state.skippped` due to a bad interaction with `excluded_keywords` . It was possible for a user to cause a `job_no` calculation error if the `skipped` command was called when an `excluded_keyword` job should be skipped. This fixes it so that the user cannot cause a calculation error using the `skipped` command by incrementing the `excluded_jobs` count when a excluded keyword is present.
---
 scripts/test_my_prompt_custom_script.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/test_my_prompt_custom_script.py b/scripts/test_my_prompt_custom_script.py
index d89c929..7981ab8 100644
--- a/scripts/test_my_prompt_custom_script.py
+++ b/scripts/test_my_prompt_custom_script.py
@@ -82,6 +82,8 @@ class Script(scripts.Script):
             if state.skipped:
                 print("Job skipped.")
                 state.skipped = False
+                if f >= 0 and prompt_array[f].strip() in excluded_keywords_list:
+                    exluded_jobs = exluded_jobs + 1
                 continue
                 
             # Check for excluded keywords