From 7161fbf751576503a0fcb58dd67c429ef92354de Mon Sep 17 00:00:00 2001 From: shadownetdev1 Date: Sun, 21 May 2023 10:59:15 -0400 Subject: [PATCH] Update WAS_Node_Suite.py Condensed lines --- WAS_Node_Suite.py | 177 +++++++--------------------------------------- 1 file changed, 27 insertions(+), 150 deletions(-) diff --git a/WAS_Node_Suite.py b/WAS_Node_Suite.py index eb40815..a623b7d 100644 --- a/WAS_Node_Suite.py +++ b/WAS_Node_Suite.py @@ -300,7 +300,7 @@ TEXT_TYPE = "STRING" if was_config and was_config.__contains__('use_legacy_ascii_text'): if was_config['use_legacy_ascii_text']: TEXT_TYPE = "ASCII" - cstr("use_legacy_ascii_text is `True` in `was_suite_config.json`. `ASCII` type is deprecated and the default will be `TEXT` in the future.").warning.print() + cstr("use_legacy_ascii_text is `True` in `was_suite_config.json`. `ASCII` type is deprecated and the default will be `STRING` in the future.").warning.print() #! SUITE SPECIFIC CLASSES & FUNCTIONS @@ -6735,15 +6735,9 @@ class WAS_Text_Parse_Embeddings_By_Name: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text": (TEXT_TYPE, ), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } RETURN_TYPES = (TEXT_TYPE,) @@ -6831,19 +6825,10 @@ class WAS_Text_Compare: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text_a": (TEXT_TYPE, {"forceInput": True}), - "text_b": (TEXT_TYPE, {"forceInput": True}), - "mode": (["similarity","difference"],), - "tolerance": ("FLOAT", {"default":0.0,"min":0.0,"max":1.0,"step":0.01}), - } - } return { "required": { - "text_a": (TEXT_TYPE,), - "text_b": (TEXT_TYPE,), + "text_a": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "text_b": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "mode": (["similarity","difference"],), "tolerance": ("FLOAT", {"default":0.0,"min":0.0,"max":1.0,"step":0.01}), } @@ -6961,16 +6946,9 @@ class WAS_Text_Random_Line: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), } } @@ -6999,27 +6977,15 @@ class WAS_Text_Concatenate: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text_a": (TEXT_TYPE, {"forceInput": True}), - "text_b": (TEXT_TYPE, {"forceInput": True}), - "linebreak_addition": (['false','true'], ), - }, - "optional": { - "text_c": (TEXT_TYPE, {"forceInput": True}), - "text_d": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text_a": (TEXT_TYPE,), - "text_b": (TEXT_TYPE,), + "text_a": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "text_b": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "linebreak_addition": (['false','true'], ), }, "optional": { - "text_c": (TEXT_TYPE,), - "text_d": (TEXT_TYPE,), + "text_c": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "text_d": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7045,17 +7011,9 @@ class WAS_Search_and_Replace: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "find": ("STRING", {"default": '', "multiline": False}), - "replace": ("STRING", {"default": '', "multiline": False}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "find": ("STRING", {"default": '', "multiline": False}), "replace": ("STRING", {"default": '', "multiline": False}), } @@ -7083,19 +7041,12 @@ class WAS_Search_and_Replace_Input: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "find": (TEXT_TYPE, {"forceInput": True}), - "replace": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text": (TEXT_TYPE,), - "find": (TEXT_TYPE,), - "replace": (TEXT_TYPE,), } + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "find": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "replace": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + } } RETURN_TYPES = (TEXT_TYPE,) @@ -7127,18 +7078,9 @@ class WAS_Search_and_Replace_Dictionary: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "dictionary": ("DICT",), - "replacement_key": ("STRING", {"default": "__", "multiline": False}), - "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "dictionary": ("DICT",), "replacement_key": ("STRING", {"default": "__", "multiline": False}), "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), @@ -7181,21 +7123,12 @@ class WAS_Text_Parse_NSP: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "mode": (["Noodle Soup Prompts", "Wildcards"],), - "noodle_key": ("STRING", {"default": '__', "multiline": False}), - "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { "mode": (["Noodle Soup Prompts", "Wildcards"],), "noodle_key": ("STRING", {"default": '__', "multiline": False}), "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}), - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7228,17 +7161,9 @@ class WAS_Text_Save: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "path": ("STRING", {"default": '', "multiline": False}), - "filename": ("STRING", {"default": f'text_[time]', "multiline": False}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "path": ("STRING", {"default": '', "multiline": False}), "filename": ("STRING", {"default": f'text_[time]', "multiline": False}), } @@ -7357,17 +7282,10 @@ class WAS_Text_to_Conditioning: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "clip": ("CLIP",), - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { "clip": ("CLIP",), - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7388,15 +7306,9 @@ class WAS_Text_Parse_Tokens: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7468,17 +7380,10 @@ class WAS_Text_Add_Token_Input: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "token_name": (TEXT_TYPE, {"forceInput": True}), - "token_value": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "token_name": (TEXT_TYPE, ), - "token_value": (TEXT_TYPE, ), + "token_name": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "token_value": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7519,16 +7424,9 @@ class WAS_Text_to_Console: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - "label": ("STRING", {"default": f'Text Output', "multiline": False}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "label": ("STRING", {"default": f'Text Output', "multiline": False}), } } @@ -7635,16 +7533,9 @@ class WAS_Text_To_String: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - # technically redundent since TEXT_TYPE is already a string - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -7662,15 +7553,9 @@ class WAS_Text_To_Number: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text": (TEXT_TYPE, {"forceInput": True}), - } - } return { "required": { - "text": (TEXT_TYPE,), + "text": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), } } @@ -9108,18 +8993,10 @@ class WAS_Text_Input_Switch: @classmethod def INPUT_TYPES(cls): - if TEXT_TYPE == "STRING": - return { - "required": { - "text_a": (TEXT_TYPE, {"forceInput": True}), - "text_b": (TEXT_TYPE, {"forceInput": True}), - "boolean_number": ("NUMBER",), - } - } return { "required": { - "text_a": (TEXT_TYPE,), - "text_b": (TEXT_TYPE,), + "text_a": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), + "text_b": (TEXT_TYPE, {"forceInput": (True if TEXT_TYPE == 'STRING' else False)}), "boolean_number": ("NUMBER",), } } @@ -9980,4 +9857,4 @@ if show_quotes: '\033[93m"Art is the daughter of freedom."\033[0m\033[3m - Friedrich Schiller', ] print(f'\n\t\033[3m{random.choice(art_quotes)}\033[0m\n') - +