Upload 3 files

Danbooru Prompt Selector/TEST2024/NAIA_0228_testv2.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcf08a1a57c417ff09cec03b41545f9200ef30c3ede7f440be8222ce1da09cf1
-size 854809343
+oid sha256:8c212fa226d9e6ac3494f9bd078ef73fe35aae0d27daa323480326d4d3b15584
+size 854809342

Danbooru Prompt Selector/TEST2024/NAIA_0228_testv2.py

@@ -1555,7 +1555,7 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
         self.xy_plot_count = 0
         self.import_image_negative = {}
 
-        self.title("NAIA Beta v1.09 (Test version)")
+        self.title("NAIA Beta v1.09.1 (Test version 2)")
         self.grid_rowconfigure(0, weight=1)
         self.columnconfigure(2, weight=1)
 
@@ -2498,6 +2498,10 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                         after_wildcard = self.image_generation_repeat_prompt
                         self.image_generation_repeat_current += 1
                 elif self.image_generation_repeat > 1 and not self.hold_wildcard:
+                    if self.image_generation_repeat_flag == False:
+                        self.image_generation_repeat_flag = True
+                        self.image_generation_repeat_prompt = after_wildcard
+                    after_wildcard = self.image_generation_repeat_prompt
                     self.image_generation_repeat_current += 1
                 ##############################
                 gen_request = {
@@ -4584,21 +4588,21 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                     self.image_label_report.insert("0.0", temp)
                     self.image_label_report.configure(state="disabled")
                     if result_image:
+                        current_image = Image.open(filename)
+                        cw, ch = current_image.size
+                        cw = int(cw * (100 / app.dpi))
+                        ch = int(ch * (100 / app.dpi))
                         if app.state() != 'zoomed':
                             instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
                         else:
-                            current_image = Image.open(filename)
-                            original_width, original_height = current_image.size
-                            max_size = app.winfo_screenheight()-100
-                            if original_width > max_size or original_height > max_size:
-                                new_image = Image.new("RGB", (max_size, max_size), "black")
-                                new_image.paste(current_image, ((max_size - original_width) // 2, (max_size - original_height) // 2))
-                                instant_result_image = customtkinter.CTkImage(new_image, size=(max_size, max_size))
-                            else:
-                                instant_result_image = customtkinter.CTkImage(current_image, size=(max_size, max_size))
+                            new_image = self.resize_and_center_image(current_image, self.wide_res_width, self.wide_res_height)
+                            instant_result_image = customtkinter.CTkImage(new_image, size=(self.wide_res_width, self.wide_res_height))
                         self.image_label.configure(image=instant_result_image)
                         img_label_result.grid(row=0, column=1)
-                        img_label_result.configure(image=customtkinter.CTkImage(result_image, size=(576, 576)))
+                        if app.winfo_screenheight() >= 1152:
+                            img_label_result.configure(image=customtkinter.CTkImage(current_image, size=(cw, ch)))
+                        else:
+                            img_label_result.configure(image=customtkinter.CTkImage(result_image, size=(620,620)))
                         set_image_to_queue(result_image, result_prompt, str(result_seed), filename)
                 generation_thread = threading.Thread(target=run_generation, daemon=True)
                 generation_thread.start()
@@ -4640,7 +4644,7 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
             img2img_window_left = customtkinter.CTkScrollableFrame(img2img_window)
             img2img_window_left.grid(row=0, column=0, pady=5, padx=5, sticky="nsew")
             img2img_window_right = customtkinter.CTkFrame(img2img_window, width=586)
-            img2img_window_right.grid(row=0, column=1, pady=5, padx=5, sticky="nsew")
+            img2img_window_right.grid(row=0, column=2, pady=5, padx=5, sticky="nsew")
             #img2img_window_menu = customtkinter.CTkFrame(img2img_window, width=140)
             #img2img_window_menu.grid(row=0, column=2, pady=5, padx=5, sticky="nsew")
 
@@ -4661,7 +4665,7 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
 
             img_label = customtkinter.CTkCanvas(img2img_window_left, width=cwidth, height=cheight)
             img_label.grid(row=0, column=0)
-            img_label_result = customtkinter.CTkLabel(img2img_window_left, text="")
+            img_label_result = customtkinter.CTkLabel(img2img_window, text="")
 
             # 마스크 이미지 생성 및 저장 함수
             def create_and_save_mask_image():
@@ -5076,14 +5080,8 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                                 instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
                             else:
                                 current_image = Image.open(filename)
-                                original_width, original_height = current_image.size
-                                max_size = app.winfo_screenheight()-100
-                                if original_width > max_size or original_height > max_size:
-                                    new_image = Image.new("RGB", (max_size, max_size), "black")
-                                    new_image.paste(current_image, ((max_size - original_width) // 2, (max_size - original_height) // 2))
-                                    instant_result_image = customtkinter.CTkImage(new_image, size=(max_size, max_size))
-                                else:
-                                    instant_result_image = customtkinter.CTkImage(current_image, size=(max_size, max_size))
+                                new_image = self.resize_and_center_image(current_image, self.wide_res_width, self.wide_res_height)
+                                instant_result_image = customtkinter.CTkImage(new_image, size=(self.wide_res_width, self.wide_res_height))
                             self.image_label.configure(image=instant_result_image)
                             set_image_to_queue(result_image, result_prompt, str(result_seed), filename)
                 generation_thread = threading.Thread(target=run_generation, daemon=True)
@@ -7177,14 +7175,8 @@ public class DPI {
                                 instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
                             else:
                                 current_image = Image.open(filename)
-                                original_width, original_height = current_image.size
-                                max_size = app.winfo_screenheight()-100
-                                if original_width > max_size or original_height > max_size:
-                                    new_image = Image.new("RGB", (max_size, max_size), "black")
-                                    new_image.paste(current_image, ((max_size - original_width) // 2, (max_size - original_height) // 2))
-                                    instant_result_image = customtkinter.CTkImage(new_image, size=(max_size, max_size))
-                                else:
-                                    instant_result_image = customtkinter.CTkImage(current_image, size=(max_size, max_size))
+                                new_image = self.resize_and_center_image(current_image, self.wide_res_width, self.wide_res_height)
+                                instant_result_image = customtkinter.CTkImage(new_image, size=(self.wide_res_width, self.wide_res_height))
                             self.image_label.configure(image=instant_result_image)
                             app.ext_set_image_to_queue(result_image, result_prompt, str(result_seed), filename)
                             x_position = label_space + (xloop * image_width)
@@ -7383,14 +7375,8 @@ public class DPI {
                             instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
                         else:
                             current_image = Image.open(filename)
-                            original_width, original_height = current_image.size
-                            max_size = app.winfo_screenheight()-100
-                            if original_width > max_size or original_height > max_size:
-                                new_image = Image.new("RGB", (max_size, max_size), "black")
-                                new_image.paste(current_image, ((max_size - original_width) // 2, (max_size - original_height) // 2))
-                                instant_result_image = customtkinter.CTkImage(new_image, size=(max_size, max_size))
-                            else:
-                                instant_result_image = customtkinter.CTkImage(current_image, size=(max_size, max_size))
+                            new_image = self.resize_and_center_image(current_image, self.wide_res_width, self.wide_res_height)
+                            instant_result_image = customtkinter.CTkImage(new_image, size=(self.wide_res_width, self.wide_res_height))
                         self.image_label.configure(image=instant_result_image)
                         app.ext_set_image_to_queue(result_image, result_prompt, str(result_seed), filename)        
                         if self.instant_stop_bit:

Danbooru Prompt Selector/TEST2024/NAIA_generation.py

@@ -313,7 +313,7 @@ def generate(gen_request):
         "noise_schedule": "native"
         }
     
-    if "image" not in gen_request and "reference_image" in gen_request:
+    if "reference_image" in gen_request:
         params["reference_image"] = gen_request["reference_image"]
         params["reference_information_extracted"] = gen_request["reference_information_extracted"]
         params["reference_strength"] = gen_request["reference_strength"]
@@ -342,7 +342,7 @@ def generate(gen_request):
                     current_key = instant_keyword[gen_request["repeat"]]
                 else:
                     current_key = instant_keyword[gen_request["repeat"] % len(instant_keyword)]
-                keywords[i] = current_key
+                keywords[i] = ', '.join(current_key.split('^'))
 
     filename_rule = gen_request["png_rule"]
     save_folder = gen_request["save_folder"]