Fix issue causing Opus Limit

Danbooru Prompt Selector/TEST2024/NAIA_0203_testv2.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d40589e77bf675d2bf7d3091ad0262dbb3ff3fc281be4fd5c2ffd13fcba56d5
-size 838002830
+oid sha256:3b181fe1650c180086599fec283bdd9444e22f2adb356b391d075318eaaae1f4
+size 838003288

Danbooru Prompt Selector/TEST2024/NAIA_0203_testv2.py

@@ -1727,6 +1727,59 @@ class App(customtkinter.CTk):
                         nsfw_word += basket
                         words = []
                         if len(nsfw_word) > 13:
+                            max_val = len(nsfw_word) // 4
+                            if len(nsfw_word) % 4 > 0: max_val += 1
+                            for i in range(max_val):
+                                current_word = []
+                                if i < max_val - 1:
+                                    words.append(nsfw_word[i*4])
+                                    words.append(nsfw_word[i*4+1])
+                                    words.append(nsfw_word[i*4+2])
+                                    words.append(nsfw_word[i*4+3])
+                                    current_word.append(nsfw_word[i*4])
+                                    current_word.append(nsfw_word[i*4+1])
+                                    current_word.append(nsfw_word[i*4+2])
+                                    current_word.append(nsfw_word[i*4+3])
+                                else:
+                                    if len(nsfw_word) % 4 == 0:
+                                        words.append(nsfw_word[i*4])
+                                        words.append(nsfw_word[i*4+1])
+                                        words.append(nsfw_word[i*4+2])
+                                        words.append(nsfw_word[i*4+3])
+                                        current_word.append(nsfw_word[i*4])
+                                        current_word.append(nsfw_word[i*4+1])
+                                        current_word.append(nsfw_word[i*4+2])
+                                        current_word.append(nsfw_word[i*4+3])
+                                    elif len(nsfw_word) % 4 == 3:
+                                        words.append(nsfw_word[i*4])
+                                        words.append(nsfw_word[i*4+1])
+                                        words.append(nsfw_word[i*4+2])
+                                        current_word.append(nsfw_word[i*4])
+                                        current_word.append(nsfw_word[i*4+1])
+                                        current_word.append(nsfw_word[i*4+2])
+                                    elif len(nsfw_word) % 4 == 2:
+                                        words.append(nsfw_word[i*4])
+                                        words.append(nsfw_word[i*4+1])
+                                        current_word.append(nsfw_word[i*4])
+                                        current_word.append(nsfw_word[i*4+1])
+                                    else:
+                                        words.append(nsfw_word[i*4])
+                                        current_word.append(nsfw_word[i*4])
+                                gen_request_sub = copy.deepcopy(gen_request)
+                                temp_prompt = []+pre_prompt
+                                for keyword in nsfw_word:
+                                    if keyword not in words:
+                                        if random_seed == False:
+                                            temp_prompt[temp_prompt.index(keyword)] = " "*len(keyword)
+                                        else:
+                                            temp_prompt.remove(keyword)
+                                    elif keyword in current_word:
+                                        temp_prompt[temp_prompt.index(keyword)] = "{"+keyword+"}"
+                                gen_request_sub["prompt"] = ', '.join(temp_prompt)
+                                if random_seed:
+                                    gen_request_sub["seed" ] = random.randint(0,9999999999)
+                                request_list.append(copy.deepcopy(gen_request_sub))
+                        elif len(nsfw_word) > 8:
                             max_val = len(nsfw_word) // 3
                             if len(nsfw_word) % 3 > 0: max_val += 1
                             for i in range(max_val):
@@ -1768,7 +1821,7 @@ class App(customtkinter.CTk):
                                 if random_seed:
                                     gen_request_sub["seed" ] = random.randint(0,9999999999)
                                 request_list.append(copy.deepcopy(gen_request_sub))
-                        elif len(nsfw_word) > 5:
+                        elif len(nsfw_word) > 3:
                             max_val = len(nsfw_word) // 2 + len(nsfw_word) % 2
                             for i in range(max_val):
                                 current_word = []
@@ -1830,6 +1883,12 @@ class App(customtkinter.CTk):
                         request_list.append(treq_3)
                     except:
                         request_list.append(gen_request)
+                else:
+                    pre_prompt = gen_request["prompt"]
+                    pre_prompt = [keyword.strip() for keyword in pre_prompt.split(',')]
+                    if "*(split nsfw)-rand" in pre_prompt:
+                        pre_prompt.remove("*(split nsfw)-rand")
+                    gen_request["prompt"] = ', '.join(pre_prompt)
 
                 def run_generation():
                     if gen_request["png_rule"] == "count":
@@ -1859,7 +1918,12 @@ class App(customtkinter.CTk):
                             if self.error_count >= 10:
                                 self.automation_button.deselect()
                             temp = result_prompt
-                            time.sleep(1)
+                            if self.automation_button.get() == 1:
+                                instant_wait = random.uniform(3.5, 5.5) + self.delay_offset
+                                if instant_wait < 0 : instant_wait = 0.5
+                                time.sleep(instant_wait)
+                            else:
+                                time.sleep(1)
                             if self.automation_button.get() == 0 or retry_count >= 5:
                                 break
                     self.running_flag = False
@@ -1885,7 +1949,7 @@ class App(customtkinter.CTk):
                         set_image_to_queue(result_image, result_prompt, result_seed, filename)
                     #자동화 체크
                     if self.automation_button.get() == 1:
-                        instant_wait = random.uniform(4.5, 8.5) + self.delay_offset
+                        instant_wait = random.uniform(3.5, 5.5) + self.delay_offset
                         if instant_wait < 0 : instant_wait = 0.5
                         if self.image_generation_repeat_flag == False or (self.image_generation_repeat <= self.image_generation_repeat_current):
                             self.image_generation_repeat_current = 0
@@ -1935,7 +1999,12 @@ class App(customtkinter.CTk):
                                 self.automation_button.deselect()
                                 self.turbo_button.deselect()
                             temp = result_prompt
-                            time.sleep(1)
+                            if self.automation_button.get() == 1:
+                                instant_wait = random.uniform(4.5, 8.5) + self.delay_offset
+                                if instant_wait < 0 : instant_wait = 0.5
+                                time.sleep(instant_wait)
+                            else:
+                                time.sleep(1)
                             if self.turbo_button.get() == 0 or retry_count >= 5:
                                 break
                     self.running_flag = False