Upload 4 files

.gitattributes

@@ -116,3 +116,4 @@ Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0108_testv3.exe filte
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0110_testv3.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/WEBUIA_0119.exe filter=lfs diff=lfs merge=lfs -text
 Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/WEBUIA_0124.exe filter=lfs diff=lfs merge=lfs -text
+Danbooru[[:space:]]Prompt[[:space:]]Selector/TEST2024/NAIA_0201_testv1.exe filter=lfs diff=lfs merge=lfs -text

Danbooru Prompt Selector/TEST2024/NAIA_0201_testv1.exe

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

Danbooru Prompt Selector/TEST2024/NAIA_generation.py

@@ -4,7 +4,7 @@ from PIL import Image, ImageOps, ImageTk
 from datetime import datetime
 import time
 from pathlib import Path
-import io
+import io, re
 import zipfile
 
 BASE_URL="https://api.novelai.net"
@@ -176,6 +176,90 @@ def generate_image(access_token, prompt, model, action, parameters):
     return response.content
 
 def generate(gen_request):
+    def parse_and_execute_commands(_prompt, negative, user_input, rating):
+        negative = negative.split(',')
+        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(',')]
+        for command in commands:
+            condition, cmd = parse_conditional_command(command)
+            if check_condition(prompt, condition, rating):
+                negative = execute_command(negative, cmd)
+        return ', '.join(negative)
+
+    def parse_conditional_command(command):
+        match = re.match(r"\((.*?)\)\:(.*)", command)
+        if match:
+            return match.groups()
+        return '', command
+
+    def check_condition(prompt, condition, rating):
+        if not condition:
+            return True
+        sub_conditions = re.split(r'\)\s*&\s*\(', condition)
+        sub_conditions = [re.sub(r'^\(|\)$', '', cond) for cond in sub_conditions]
+
+        results = []
+        for sub_cond in sub_conditions:
+            if '&' in sub_cond:
+                results.append(all(check_condition(prompt, cond, rating) for cond in sub_cond.split('&')))
+            elif '|' in sub_cond:
+                results.append(any(check_condition(prompt, cond, rating) for cond in sub_cond.split('|')))
+            else:
+                if sub_cond in ['e', 'q', 's', 'g']:
+                    results.append(sub_cond == rating)
+                elif sub_cond in ['~e', '~q', '~s', '~g']:
+                    results.append(sub_cond != rating)
+                # PM
+                elif sub_cond.startswith('*'):
+                    results.append(sub_cond[1:] in prompt)
+                # NOT IN
+                elif sub_cond.startswith('~!'):
+                    results.append(sub_cond[2:] not in prompt)
+                elif sub_cond.startswith('~'):
+                    results.append(any(sub_cond[1:] not in element for element in prompt))
+                # CONTAIN
+                else:
+                    results.append(any(sub_cond in element for element in prompt))
+        return all(results)
+
+    def execute_command(negative, command):
+        if '+=' in command:
+            keyword, addition = command.split('+=', 1)
+            addition = addition.replace('^', ', ')
+            return insert_text_after_keyword(negative, keyword, addition)
+        elif command.startswith('add '):
+            keyword = command[4:]
+            keyword = keyword.replace('^', ', ')
+            keys = keyword.split(',')
+            keys = [key.strip() for key in keys]
+            for key in keys:
+                if key not in negative:
+                    negative.append(key)
+            return negative
+        elif command.startswith('rem '):
+            keyword = command[4:]
+            keyword = keyword.replace('^', ', ')
+            keys = keyword.split(',')
+            keys = [key.strip() for key in keys]
+            for key in keys:
+                if key in negative:
+                    negative.remove(key)
+            return negative
+        elif '=' in command:
+            keyword, replacement = command.split('=', 1)
+            if keyword in negative:
+                replacement = replacement.replace('^', ', ')
+                index = negative.index(keyword)
+                negative[index] = replacement
+        return negative
+
+    def insert_text_after_keyword(negative, user_keyword, user_additional_keyword):
+        if user_keyword in negative:
+            index = negative.index(user_keyword) + 1
+            negative.insert(index, user_additional_keyword)
+        return negative
 
     params = {
         "legacy": False,
@@ -199,15 +283,29 @@ def generate(gen_request):
         "noise_schedule": "native"
         }
     
-    # 와일드카드 기능 만들어야함
+
     positive = gen_request["prompt"]
 
+    if "cond_negative" in gen_request and gen_request["cond_negative"]:
+        user_input = gen_request["cond_negative"]
+        rating = gen_request["rating"]
+        params["negative_prompt"] = parse_and_execute_commands(positive, params["negative_prompt"], user_input, rating)
+
     filename_rule = gen_request["png_rule"]
     save_folder = gen_request["save_folder"]
 
     access_token = gen_request["access_token"]
     additional_folder = ""
 
+    request_type = "generate"
+    if "image" in gen_request:
+        params["image"] = gen_request["image"]
+        params["strength"] = gen_request["strength"]
+        params["noise"] = gen_request["noise"]
+        params["sm"] = False
+        params["sm_dyn"] = False
+        request_type = "img2img"
+
     def resize_and_fill(image, max_size=None):
         if max_size is None:
             max_size = gen_request["user_screen_size"]
@@ -236,7 +334,7 @@ def generate(gen_request):
             file.write(error_message)
 
     try:
-        zipped_bytes = generate_image(access_token, positive, "nai-diffusion-3", "generate", params)
+        zipped_bytes = generate_image(access_token, positive, "nai-diffusion-3", request_type, params)
         if gen_request["png_rule"] == "count":
             additional_folder = "/" + gen_request["start_time"]
         if gen_request["type"] == "turbo":

Danbooru Prompt Selector/TEST2024/NAIA_random_function_core.py

@@ -1,5 +1,77 @@
 import pandas
 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(',')]
+    for command in commands:
+        condition, cmd = parse_conditional_command(command)
+        if check_condition(processed, condition, popped_row):
+            processed = execute_command(processed, cmd, fix, after)
+    return processed
+
+def parse_conditional_command(command):
+    match = re.match(r"\((.*?)\)\:(.*)", command)
+    if match:
+        return match.groups()
+    return '', command
+
+def check_condition(processed, condition, popped_row):
+    if not condition:
+        return True
+    sub_conditions = re.split(r'\)\s*&\s*\(', condition)
+    sub_conditions = [re.sub(r'^\(|\)$', '', cond) for cond in sub_conditions]
+
+    results = []
+    for sub_cond in sub_conditions:
+        if '&' in sub_cond:
+            results.append(all(check_condition(processed, cond, popped_row) for cond in sub_cond.split('&')))
+        elif '|' in sub_cond:
+            results.append(any(check_condition(processed, cond, popped_row) for cond in sub_cond.split('|')))
+        else:
+            if sub_cond in ['e', 'q', 's', 'g']:
+                results.append(sub_cond == popped_row['rating'])
+            elif sub_cond in ['~e', '~q', '~s', '~g']:
+                results.append(sub_cond != popped_row['rating'])
+            # PM
+            elif sub_cond.startswith('*'):
+                results.append(sub_cond[1:] in processed)
+            # NOT IN
+            elif sub_cond.startswith('~!'):
+                results.append(sub_cond[2:] not in processed)
+            elif sub_cond.startswith('~'):
+                results.append(any(sub_cond[1:] not in element for element in processed))
+            # CONTAIN
+            else:
+                results.append(any(sub_cond in element for element in processed))
+    return all(results)
+
+def execute_command(processed, command, fix, after):
+    if '+=' in command:
+        keyword, addition = command.split('+=', 1)
+        addition = addition.replace('^', ', ')
+        #addiction split 해서 프롬프트 존재하는지 체크 필요
+        return insert_text_after_keyword(processed, keyword, addition, fix, after)
+    elif '=' in command:
+        keyword, replacement = command.split('=', 1)
+        if keyword in processed:
+            replacement = replacement.replace('^', ', ')
+            #replacement split 해서 프롬프트 존재하는지 체크 필요
+            index = processed.index(keyword)
+            processed[index] = replacement
+    return processed
+
+def insert_text_after_keyword(processed, user_keyword, user_additional_keyword, fix, after):
+    if user_keyword == "prompt":
+        processed.append(user_additional_keyword)
+    elif user_keyword == "prefix":
+        fix.append(user_additional_keyword)
+    elif user_keyword == "postfix":
+        after.append(user_additional_keyword)
+    elif user_keyword in processed:
+        index = processed.index(user_keyword) + 1
+        processed.insert(index, user_additional_keyword)
+    return processed
 
 def find_keyword_index(general):
     # boys와 girls 리스트의 원소가 있는지 확인 및 인덱스 저장
@@ -54,13 +126,18 @@ def RFP(popped_row, fix_prompt, after_prompt, auto_hide_prompt, rm_a, rm_s, rm_c
     fix_index = find_keyword_index(general)
     processed = general.copy()
     temp_hide_prompt = []
-    processed[fix_index:fix_index] = fix
-    processed += after
     for keyword in processed:
         if keyword in auto_hide:
             temp_hide_prompt.append(keyword)
     for keyword in temp_hide_prompt:
         processed.remove(keyword)
+    #여기에서 문제의 magic word 처리
+    if "cond" in magic_word and magic_word["cond"]:
+        user_input = magic_word["cond"]
+        processed = parse_and_execute_commands(processed, user_input, fix, after, popped_row)
+    
+    processed[fix_index:fix_index] = fix
+    processed += after
 
     if rm_c == 0:
         if popped_row['character']:
@@ -87,4 +164,4 @@ 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)
-    return ', '.join(processed)
+    return ', '.join(processed), popped_row['rating']