diff --git a/OneButtonPromptNodes.py b/OneButtonPromptNodes.py index 81adc6a..bd13c7b 100644 --- a/OneButtonPromptNodes.py +++ b/OneButtonPromptNodes.py @@ -10,10 +10,10 @@ onebuttonprompt_path = os.path.join(custom_nodes_path, "OneButtonPrompt") sys.path.append(onebuttonprompt_path) -from build_dynamic_prompt import * -from csv_reader import * +from .build_dynamic_prompt import * +from .csv_reader import * -from one_button_presets import OneButtonPresets +from .one_button_presets import OneButtonPresets OBPresets = OneButtonPresets() allpresets = [OBPresets.RANDOM_PRESET_OBP] + list(OBPresets.opb_presets.keys()) diff --git a/__init__.py b/__init__.py index a42abda..4fa0a44 100644 --- a/__init__.py +++ b/__init__.py @@ -6,6 +6,6 @@ custom_nodes_path = os.path.join(folder_paths.base_path, "custom_nodes") onebuttonprompt_path = os.path.join(custom_nodes_path, "OneButtonPrompt") sys.path.append(onebuttonprompt_path) -from OneButtonPromptNodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS +from .OneButtonPromptNodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS __all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS'] \ No newline at end of file diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 9b225a0..fd82e43 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -1,9 +1,9 @@ import random import re -from csv_reader import * -from random_functions import * -from one_button_presets import OneButtonPresets -from superprompter.superprompter import * +from .csv_reader import * +from .random_functions import * +from .one_button_presets import OneButtonPresets +from .superprompter.superprompter import * OBPresets = OneButtonPresets() @@ -4947,7 +4947,7 @@ def cleanup(completeprompt, advancedprompting, insanitylevel = 5): completeprompt = completeprompt.replace("|", " ") # sometimes if there are not enough artist, we get left we things formed as (:1.2) - completeprompt = re.sub('\(\:\d+\.\d+\)', '', completeprompt) + completeprompt = re.sub(r'\(\:\d+\.\d+\)', '', completeprompt) # lets also remove some wierd stuff on lower insanitylevels if(insanitylevel < 7): @@ -4955,16 +4955,16 @@ def cleanup(completeprompt, advancedprompting, insanitylevel = 5): completeprompt = completeprompt.replace("fluorescent", " ") # all cleanup steps moved here - completeprompt = re.sub('\[ ', '[', completeprompt) - completeprompt = re.sub('\[,', '[', completeprompt) - completeprompt = re.sub(' \]', ']', completeprompt) - completeprompt = re.sub(' \|', '|', completeprompt) - #completeprompt = re.sub(' \"', '\"', completeprompt) - #completeprompt = re.sub('\" ', '\"', completeprompt) - completeprompt = re.sub('\( ', '(', completeprompt) - completeprompt = re.sub(' \(', '(', completeprompt) - completeprompt = re.sub('\) ', ')', completeprompt) - completeprompt = re.sub(' \)', ')', completeprompt) + completeprompt = re.sub(r'\[ ', '[', completeprompt) + completeprompt = re.sub(r'\[,', '[', completeprompt) + completeprompt = re.sub(r' \]', ']', completeprompt) + completeprompt = re.sub(r' \|', '|', completeprompt) + #completeprompt = re.sub(r' \"', '\"', completeprompt) + #completeprompt = re.sub(r'\" ', '\"', completeprompt) + completeprompt = re.sub(r'\( ', '(', completeprompt) + completeprompt = re.sub(r' \(', '(', completeprompt) + completeprompt = re.sub(r'\) ', ')', completeprompt) + completeprompt = re.sub(r' \)', ')', completeprompt) completeprompt = re.sub(' :', ':', completeprompt) completeprompt = re.sub(',::', '::', completeprompt) @@ -4978,7 +4978,7 @@ def cleanup(completeprompt, advancedprompting, insanitylevel = 5): completeprompt = re.sub(' ,', ',', completeprompt) completeprompt = re.sub(' ,', ',', completeprompt) completeprompt = re.sub(' ,', ',', completeprompt) - completeprompt = re.sub(',\(', ', (', completeprompt) + completeprompt = re.sub(r',\(', ', (', completeprompt) @@ -5048,17 +5048,17 @@ def cleanup(completeprompt, advancedprompting, insanitylevel = 5): completeprompt = re.sub(' mans', ' men', completeprompt) completeprompt = re.sub(' Womans,', ' Women', completeprompt) completeprompt = re.sub(' womans,', ' women,', completeprompt) - completeprompt = re.sub('\(Mans', '(Men,', completeprompt) - completeprompt = re.sub('\(mans', '(men', completeprompt) - completeprompt = re.sub('\(Womans', '(Women', completeprompt) - completeprompt = re.sub('\(womans', '(women', completeprompt) + completeprompt = re.sub(r'\(Mans', '(Men,', completeprompt) + completeprompt = re.sub(r'\(mans', '(men', completeprompt) + completeprompt = re.sub(r'\(Womans', '(Women', completeprompt) + completeprompt = re.sub(r'\(womans', '(women', completeprompt) completeprompt = re.sub('-sameothersubject-', 'it', completeprompt) completeprompt = re.sub('-samehumansubject-', 'the person', completeprompt) - completeprompt = re.sub('(?