Upload 3 files

.gitattributes

@@ -133,3 +133,4 @@ Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0218_testv2.exe filte
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0220_testv1.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0222_testv2.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0222_testv3.exe filter=lfs diff=lfs merge=lfs -text
+NAIA_0224_testv1.exe filter=lfs diff=lfs merge=lfs -text

NAIA_0224_testv1.exe

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

NAIA_random_function_core.py

@@ -3,10 +3,11 @@ 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):
+        nfix = [item.translate(str.maketrans('', '', '{}[]')) for item in fix if not item.startswith('#')]
+        if check_condition(processed+nfix, condition, popped_row):
             processed = execute_command(processed, cmd, fix, after)
     return processed
 
@@ -93,13 +94,67 @@ 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 process_list(temp_fixed):
+    i = 0
+    while i < len(temp_fixed):
+        if ', ' in temp_fixed[i]:
+            # 해당 원소를 처리하는 함수에 전달하고 결과를 받음
+            processed_items = process_fix_prompt(temp_fixed[i])
+            # 원래 원소를 제거
+            temp_fixed.pop(i)
+            # 처리된 원소들을 현재 인덱스에 삽입
+            for item in reversed(processed_items):
+                temp_fixed.insert(i, item)
+            # 삽입된 원소들을 건너뛰기 위해 인덱스 조정
+            i += len(processed_items)
+        else:
+            i += 1
+    return temp_fixed
+
+def process_fix_prompt(fix_prompt):
+    fix = []
+    lt_count = 0  # '<' 문자 개수 추적
+    current_item = ""  # 현재 항목을 결합하기 위한 변수
+
+    # fix_prompt를 쉼표로 분리하고 각 항목을 순회
+    for item in fix_prompt.split(','):
+        item = item.strip()  # 공백 제거
+
+        if '<' in item:
+            lt_count += item.count('<')  # '<' 발견 시 카운트 증가
+            lt_count -=  item.count('>')
+            if current_item:  # 이미 current_item에 값이 있는 경우 쉼표와 공백 추가
+                current_item += ", "
+            if lt_count <= 0:  # lt_count가 0이면 일반 항목으로 처리
+                fix.append(item)
+            else:
+                current_item += item  # 현재 항목에 추가
+        elif '>' in item:
+            lt_count -= item.count('>')  # '>' 발견 시 카운트 감소
+            current_item += ", " + item  # '>'가 있는 항목도 현재 항목에 추가
+            if lt_count == 0:  # '<'와 '>'의 개수가 매칭되면 fix에 추가하고 current_item 초기화
+                fix.append(current_item)
+                current_item = ""
+        else:
+            if lt_count <= 0:  # lt_count가 0이면 일반 항목으로 처리
+                fix.append(item)
+            else:  # lt_count가 0이 아니면 현재 항목에 계속해서 추가
+                current_item += ", " + item
+
+    # 마지막에 남은 current_item 처리
+    if current_item:
+        fix.append(current_item)
+
+    return fix
+
+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 +169,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:
@@ -122,7 +194,10 @@ 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.split(',')]
+    
+    #NAIA_random_function_core.process_fix_prompt()
+    fix = process_fix_prompt(fix_prompt)
+
     at_first = []
     for fp in fix:
         if fp.startswith('*'):
@@ -142,8 +217,8 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
         else:
             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(',')] + ["| |", ":|", "\||/", "<|> <|>", "|| ||", ";|"]
+    after = [item.strip() for item in after_prompt.split(',')]
+    auto_hide = [item.strip() for item in auto_hide_prompt.split(',') if not item.strip().startswith('#')] + ["| |", ":|", "\||/", "<|> <|>", "|| ||", ";|"]
     fix_index = find_keyword_index(general)
     processed = general.copy()
     temp_hide_prompt = []
@@ -203,4 +278,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']