Upload 4 files

.gitattributes

@@ -119,3 +119,4 @@ Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/WEBUIA_0124.exe filter=lfs
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0201_testv1.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0203_testv2.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/WEBUIA_0211.exe filter=lfs diff=lfs merge=lfs -text
+Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0211_testv1.exe filter=lfs diff=lfs merge=lfs -text

Danbooru Prompt Selector/TEST2024/NAIA_0211_testv1.exe

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e85eb1048275b9f50d00c65fe38b01946990a0da49830f1d3d84f0858c8c151f
+size 838004966

Danbooru Prompt Selector/TEST2024/NAIA_generation.py

@@ -54,7 +54,7 @@ def make_turbo_prompt(gen_request):
 
     if(result["1boy"]) or (result["boys"]):
             if(result["1girl"]):
-                if('sex,' in gen_request['prompt']):
+                if(', sex' in gen_request['prompt']):
                     sex_pos_keywords  = ['stomach bulge','insertion', 'fucked silly', 'x-ray', 'orgasm', 'cross-section', 'uterus', 'overflow', 'rape', 'vaginal', 'anal']
                     facial_keywords = ['tongue','ahegao']
                     temp_sex_pos = []

Danbooru Prompt Selector/TEST2024/NAIA_random_function_core.py

@@ -96,6 +96,9 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
     boys = ["1boy", "2boys", "3boys", "4boys", "5boys", "6+boys"]
     girls = ["1girl", "2girls", "3girls", "4girls", "5girls", "6+girls"]
     general = [item.strip() for item in popped_row['general'].split(',')]
+    special_word_check = fix_prompt+', '+after_prompt
+    special_word_check = [item.strip() for item in special_word_check.split(',')]
+    special_word_check = [item for item in special_word_check if item.startswith('*')]
     exc = []
     for keyword in general:
         if keyword == '!' or keyword == '!?' or keyword == '!!':
@@ -118,7 +121,7 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
                 temp_general.append(keyword)
         for keyword in temp_general:
             general.remove(keyword)
-    fix = [item.strip() for item in fix_prompt[:-1].split(',')]
+    fix = [item.strip() for item in fix_prompt.split(',')]
     if rm_a == 0:
         if popped_row['artist']:
             artists = [item.strip() for item in popped_row['artist'].split(',')]
@@ -148,11 +151,21 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
     processed[fix_index:fix_index] = fix
     processed += after
 
-    if rm_c == 0:
+    if rm_c == 0 and '*(remove character name)' not in special_word_check and '*(set character name after prefix)' not in special_word_check and '*(set character name before prefix)' not in special_word_check:
         if popped_row['character']:
             character = [item.strip() for item in popped_row['character'].split(',')]
             processed[fix_index:fix_index] = character
             fix_index+=len(character)
+    elif rm_c == 0 and '*(set character name after prefix)' in special_word_check:
+        if popped_row['character']:
+            character = [item.strip() for item in popped_row['character'].split(',')]
+            processed[fix_index+len(fix):fix_index+len(fix)] = character
+            #fix_index+=len(character)
+    elif rm_c == 0 and '*(set character name before prefix)' in special_word_check:
+        if popped_row['character']:
+            character = [item.strip() for item in popped_row['character'].split(',')]
+            processed[fix_index+1:fix_index+1] = character
+            fix_index+=len(character)
     if magic_word["random_artist"] == True:
         processed.insert(fix_index, magic_word["random_artist_name"])
         
@@ -173,4 +186,10 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
         if boy_index > girl_index:
             processed.pop(boy_index)
             processed.insert(girl_index, boy_in_processed)
+
+    s_word = ['*(remove character name)', '*(set character name after prefix)', '*(set character name before prefix)']
+    for keyword in s_word:
+        if keyword in processed:
+            processed.remove(keyword)
+
     return ', '.join(processed), popped_row['rating']