1580158
/
OneButtonPrompt
mirror of https://github.com/AIrjen/OneButtonPrompt
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212 from ltdrdata/fix/import-and-regex 

fix: invalid import/regex
pull/213/head
AIrjen 2024-07-09 19:44:12 +02:00 committed by GitHub
parent 421853ea2e a16522d61f
commit d56d85f6f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OneButtonPromptNodes.py
View File

@ -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())

2
__init__.py
View File

@ -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']

56
build_dynamic_prompt.py
View File

@ -1,9 +1,21 @@
import random
import re
from csv_reader import *
from random_functions import *
from one_button_presets import OneButtonPresets
from superprompter.superprompter import *
if __package__ is None or __package__ == '':
# A1111 style (standalone script or direct module execution)
# Use absolute imports for compatibility with A1111 WebUI environment
from csv_reader import *
from random_functions import *
from one_button_presets import OneButtonPresets
from superprompter.superprompter import *
else:
# ComfyUI style (imported as a package)
# Use relative imports for proper integration with ComfyUI
from .csv_reader import *
from .random_functions import *
from .one_button_presets import OneButtonPresets
from .superprompter.superprompter import *
OBPresets = OneButtonPresets()
@ -4947,7 +4959,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 +4967,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 +4990,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 +5060,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('(?<!\()\s?\(', ' (', completeprompt)
completeprompt = re.sub('\)(?![\s)])', ') ', completeprompt)
completeprompt = re.sub(r'(?<!\()\s?\(', ' (', completeprompt)
completeprompt = re.sub(r'\)(?![\s)])', ') ', completeprompt)
# Move the extracted LoRA's to the end of completeprompt
#completeprompt += " " + " ".join(allLoRA)

10
superprompter/superprompter.py
View File

@ -3,7 +3,15 @@ import os
import random
import torch
from transformers import T5Tokenizer, T5ForConditionalGeneration
from superprompter.download_models import download_models
if __package__ is None or __package__ == '':
# A1111 style (standalone script or direct module execution)
# Use absolute imports for compatibility with A1111 WebUI environment
from download_models import download_models
else:
# ComfyUI style (imported as a package)
# Use relative imports for proper integration with ComfyUI
from .download_models import download_models
global tokenizer, model
script_dir = os.path.dirname(os.path.abspath(__file__)) # Script directory