Upload 4 files

.gitattributes

@@ -128,3 +128,4 @@ Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0216_testv1.exe filte
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0217_testv1.exe filter=lfs diff=lfs merge=lfs -text
 NAIA_0217_testv1.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0217_testv2.exe filter=lfs diff=lfs merge=lfs -text
+Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0218_testv1.exe filter=lfs diff=lfs merge=lfs -text

Danbooru Prompt Selector/TEST2024/NAIA_0218_testv1.exe

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

Danbooru Prompt Selector/TEST2024/NAIA_generation.py

@@ -289,6 +289,7 @@ def generate(gen_request):
             params['add_original_image'] = gen_request['add_original_image']
     
     positive = gen_request["prompt"]
+    positive = re.sub(r'#.*?(\n|,|$)', '', positive)
     keywords = [key.strip() for key in positive.split(',')]
 
     if "cond_negative" in gen_request and gen_request["cond_negative"]:

Danbooru Prompt Selector/TEST2024/NAIA_random_function_core.py

@@ -96,8 +96,6 @@ def find_keyword_index(general):
 def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c, nsfw, data, magic_word):
     boys = ["1boy", "2boys", "3boys", "4boys", "5boys", "6+boys"]
     girls = ["1girl", "2girls", "3girls", "4girls", "5girls", "6+girls"]
-    if isinstance(popped_row, pd.DataFrame):
-        popped_row = popped_row.iloc[0]
     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(',')]
@@ -205,4 +203,6 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
             
     if at_first:
         processed = at_first + processed
+    for i, key in enumerate(processed):
+        if key.startswith('#'): processed[i] = '\n\n'+key+'\n'
     return ', '.join(processed), popped_row['rating']