Upload 3 files

.gitattributes

@@ -129,3 +129,4 @@ Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0217_testv1.exe filte
 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[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0218_testv2.exe filter=lfs diff=lfs merge=lfs -text

Danbooru Prompt Selector/TEST2024/NAIA_0218_testv2.exe

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

Danbooru Prompt Selector/TEST2024/NAIA_generation.py

@@ -181,7 +181,7 @@ def generate(gen_request):
         negative = [neg.strip() for neg in negative]
         prompt = _prompt.split(',')
         prompt = [key.strip() for key in prompt]
-        commands = [cmd.strip() for cmd in user_input.split(',')]
+        commands = [cmd.strip() for cmd in user_input.split(',') if not cmd.strip().startswith('#')]
         for command in commands:
             condition, cmd = parse_conditional_command(command)
             if check_condition(prompt, condition, rating):
@@ -273,7 +273,7 @@ def generate(gen_request):
         "steps": 28 if gen_request["type"]!="upper" else gen_request["steps"],
         "scale": gen_request["scale"],
         "uncond_scale": gen_request["uncond_scale"],
-        "negative_prompt": gen_request["negative"],
+        "negative_prompt": ', '.join([keyword.strip() for keyword in gen_request["negative"].split(',') if not keyword.strip().startswith('#')]),
         "sm" : gen_request["sema"],
         "sm_dyn" : gen_request["sema_dyn"],
         "decrisper": False,

Danbooru Prompt Selector/TEST2024/NAIA_random_function_core.py

@@ -3,7 +3,7 @@ import numpy as np
 import re
 
 def parse_and_execute_commands(processed, user_input, fix, after, popped_row):
-    commands = [cmd.strip() for cmd in user_input.split(',')]
+    commands = [cmd.strip() for cmd in user_input.split(',') if not cmd.strip().startswith('#')]
     for command in commands:
         condition, cmd = parse_conditional_command(command)
         if check_condition(processed, condition, popped_row):
@@ -93,13 +93,14 @@ def find_keyword_index(general):
     # 2월 12일에 해당 부분 return 2 -> return 0 으로 수정하였으며 이 부분 트래킹 필요
     return 0
 
-def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c, nsfw, data, magic_word):
+def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c, rm_loc, rm_color, nsfw, data, magic_word):
     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('*')]
+    colors = ['black','white','blond','silver','gray','yellow','blue','purple','red','pink','brown','orange','green','aqua','gradient']
     exc = []
     for keyword in general:
         if keyword == '!' or keyword == '!?' or keyword == '!!':
@@ -114,7 +115,24 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
         for keyword in general:
             if keyword in data.qe_word or keyword in data.bag_of_tags or "horns" in keyword or "(" in keyword or keyword in boys or keyword in girls:
                 nsfw_word.append(keyword)
+        nsfw_word = list(set(nsfw_word))
+        nsfw_word.sort()
         general = nsfw_word
+    if rm_loc == 1:
+        temp_general = []
+        locations = ['airplane interior', 'airport', 'apartment', 'arena', 'armory', 'bar', 'barn', 'bathroom', 'bathtub', 'bedroom', 'bell tower', 'billiard room', 'book store', 'bowling alley', 'bunker', 'bus interior', 'butcher shop', 'cafe', 'cafeteria', 'car interior', 'casino', 'castle', 'catacomb', 'changing room', 'church', 'classroom', 'closet', 'construction site', 'convenience store', 'convention hall', 'court', 'dining room', 'drugstore', 'ferris wheel', 'flower shop', 'gym', 'hangar', 'hospital', 'hotel room', 'hotel', 'infirmary', 'izakaya', 'kitchen', 'laboratory', 'library', 'living room', 'locker room', 'mall', 'messy room', 'mosque', 'movie theater', 'museum', 'nightclub', 'office', 'onsen', 'ovservatory', 'phone booth', 'planetarium', 'pool', 'prison', 'refinery', 'restaurant', 'restroom', 'rural', 'salon', 'school', 'sex shop', 'shop', 'shower room', 'skating rink', 'snowboard shop', 'spacecraft interior', 'staff room', 'stage', 'supermarket', 'throne', 'train station', 'tunnel', 'airfield', 'alley', 'amphitheater', 'aqueduct', 'bamboo forest', 'beach', 'blizzard', 'bridge', 'bus stop', 'canal', 'canyon', 'carousel', 'cave', 'cliff', 'cockpit', 'conservatory', 'cross walk', 'desert', 'dust storm', 'flower field', 'forest', 'garden', 'gas staion', 'gazebo', 'geyser', 'glacier', 'graveyard', 'harbor', 'highway', 'hill', 'island', 'jungle', 'lake', 'market', 'meadow', 'nuclear powerplant', 'oasis', 'ocean bottom', 'ocean', 'pagoda', 'parking lot', 'playground', 'pond', 'poolside', 'railroad', 'rainforest', 'rice paddy', 'roller coster', 'rooftop', 'rope bridge', 'running track', 'savannah', 'shipyard', 'shirine', 'skyscraper', 'soccor field', 'space elevator', 'stair', 'starry sky', 'swamp', 'tidal flat', 'volcano', 'waterfall', 'waterpark', 'wheat field', 'zoo', 'white background', 'simple background', 'grey background', 'gradient background', 'blue background', 'black background', 'yellow background', 'pink background', 'red background', 'brown background', 'green background', 'purple background', 'orange background']
+        for keyword in general:
+            if keyword in locations:
+                temp_general.append(keyword)
+        for keyword in temp_general:
+            general.remove(keyword)
+    if rm_color == 1:
+        temp_general = []
+        for keyword in general:
+            if any(color in keyword for color in colors):
+                temp_general.append(keyword)
+        for keyword in temp_general:
+            general.remove(keyword)
     if rm_c == 1:
         temp_general = []
         for keyword in general:
@@ -143,7 +161,7 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
             series = []
         fix = fix + series
     after = [item.strip() for item in after_prompt[:-1].split(',')]
-    auto_hide = [item.strip() for item in auto_hide_prompt[:-1].split(',')] + ["| |", ":|", "\||/", "<|> <|>", "|| ||", ";|"]
+    auto_hide = [item.strip() for item in auto_hide_prompt[:-1].split(',') if not item.strip().startswith('#')] + ["| |", ":|", "\||/", "<|> <|>", "|| ||", ";|"]
     fix_index = find_keyword_index(general)
     processed = general.copy()
     temp_hide_prompt = []