Upload 2 files

Danbooru Prompt Selector/TEST2024/NAIA_0218_testv2.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd60c7b1645e5c0a1c660bc91b68ad8ee97cb236b19bdccb2c15f7efbbae50e0
-size 888968069
+oid sha256:63425e67d5034488b7d3ec8105fe6a17be1afb7e4c37a2707bc86be72b8033f0
+size 888968406

Danbooru Prompt Selector/TEST2024/NAIA_0218_testv2.py

@@ -2275,6 +2275,56 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                     request_list = []
                     for i in range(self.image_generation_repeat):
                         if i != 0: 
+                            if self.hold_wildcard == False:
+                                before_wildcard_turbo = self.text_input.get("0.0", "end-1c")
+                                before_wildcard = [item.strip() for item in before_wildcard_turbo.split(',')]
+                                if '<' in before_wildcard_turbo:
+                                    wildcard_present = True
+                                    itc = 0
+                                    while (wildcard_present and  itc < 10):
+                                        wildcard_present = False
+                                        #### 단계 1 : 인스턴트 와일드카드 처리 ###
+                                        for i, keyword in enumerate(before_wildcard):
+                                            if keyword.startswith('<') and keyword.endswith('>'):
+                                                wildcard_present = True
+                                                vbar_check = keyword[1:-1]
+                                                if '|' in vbar_check:
+                                                    choices = vbar_check.split('|')  # '|'를 기준으로 split
+                                                    choice_dic = {}
+                                                    for choice in choices:
+                                                        match = re.match(r'(\d*\.?\d+):(.+)', choice)
+                                                        if match:
+                                                            value, keyword = float(match.group(1)), match.group(2).strip()
+                                                        else:
+                                                            value, keyword = 1, choice.strip()
+                                                        choice_dic[keyword] = value
+                                                    keywords = list(choice_dic.keys())
+                                                    weights = list(choice_dic.values())
+                                                    selected_instant_wildcard = random.choices(keywords, weights=weights, k=1)[0]
+                                                    before_wildcard[i] = selected_instant_wildcard
+                                        #### 단계 2 : 글로벌 와일드카드 처리 ###
+                                        for i, keyword in enumerate(before_wildcard):
+                                            if "<" in keyword and ">" in keyword:
+                                                wildcard_present = True
+                                                input_str = keyword.strip('<>').strip()
+                                                if("__" in input_str):
+                                                    adjectives = re.findall(r'__(.*?)__', input_str)
+                                                    last_keyword = re.split(r'__.*?__', input_str)[-1]
+                                                    adjective_string = ""
+                                                    for adjective in adjectives:
+                                                        adjective_string += (self.get_wildcard(adjective) + " ")
+                                                    before_wildcard[i] = adjective_string + self.get_wildcard(last_keyword)
+                                                else:
+                                                    before_wildcard[i] = self.get_wildcard(input_str)
+                                        itc += 1
+                                        if not wildcard_present:
+                                            break
+                                else:
+                                    after_wildcard = self.text_input.get("0.0", "end-1c")
+                                after_wildcard = ', '.join(before_wildcard)
+                            cvalue = random.randint(0,9999999999)
+                            gen_request["seed"] = cvalue
+                            gen_request["prompt"] = after_wildcard
                             cvalue = random.randint(0,9999999999)
                             gen_request["seed"] = cvalue
                         pre_prompt = gen_request["prompt"]
@@ -2467,8 +2517,56 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                     request_list = []
                     for i in range(self.image_generation_repeat):
                         if i != 0: 
+                            if self.hold_wildcard == False:
+                                before_wildcard_turbo = self.text_input.get("0.0", "end-1c")
+                                before_wildcard = [item.strip() for item in before_wildcard_turbo.split(',')]
+                                if '<' in before_wildcard_turbo:
+                                    wildcard_present = True
+                                    itc = 0
+                                    while (wildcard_present and  itc < 10):
+                                        wildcard_present = False
+                                        #### 단계 1 : 인스턴트 와일드카드 처리 ###
+                                        for i, keyword in enumerate(before_wildcard):
+                                            if keyword.startswith('<') and keyword.endswith('>'):
+                                                wildcard_present = True
+                                                vbar_check = keyword[1:-1]
+                                                if '|' in vbar_check:
+                                                    choices = vbar_check.split('|')  # '|'를 기준으로 split
+                                                    choice_dic = {}
+                                                    for choice in choices:
+                                                        match = re.match(r'(\d*\.?\d+):(.+)', choice)
+                                                        if match:
+                                                            value, keyword = float(match.group(1)), match.group(2).strip()
+                                                        else:
+                                                            value, keyword = 1, choice.strip()
+                                                        choice_dic[keyword] = value
+                                                    keywords = list(choice_dic.keys())
+                                                    weights = list(choice_dic.values())
+                                                    selected_instant_wildcard = random.choices(keywords, weights=weights, k=1)[0]
+                                                    before_wildcard[i] = selected_instant_wildcard
+                                        #### 단계 2 : 글로벌 와일드카드 처리 ###
+                                        for i, keyword in enumerate(before_wildcard):
+                                            if "<" in keyword and ">" in keyword:
+                                                wildcard_present = True
+                                                input_str = keyword.strip('<>').strip()
+                                                if("__" in input_str):
+                                                    adjectives = re.findall(r'__(.*?)__', input_str)
+                                                    last_keyword = re.split(r'__.*?__', input_str)[-1]
+                                                    adjective_string = ""
+                                                    for adjective in adjectives:
+                                                        adjective_string += (self.get_wildcard(adjective) + " ")
+                                                    before_wildcard[i] = adjective_string + self.get_wildcard(last_keyword)
+                                                else:
+                                                    before_wildcard[i] = self.get_wildcard(input_str)
+                                        itc += 1
+                                        if not wildcard_present:
+                                            break
+                                else:
+                                    after_wildcard = self.text_input.get("0.0", "end-1c")
+                                after_wildcard = ', '.join(before_wildcard)
                             cvalue = random.randint(0,9999999999)
                             gen_request["seed"] = cvalue
+                            gen_request["prompt"] = after_wildcard
                         try:
                             treq_0, treq_1, treq_2, treq_3 = NAIA_generation.make_turbo_prompt(gen_request)
                             request_list.append(gen_request.copy())
@@ -2641,6 +2739,7 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
 
             def turbo_process_request():
                 turbo_count = 0
+                last_gen_request_seed = request_list[0]['seed']
                 while(request_list):
                     gen_request = request_list.pop(0) #length=5
                     generation_thread = threading.Thread(target=run_generation_turbo, args=(gen_request,), daemon=True)
@@ -2650,6 +2749,11 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                     if app.turbo_button.get() == 0:
                         app.state_label.configure(text =f"state : 사용자에 의한 터보요청 중단 ({turbo_count})", text_color = "#FFFF97")
                         break
+                    if self.automation_button.get() == 0:
+                        if request_list and request_list[0]['seed'] != last_gen_request_seed:
+                            app.state_label.configure(text =f"state : 사용자에 의한 터보요청 중단 ({turbo_count})", text_color = "#FFFF97")
+                            break
+                    last_gen_request_seed = gen_request['seed']
                 if self.automation_button.get() == 1:
                     if self.toggle_prompt_fix_button.get() == 0:
                         random_function()
@@ -4822,13 +4926,13 @@ class App(customtkinter.CTk, TkinterDnD.DnDWrapper):
                 import_frame2 = customtkinter.CTkFrame(import_window_right, width=586, fg_color="#2B2B2B")
                 import_frame2.grid(row=5, column=0, pady=5, padx=5, sticky="nsew")
 
-                i_seed_label = customtkinter.CTkLabel(import_frame2, font=my_font, text="seed : ")
+                i_seed_label = customtkinter.CTkLabel(import_frame2, font=my_font, text="Seed : ")
                 i_seed_label.grid(row=0, column=0, padx=5, sticky="nsew")
                 i_seed = customtkinter.CTkEntry(import_frame2, font=my_font, width=100)
                 i_seed.grid(row=0, column=1, padx=5, sticky="nsew")
                 i_seed.insert(0, str(contents['seed']))
 
-                i_sampler_label = customtkinter.CTkLabel(import_frame2, font=my_font, text="sampler : ")
+                i_sampler_label = customtkinter.CTkLabel(import_frame2, font=my_font, text="Sampler : ")
                 i_sampler_label.grid(row=0, column=2, padx=5, sticky="nsew")
                 i_sampler = customtkinter.CTkEntry(import_frame2, font=my_font, width=100)
                 i_sampler.grid(row=0, column=3, padx=5, sticky="nsew")