Upload 2 files

Danbooru Prompt Selector/TEST2024/NAIA_0226_testv1.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2949964cb601d2a79a2f014d8e6c8a39b2cbffd9fa0ef2c75cf6c17e8a77875d
-size 889007554
+oid sha256:e00b723e2afa2e1872f92151972d293d69d7a60a2227c46af3bd2d27bcf92874
+size 889014231

Danbooru Prompt Selector/TEST2024/NAIA_0226_testv1.py

@@ -48,7 +48,7 @@ class Data:
         questionable_word = list(remove_result_qe.keyword_counts.keys())
         self.qe_word = nsfw_word + questionable_word
         """ 
-        dataset/clothes_list.txt written by JioChoi
+        dataset/clothes_list.txt, characteristic_list.txt written by JioChoi
         https://github.com/JioChoi/NAI-Prompt-Randomizer/blob/main/dataset/clothes_list.txt
         """
         self.attire_list = tagbag.clothes_list
@@ -1980,14 +1980,25 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                 fdf.loc[fdf['id'] == idx, 'deleted'] = 'deleted'
                 
                 # DataFrame에서 특정 행 삭제
-                fdf.drop(fdf[fdf['id'] == idx].index, inplace=True)
+                row_indices = fdf.index[fdf['id'] == idx].tolist()
+                sdf = pd.read_parquet("favorite_prompt.parquet", engine='pyarrow')
+                try:
+                    if row_indices:
+                        fdf.drop(index=row_indices, inplace=True)
+                        # 변경된 DataFrame을 parquet 파일로 저장
+                        fdf.to_parquet("favorite_prompt.parquet", engine='pyarrow')
+                        # 이미지 파일 삭제
+                        delete_image(image_path)
+                except:
+                    sdf.to_parquet("favorite_prompt.parquet", engine='pyarrow')
+                    self.image_label_report.configure(state="normal")
+                    self.image_label_report.delete("0.0", "end")
+                    self.image_label_report.insert("0.0", "<ExceptionAlert> parquet 처리 실패로 창이 닫혔습니다. 정기적으로 데이터를 백업 해 주세요.")
+                    self.image_label_report.configure(text_color="#FFFF97")
+                    self.image_label_report.configure(state="disabled")
+                    favorite_search_close()
+                    return
                 
-                # 변경된 DataFrame을 parquet 파일로 저장
-                fdf.to_parquet("favorite_prompt.parquet", engine='pyarrow')
-
-                # 이미지 파일 삭제
-                delete_image(image_path)
-
                 update_ui_with_dataframe(current_page, favorite_window, headers_width, my_font)
 
             # 삭제 버튼 클릭 시 실행될 함수를 생성하는 함수
@@ -4431,7 +4442,7 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
         def _img2img(self):
             global iimg, img2img_window, inpaint_mode
 
-            def instant_image_generation(self, current_lookup):
+            def instant_image_generation(self, current_lookup, i2irf=None):
                 try:
                     img2img_window.attributes('-topmost', False)
                 except:
@@ -4537,48 +4548,53 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                         "steps": steps if steps <= 50 else 50,
                         "image": send_image
                     }
+                if i2irf and i2irf["image_reference"]:
+                    gen_request["reference_image"] = i2irf["image_reference_string"]
+                    gen_request["reference_information_extracted"] = round(i2irf["ie"], 2)
+                    gen_request["reference_strength"] = round(i2irf["irs"], 2)
                 if not inpaint_check:
                     gen_request["strength"] = round(self.i2i_value, 2)
                     gen_request["noise"] = 0
                 if gen_request["type"] == "inpaint":
                     gen_request["mask"] = mask_to_base64(create_and_save_mask_image())
                     gen_request["add_original_image"] = True if overlay_original_image_var.get()==1 else False
+
                 def run_generation():
-                        if gen_request["png_rule"] == "count":
-                            self.generation_count += 1
-                            gen_request["count"] =self.generation_count
-                        self.state_label.configure(text ="state : img2img 요청됨 ", text_color = "#FFFF97")
-                        result_image, result_prompt, result_seed, info, filename = NAIA_generation.generate(gen_request)
-                        self.state_label.configure(text ="state : img2img 요청 반환됨", text_color = "#DCE4EE")
-                        self.get_anlas()
-                        i2i_generate_button.configure(state="normal")
-                        if info:
-                            temp = info.get('Comment', '')
-                            temp = temp[temp.find("prompt")+10:temp.find("skip_cfg_below_sigma")-3].replace('"','')
+                    if gen_request["png_rule"] == "count":
+                        self.generation_count += 1
+                        gen_request["count"] =self.generation_count
+                    self.state_label.configure(text ="state : img2img 요청됨 ", text_color = "#FFFF97")
+                    result_image, result_prompt, result_seed, info, filename = NAIA_generation.generate(gen_request)
+                    self.state_label.configure(text ="state : img2img 요청 반환됨", text_color = "#DCE4EE")
+                    self.get_anlas()
+                    i2i_generate_button.configure(state="normal")
+                    if info:
+                        temp = info.get('Comment', '')
+                        temp = temp[temp.find("prompt")+10:temp.find("skip_cfg_below_sigma")-3].replace('"','')
+                    else:
+                        temp = result_prompt
+                    self.image_label_report.configure(state="normal")
+                    self.image_label_report.delete("0.0", "end")
+                    self.image_label_report.configure(text_color="#DCE4EE")
+                    self.image_label_report.insert("0.0", temp)
+                    self.image_label_report.configure(state="disabled")
+                    if result_image:
+                        if app.state() != 'zoomed':
+                            instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
                         else:
-                            temp = result_prompt
-                        self.image_label_report.configure(state="normal")
-                        self.image_label_report.delete("0.0", "end")
-                        self.image_label_report.configure(text_color="#DCE4EE")
-                        self.image_label_report.insert("0.0", temp)
-                        self.image_label_report.configure(state="disabled")
-                        if result_image:
-                            if app.state() != 'zoomed':
-                                instant_result_image = customtkinter.CTkImage(result_image, size=(620,620))
+                            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:
-                                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))
-                            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)))
-                            set_image_to_queue(result_image, result_prompt, str(result_seed), filename)
+                                instant_result_image = customtkinter.CTkImage(current_image, size=(max_size, max_size))
+                        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)))
+                        set_image_to_queue(result_image, result_prompt, str(result_seed), filename)
                 generation_thread = threading.Thread(target=run_generation, daemon=True)
                 generation_thread.start()
             
@@ -4886,6 +4902,9 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
             def seed_button_event():
                 self.i2i_seed_hold_check = True if request_upper_size_seed_hold.get() == 1 else False
 
+            #기능 추가 : i2i_reference에 대응
+            i2irf = {"image_reference" : None, "image_reference_string" : None, "image_reference_tk" : None, "image_id" : None, "ie" : 1, "irs" : 0.6}
+
             request_upper_size_seed_hold_var = customtkinter.IntVar(value=i2i_seed_hold_check)
             request_upper_size_seed_hold = customtkinter.CTkCheckBox(i2i_generate_frame, text="시드고정  Step : ", font=my_font, variable=request_upper_size_seed_hold_var, command=seed_button_event)
             request_upper_size_seed_hold.grid(row=1, column=0, padx=5, pady=5, sticky="nsew")
@@ -4893,8 +4912,58 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
             request_upper_size_steps = customtkinter.StringVar(value="28")
             request_upper_size_steps_entry = customtkinter.CTkEntry(i2i_generate_frame, font=my_font, textvariable=request_upper_size_steps, width=60)
             request_upper_size_steps_entry.grid(row=1, column=1,padx=5, pady=5, sticky="nsew")
-            i2i_generate_button = customtkinter.CTkButton(i2i_generate_frame, text="Request I2I", font=large_font,  command=lambda: instant_image_generation(self, current_lookup))
+            i2i_generate_button = customtkinter.CTkButton(i2i_generate_frame, text="Request I2I", font=large_font,  command=lambda: instant_image_generation(self, current_lookup, i2irf))
             i2i_generate_button.grid(row = 1, column= 2, pady=5, sticky="n" )
+
+            def i2i_set_image_reference():
+                filepath = filedialog.askopenfilename(title="Open Image", filetypes=[("Image files", "*.png;*.jpg;*.webp"), ("All files", "*.*")])
+                if filepath:
+                    i2irf["image_reference"] = Image.open(filepath)
+                    i2irf["image_reference_string"] = NAIA_generation.image_to_base64(i2irf["image_reference"])
+                    enhancer = ImageEnhance.Brightness(i2irf["image_reference"])
+                    darker_image = enhancer.enhance(0.5)
+                    i2irf["image_reference_tk"] = ImageTk.PhotoImage(darker_image.resize((486, 468) if self.winfo_screenheight() < 1152 else (600, 468), Image.Resampling.LANCZOS))
+                    i2irf["image_id"] = image_reference_canvas.create_image(0, 0, image=i2irf["image_reference_tk"], anchor='nw')
+                    image_reference_strength.set(0.6)
+                    information_extracted.set(1)
+                    image_reference_frame.grid(row=2, column=0, columnspan=4, sticky="nsew")
+                    i2i_offset_input_label2.configure(text="*인페인트 기능은 Vibe Transfer와 함께 사용할 수 없습니다")
+
+            i2i_vibe_import = customtkinter.CTkButton(i2i_generate_frame, font=my_font, width=40, text="(+) Vibe", fg_color="grey10", hover_color="grey", command=i2i_set_image_reference)
+            i2i_vibe_import.grid(row = 1, column=3, pady=5, sticky="n")
+
+            def slider_event_IRS(value):
+                image_reference_strength_label.configure(text=f"Reference Strength : {value:.2f}")
+                i2irf["irs"] = value
+            
+            def slider_event_IE(value):
+                information_extracted_label.configure(text=f"Information Extracted : {value:.2f}")
+                i2irf["ie"]  = value
+
+            def i2i_rem_image_reference(i2irf):
+                if i2irf["image_reference"]:
+                    i2irf = {"image_reference" : None, "image_reference_string" : None, "image_reference_tk" : None, "image_id" : None, "ie" : 1, "irs" : 0.6}
+                image_reference_frame.grid_forget()
+                image_reference_canvas.delete(i2irf["image_id"])
+                i2irf["image_id"] = None
+
+            image_reference_frame = customtkinter.CTkFrame(i2i_generate_frame)
+            image_reference_canvas = customtkinter.CTkCanvas(image_reference_frame, width=600, height=200,bg="#333333", highlightthickness  = 1, highlightbackground = 'grey10')
+            image_reference_canvas.grid(row=0, column=0, columnspan=4, padx=5, pady=5, sticky="n")
+            image_reference_strength_label = customtkinter.CTkLabel(image_reference_canvas, font=v_large_font, text_color='white', text=f"Reference Strength : 0.6", fg_color='transparent', width=190)
+            information_extracted_label = customtkinter.CTkLabel(image_reference_canvas, font=v_large_font, text_color='white', text=f"Information Extracted : 1", fg_color='transparent', width=190)
+            image_reference_strength = customtkinter.CTkSlider(image_reference_canvas,  from_=0.01, to=1.00, number_of_steps=100, command=slider_event_IRS, button_color='grey', button_hover_color='grey10', height=20, progress_color='transparent')
+            information_extracted = customtkinter.CTkSlider(image_reference_canvas,  from_=0.01, to=1.00, number_of_steps=100, command=slider_event_IE, button_color='grey', button_hover_color='grey10', height=20, progress_color='transparent')
+            exit_reference_mode = customtkinter.CTkButton(image_reference_canvas, text="Vibe Transfer 해제", font=my_font, command=lambda: i2i_rem_image_reference(i2irf), fg_color='grey10', hover_color='grey', corner_radius=0)
+            if self.winfo_screenheight() >= 1152:
+                irc_xpos = [130, 130, 420, 420, 280]
+            else:
+                irc_xpos = [110, 110, 370, 370, 240]
+            image_reference_canvas.create_window(irc_xpos[0], 120, window=image_reference_strength_label)
+            image_reference_canvas.create_window(irc_xpos[1], 70, window=information_extracted_label)
+            image_reference_canvas.create_window(irc_xpos[2], 120, window=image_reference_strength)
+            image_reference_canvas.create_window(irc_xpos[3], 70, window=information_extracted)
+            image_reference_canvas.create_window(irc_xpos[4], 170, window=exit_reference_mode)
             
         def instant_img2img(self):
             current_lookup = self.image_queue[self.current_window].copy()
@@ -5173,13 +5242,8 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
 
             import_image_reference = customtkinter.CTkButton(import_window, font=customtkinter.CTkFont('Pretendard', 14), text="Vibe Transfer", command=lambda: set_image_reference(import_image_reference))
             import_image_reference.grid(row=1, column=0, padx=5, pady=5, sticky="nsew")
+            img2img_window.after(1500, lambda: img2img_window.attributes('-topmost', False))
 
-
-            
-
-
-
-        
         def extract_keywords_from_image(image):
             if image.info and image.info.get('dpi') is None:
                 result = image.info.get('Comment', '')