From 11d23e8ca55c097ecfa255a05b63f194e25f08be Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 2 Dec 2023 18:01:11 +0300
Subject: remove Train/Preprocessing tab and put all its functionality into
 extras batch images mode

---
 scripts/postprocessing_caption.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 scripts/postprocessing_caption.py

(limited to 'scripts/postprocessing_caption.py')

diff --git a/scripts/postprocessing_caption.py b/scripts/postprocessing_caption.py
new file mode 100644
index 00000000..243e3ad9
--- /dev/null
+++ b/scripts/postprocessing_caption.py
@@ -0,0 +1,30 @@
+from modules import scripts_postprocessing, ui_components, deepbooru, shared
+import gradio as gr
+
+
+class ScriptPostprocessingCeption(scripts_postprocessing.ScriptPostprocessing):
+    name = "Caption"
+    order = 4000
+
+    def ui(self):
+        with ui_components.InputAccordion(False, label="Caption") as enable:
+            option = gr.CheckboxGroup(value=["Deepbooru"], choices=["Deepbooru", "BLIP"], show_label=False)
+
+        return {
+            "enable": enable,
+            "option": option,
+        }
+
+    def process(self, pp: scripts_postprocessing.PostprocessedImage, enable, option):
+        if not enable:
+            return
+
+        captions = [pp.caption]
+
+        if "Deepbooru" in option:
+            captions.append(deepbooru.model.tag(pp.image))
+
+        if "BLIP" in option:
+            captions.append(shared.interrogator.generate_caption(pp.image))
+
+        pp.caption = ", ".join([x for x in captions if x])
-- 
cgit v1.2.3


From 98c5fa92015837706adfd9975d5f345ab74f1c99 Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Sat, 16 Dec 2023 22:14:39 +0900
Subject: fix extras caption BLIP

#14328
---
 scripts/postprocessing_caption.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/postprocessing_caption.py')

diff --git a/scripts/postprocessing_caption.py b/scripts/postprocessing_caption.py
index 243e3ad9..9482a03c 100644
--- a/scripts/postprocessing_caption.py
+++ b/scripts/postprocessing_caption.py
@@ -25,6 +25,6 @@ class ScriptPostprocessingCeption(scripts_postprocessing.ScriptPostprocessing):
             captions.append(deepbooru.model.tag(pp.image))
 
         if "BLIP" in option:
-            captions.append(shared.interrogator.generate_caption(pp.image))
+            captions.append(shared.interrogator.interrogate(pp.image.convert("RGB")))
 
         pp.caption = ", ".join([x for x in captions if x])
-- 
cgit v1.2.3


From 3e068de0dcec811d515402fc184f70709a785e4f Mon Sep 17 00:00:00 2001
From: w-e-w <40751091+w-e-w@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:48:49 +0900
Subject: reorder training preprocessing modules in extras tab

using the order from before the rework
11d23e8ca55c097ecfa255a05b63f194e25f08be
---
 scripts/postprocessing_caption.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/postprocessing_caption.py')

diff --git a/scripts/postprocessing_caption.py b/scripts/postprocessing_caption.py
index 9482a03c..5592a898 100644
--- a/scripts/postprocessing_caption.py
+++ b/scripts/postprocessing_caption.py
@@ -4,7 +4,7 @@ import gradio as gr
 
 class ScriptPostprocessingCeption(scripts_postprocessing.ScriptPostprocessing):
     name = "Caption"
-    order = 4000
+    order = 4040
 
     def ui(self):
         with ui_components.InputAccordion(False, label="Caption") as enable:
-- 
cgit v1.2.3