Upload 2 files

Danbooru Prompt Selector/TEST2024/prompt_selector_auto_1212_testv8.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a67159b958f92b2ba1cfe1f0aef8e6adb8aa4e00f7c77632ecade40da0b657b
-size 150863343
+oid sha256:297fdc6f69a9dae7741ccc9027eaf3e732557715b97cf37ceee89ad359f7ed05
+size 150864130

Danbooru Prompt Selector/TEST2024/prompt_selector_auto_1212_testv8.py

@@ -312,8 +312,6 @@ def random_function():
     include_keywords = [kw for kw in remaining_keywords if not kw.startswith('~') and not kw.startswith('*')]
 
     if current_deep_search_keywords != last_deep_search_keywords or not cached_rows:
-        entry_auto_hide.delete(0, tk.END)
-        entry_auto_hide.insert(tk.END, 'monochrome, doujin cover, bad source, censored, bar censor, photoshop (medium)')
         with open('txt2img_temp_prompt.csv', 'r', newline='', encoding='utf-8') as f:
             reader = csv.reader(f)
             rows = []
@@ -436,21 +434,41 @@ def random_function():
                 if kw in random_row_keywords:
                     random_row_keywords.remove(kw)
 
-
+            global previous_wildcard_artist, previous_wildcard_character
             # temp_first_keywords에 boy와 girl 키워드를 적절한 위치에 추가
             if(girl_keywords and 'girl' in temp_first_keywords[0]): temp_first_keywords.pop(0)
             #print(wildcard_var.get())
+            print(random_row_keywords)
             if(wildcard_var2.get() == 1):
                 temp_len = len(girl_keywords)
-                girl_keywords.append(get_random_keyword('character'))
+                print('previous : ',previous_wildcard_character, 'type : ', type(previous_wildcard_character))
+                if previous_wildcard_character in random_row_keywords:
+                    random_row_keywords.remove(previous_wildcard_character)
+                elif(previous_wildcard_character is not None):
+                    split_previous_wildcard_character = previous_wildcard_character.split(',')
+                    for _keyword in split_previous_wildcard_character:
+                        if _keyword in random_row_keywords:
+                            random_row_keywords.remove(_keyword)
+                previous_wildcard_character = get_random_keyword('character')
+                girl_keywords.append(previous_wildcard_character)
             if(wildcard_var.get() == 1): 
+                print('previous : ',previous_wildcard_artist, 'type : ', type(previous_wildcard_artist))
+                if previous_wildcard_artist is not None and " "+previous_wildcard_artist in random_row_keywords:
+                    random_row_keywords.remove(" "+previous_wildcard_artist)
+                elif(previous_wildcard_artist is not None):
+                    split_previous_wildcard_artist = previous_wildcard_artist.split(',')
+                    split_previous_wildcard_artist[0] = " "+split_previous_wildcard_artist[0]
+                    for _keyword in split_previous_wildcard_artist:
+                        if _keyword in random_row_keywords:
+                            random_row_keywords.remove(_keyword)
+                previous_wildcard_artist = get_random_keyword('artist')
                 if(wildcard_var2.get() == 1): 
-                    girl_keywords.insert(temp_len+1,get_random_keyword('artist'))
+                    girl_keywords.insert(temp_len+1,previous_wildcard_artist)
                 else:  
-                    girl_keywords.append(get_random_keyword('artist'))
-            print(boy_keywords)
-            print(girl_keywords)
-            print(temp_first_keywords)
+                    girl_keywords.append(previous_wildcard_artist)
+            #print(boy_keywords)
+            #print(girl_keywords)
+            #print(temp_first_keywords)
             if temp_first_keywords and 'girl' in temp_first_keywords[0]:
                 girl_in_gkey = False
                 for gkey in girl_keywords:
@@ -815,7 +833,7 @@ def character_search():
     
         for k, v in keyword_count_dict1.items():
             if '|' in k: continue
-            if v >= highest_count * weight:
+            if v >= highest_count1 * weight:
                 result_list1.append(k)
     
         result_list1.insert(0, keyword)
@@ -839,6 +857,11 @@ def character_search():
             # Insert the matching keywords into the listbox
             for keyword, count in matching_keywords:
                 listbox.insert(tk.END, f"{keyword} - {count}")
+        else:
+            # Sort all keywords by count in descending order
+            all_keywords = sorted(cd.character_dictionary.items(), key=lambda item: item[1], reverse=True)
+            for keyword, count in all_keywords:
+                listbox.insert(tk.END, f"{keyword} - {count}")
 
     # 메인 윈도우 생성
     ch_search_window = tk.Toplevel(window)
@@ -869,15 +892,62 @@ def character_search():
     # center_frame 내부 구성
     search_button = tk.Button(center_frame, text="검색", command=on_search)
     search_button.grid(row=2, column=0, rowspan=4, padx=10, pady=175)
+
+    def character_prompt_auto_insert():
+        selected_indices = listbox.curselection()
+        if not selected_indices:  # If there is no selection
+            print("No selection made.")
+            return
+        # Assuming the first selected index (single selection mode)
+        selected_index = selected_indices[0]
+        # Get the keyword from the listbox, split by '-', and trim whitespace
+        keyword_with_count = listbox.get(selected_index).strip()
+        keyword = keyword_with_count.split('-')[0].strip()
+        prompt = character_prompt.get("1.0", tk.END).replace(keyword+',','')
+        if(len(prompt) > 8):
+            text_output.delete('1.0', tk.END)
+            entry_prompt = entry_fixed_prompt.get().replace('1girl', f'1girl, {keyword}')
+            result_text = entry_prompt+", "+prompt[:-2]+", "+entry_fixed_prompt_after.get()
+            text_output.insert(tk.END, result_text)
+        return (len(prompt) > 8)
+
+    def character_prompt_auto_generate():
+        global running_flag
+        if(character_prompt_auto_insert() and not running_flag):
+            window.event_generate(GENERATE_EVENT, when="tail")
+
+    def character_cosplay_auto_insert():
+        prompt = cosplay_prompt.get("1.0", tk.END)
+        if(len(prompt) > 8):
+            text_output.delete('1.0', tk.END)
+            result_text = entry_fixed_prompt.get()+", "+prompt[:-2]+", "+entry_fixed_prompt_after.get()
+            text_output.insert(tk.END, result_text)
+        return (len(prompt) > 8)
+
+    def character_cosplay_auto_generate():
+        if(character_cosplay_auto_insert() and not running_flag):
+            window.event_generate(GENERATE_EVENT, when="tail")
     
     # right_frame 내부 구성
-    prompt_label = tk.Label(right_frame, text="캐릭터 프롬프트:")
+    character_prompt_frame = tk.Frame(right_frame)
+    character_prompt_frame.grid(row=0, column=0, padx=10, pady=5, sticky="ew")
+    prompt_label = tk.Label(character_prompt_frame, text="캐릭터 프롬프트:")
     prompt_label.grid(row=0, column=0, padx=10, pady=5, sticky="ew")
+    character_prompt_insert = tk.Button(character_prompt_frame, text="자동입력", command=character_prompt_auto_insert)
+    character_prompt_insert.grid(row=0, column=1, padx=10, pady=5, sticky="ew")
+    character_prompt_generate = tk.Button(character_prompt_frame, text="즉시생성", command=character_prompt_auto_generate)
+    character_prompt_generate.grid(row=0, column=2, padx=10, pady=5, sticky="ew")
     character_prompt = tk.Text(right_frame, height=10)
     character_prompt.grid(row=1, column=0, padx=10, pady=5, sticky="nsew")
     #row=3, column=0, padx=10, pady=5, sticky="nsew"
-    cosplay_label = tk.Label(right_frame, text="캐릭터 (Cosplay):")
-    cosplay_label.grid(row=2, column=0, padx=10, pady=5, sticky="ew")
+    character_cosplay_frame = tk.Frame(right_frame)
+    character_cosplay_frame.grid(row=2, column=0, padx=10, pady=5, sticky="ew")
+    cosplay_label = tk.Label(character_cosplay_frame, text="캐릭터 (Cosplay):")
+    cosplay_label.grid(row=0, column=0, padx=10, pady=5, sticky="ew")
+    character_cosplay_insert = tk.Button(character_cosplay_frame, text="자동입력", command=character_cosplay_auto_insert)
+    character_cosplay_insert.grid(row=0, column=1, padx=10, pady=5, sticky="ew")
+    character_prompt_generate = tk.Button(character_cosplay_frame, text="즉시생성", command=character_cosplay_auto_generate)
+    character_prompt_generate.grid(row=0, column=2, padx=10, pady=5, sticky="ew")
     cosplay_prompt = tk.Text(right_frame, height=10)
     cosplay_prompt.grid(row=3, column=0, padx=10, pady=5, sticky="ew")
     
@@ -897,6 +967,10 @@ def character_search():
     ch_search_window.grid_columnconfigure(1, weight=1)  # center_frame
     ch_search_window.grid_columnconfigure(2, weight=6)  # right_frame
 
+    all_keywords = sorted(cd.character_dictionary.items(), key=lambda item: item[1], reverse=True)
+    for keyword, count in all_keywords:
+        listbox.insert(tk.END, f"{keyword} - {count}")
+
 def v_automatic(save_position, prompt_position):
     # 프롬프트 창 클릭
     copy_to_clipboard()
@@ -1846,6 +1920,9 @@ afilter_30000 = arti_list.afilter_30000
 current_wildcard_artist = []
 current_wildcard_character = []
 
+previous_wildcard_artist = None
+previous_wildcard_character = None
+
 GENERATE_EVENT = "<<GenerateEvent>>"
 window.bind(GENERATE_EVENT, on_generate_event)