diff --git a/OneButtonPromptNodes.py b/OneButtonPromptNodes.py index c573e53..d24701a 100644 --- a/OneButtonPromptNodes.py +++ b/OneButtonPromptNodes.py @@ -454,7 +454,7 @@ class AutoNegativePrompt: "default": "text, watermark" }), "enhancenegative": ("INT", { - "default": 1, + "default": 0, "min": 0, #Minimum value "max": 1, #Maximum value "step": 1, #Slider's step @@ -501,5 +501,6 @@ NODE_CLASS_MAPPINGS = { NODE_DISPLAY_NAME_MAPPINGS = { "OneButtonPrompt": "One Button Prompt", "CreatePromptVariant": "Create Prompt Variant", - "SavePromptToFile": "Save Prompt To File" + "SavePromptToFile": "Save Prompt To File", + "AutoNegativePrompt": "Auto Negative Prompt", } diff --git a/csv_reader.py b/csv_reader.py index 5438880..47c422a 100644 --- a/csv_reader.py +++ b/csv_reader.py @@ -162,11 +162,24 @@ def load_config_csv(): def load_negative_list(): primerlist = [] negativelist = [] + primeraddonlist = [] + negativeaddonlist = [] + script_dir = os.path.dirname(os.path.abspath(__file__)) full_path_default_negative_file = os.path.join(script_dir, "./csvfiles/special_lists/" ) negative_file = full_path_default_negative_file + 'negativewords.csv' + full_path_replace_negative_file = os.path.join(script_dir, "./userfiles/" ) + replace_negative_file = full_path_replace_negative_file + 'negativewords_replace.csv' + + full_path_addon_negative_file = os.path.join(script_dir, "./userfiles/" ) + addon_negative_file = full_path_addon_negative_file + 'negativewords_addon.csv' + + + if(os.path.isfile(replace_negative_file)): + negative_file = replace_negative_file + with open(negative_file, "r", newline="",encoding="utf8") as file: reader = csv.DictReader(file, delimiter=";") primerlist = [row["primer"] for row in reader] @@ -174,6 +187,19 @@ def load_negative_list(): reader = csv.DictReader(file, delimiter=";") negativelist = [row["negative"] for row in reader] + + if(os.path.isfile(addon_negative_file)): + with open(addon_negative_file, "r", newline="",encoding="utf8") as file: + reader = csv.DictReader(file, delimiter=";") + primeraddonlist = [row["primer"] for row in reader] + with open(addon_negative_file, "r", newline="",encoding="utf8") as file: + reader = csv.DictReader(file, delimiter=";") + negativeaddonlist = [row["negative"] for row in reader] + + primerlist += primeraddonlist + negativelist += negativeaddonlist + + return primerlist, negativelist def load_all_artist_and_category(): diff --git a/negativeprompttester.py b/negativeprompttester.py index 75e31b2..e976f6f 100644 --- a/negativeprompttester.py +++ b/negativeprompttester.py @@ -32,4 +32,4 @@ def generateprompts(amount = 1,positive_prompt = "",insanitylevel="0",enhance=Fa print("") print("All done!") -generateprompts(1,"",1,False,"") \ No newline at end of file +generateprompts(1,"anime assassin",0,False,"") \ No newline at end of file diff --git a/userfiles/negativewords_addon_sample.csv b/userfiles/negativewords_addon_sample.csv new file mode 100644 index 0000000..80edf0a --- /dev/null +++ b/userfiles/negativewords_addon_sample.csv @@ -0,0 +1,2 @@ +primer;negative +assassin;assassins creed \ No newline at end of file