From 7c1b35d902bae2a463f2c001160b43c25b0f9ffd Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Mon, 13 May 2024 22:24:18 -0700
Subject: [PATCH 1/2] Filtering Update 2 sd_tag_batch.py

Allows users to filter out content from the interrogation without having to put it in the prompt or negative prompt. This also allows users to reuse their custom filters from a previous run, allowing users to keep their filters through different sessions.

There are also some UI cleanup items. Such as moving the model select dropdown to the top of the UI, instead of being at the bottom. Changed "Deepbooru Tools" to "Filtering Tools" since it is being applied to CLIP too. I also changed my user name.
---
 scripts/sd_tag_batch.py | 50 +++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/scripts/sd_tag_batch.py b/scripts/sd_tag_batch.py
index 5c89550..a9667e9 100644
--- a/scripts/sd_tag_batch.py
+++ b/scripts/sd_tag_batch.py
@@ -3,12 +3,12 @@ import re #For remove_attention regular expressions
 from modules import scripts, deepbooru
 from modules.processing import process_images
 import modules.shared as shared
-
+import os # Used for saving previous custom prompt
 
 """
 
 Thanks to Mathias Russ.
-Thanks to RookHyena.
+Thanks to Smirking Kitsune.
 
 """
 
@@ -21,20 +21,41 @@ class Script(scripts.Script):
     def show(self, is_img2img):
         return is_img2img
 
+    def b_clicked(o):
+        return gr.Button.update(interactive=True)
+    
     def ui(self, is_img2img):
-        in_front = gr.Checkbox(label="Prompt in front", value=True)
-        prompt_weight = gr.Slider(
-            0.0, 1.0, value=0.5, step=0.1, label="interrogator weight"
-        )
-        use_weight = gr.Checkbox(label="Use Weighted Prompt", value=True)
-        
+        # Function to load custom filter from file
+        def load_custom_filter(custom_filter):
+            with open("extensions\sd-Img2img-batch-interrogator\custom_filter.txt", "r") as file:
+                custom_filter = file.read()
+                return custom_filter
+
         model_options = ["CLIP", "Deepbooru"]
         model_selection = gr.Dropdown(choices=model_options, label="Select Interrogation Model(s)", multiselect=True, value="Deepbooru")
         
-        with gr.Accordion("Deepbooru tools:"):
+        in_front = gr.Checkbox(label="Prompt in front", value=True)
+        use_weight = gr.Checkbox(label="Use Interrogator Prompt Weight", value=True)
+        prompt_weight = gr.Slider(
+            0.0, 1.0, value=0.5, step=0.1, label="Interrogator Prompt Weight"
+        )
+        
+        with gr.Accordion("Filtering tools:"):
             no_duplicates = gr.Checkbox(label="Filter Duplicate Prompt Content from Interrogation", value=False)
             use_negatives = gr.Checkbox(label="Filter Negative Prompt Content from Interrogation", value=False)
-        return [in_front, prompt_weight, model_selection, use_weight, no_duplicates, use_negatives]
+            use_custom_filter = gr.Checkbox(label="Filter Custom Prompt Content from Interrogation", value=False)
+            custom_filter = gr.Textbox(
+                label="Custom Filter Prompt", 
+                placeholder="Prompt content seperated by commas. Warning ignores attention syntax, parentheses '()' and colon suffix ':XX.XX' are discarded.", 
+                show_copy_button=True
+            )
+            # Button to load custom filter from file
+            load_custom_filter_button = gr.Button(value="Load Last Custom Filter")
+            
+        # Listeners
+        load_custom_filter_button.click(load_custom_filter, inputs=custom_filter, outputs=custom_filter)
+        
+        return [in_front, prompt_weight, model_selection, use_weight, no_duplicates, use_negatives, use_custom_filter, custom_filter]
 
 
     # Required to parse information from a string that is between () or has :##.## suffix
@@ -101,8 +122,13 @@ class Script(scripts.Script):
             interrogator = self.filter_words(interrogator, raw_prompt)
         # Remove negative prompt content from interrogator prompt
         if use_negatives:
-            raw_negative = p.negative_prompt
-            interrogator = self.filter_words(interrogator, raw_negative)
+            interrogator = self.filter_words(interrogator, p.negative_prompt)
+        # Remove custom prompt content from interrogator prompt
+        if use_custom_filter:
+            interrogator = self.filter_words(interrogator, custom_filter)
+            # Save custom filter to text file
+            with open("extensions\sd-Img2img-batch-interrogator\custom_filter.txt", "w") as file:
+                file.write(custom_filter)
 
         if use_weight:
             if p.prompt == "":

From a59149c5501f533d1a9ba9df4f7811f49877a9f5 Mon Sep 17 00:00:00 2001
From: Smirking Kitsune <36494751+SmirkingKitsune@users.noreply.github.com>
Date: Mon, 13 May 2024 23:02:49 -0700
Subject: [PATCH 2/2] Update sd_tag_batch.py

Forgot to change the run definition in the commit.
---
 scripts/sd_tag_batch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/sd_tag_batch.py b/scripts/sd_tag_batch.py
index a9667e9..53afbc3 100644
--- a/scripts/sd_tag_batch.py
+++ b/scripts/sd_tag_batch.py
@@ -97,7 +97,7 @@ class Script(scripts.Script):
         
         return filtered_prompt
 
-    def run(self, p, in_front, prompt_weight, model_selection, use_weight, no_duplicates, use_negatives):
+    def run(self, p, in_front, prompt_weight, model_selection, use_weight, no_duplicates, use_negatives, use_custom_filter, custom_filter):
 
         raw_prompt = p.prompt
         interrogator = ""