Skip to content

Updated textcombiner 2 and 3 nodes for clarity #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeremymeyers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated textcombiner 2 and 3 nodes for clarity #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 39 additions & 29 deletions mikey_nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,7 +3981,7 @@ def paste(self, background_image, foreground_image, x_position, y_position):
return (pil2tensor(background_image),)

class TextCombinations2:
texts = ['text1', 'text2', 'text1 + text2']
texts = ['text1', 'text2', 'text1 + text2', 'text2 + text1']
outputs = ['output1','output2']

@classmethod
Expand All @@ -3997,7 +3997,8 @@ def INPUT_TYPES(cls):
cls.operations = cls.generate_combinations(cls.texts, cls.outputs)
return {'required': {'text1': ('STRING', {'multiline': True, 'default': 'Text 1'}),
'text2': ('STRING', {'multiline': True, 'default': 'Text 2'}),
'operation': (cls.operations, {'default':cls.operations[0]}),
'output_1_contents': (cls.operations, {'default':cls.operations[0]}),
'output_2_contents': (cls.operations, {'default':cls.operations[1] if len(cls.operations) > 1 else cls.operations[0]}),
'delimiter': ('STRING', {'default': ' '}),
'use_seed': (['true','false'], {'default': 'false'}),
'seed': ('INT', {'default': 0, 'min': 0, 'max': 0xffffffffffffffff})},
Expand All @@ -4008,36 +4009,39 @@ def INPUT_TYPES(cls):
FUNCTION = 'mix'
CATEGORY = 'Mikey/Text'

def mix(self, text1, text2, operation, delimiter, use_seed, seed, extra_pnginfo, prompt):
def mix(self, text1, text2, output_1_contents, output_2_contents, delimiter, use_seed, seed, extra_pnginfo, prompt):
# search and replace
text1 = search_and_replace(text1, extra_pnginfo, prompt)
text2 = search_and_replace(text2, extra_pnginfo, prompt)

text_dict = {'text1': text1, 'text2': text2}

# Process output_1_contents
if use_seed == 'true' and len(self.operations) > 0:
offset = seed % len(self.operations)
operation = self.operations[offset]
output_1_contents = self.operations[offset]
# Adjust offset for output_2 to be different
offset_2 = (offset + 1) % len(self.operations)
output_2_contents = self.operations[offset_2]

# Parsing the operation string
ops = operation.split(", ")
output_texts = [op.split(" to ")[0] for op in ops]

# Generate the outputs
# Generate outputs
outputs = []

for output_text in output_texts:
for output_content in [output_1_contents, output_2_contents]:
# Split the string by '+' to identify individual text components
components = output_text.split(" + ")

components = output_content.split(" + ")
# Generate the final string for each output
final_output = delimiter.join(eval(comp, {}, text_dict) for comp in components)

outputs.append(final_output)

return tuple(outputs)

class TextCombinations3:
texts = ['text1', 'text2', 'text3', 'text1 + text2', 'text1 + text3', 'text2 + text3', 'text1 + text2 + text3']
texts = ['text1', 'text2', 'text3', 'text1 + text2', 'text1 + text3', 'text2 + text3', 'text1 + text2 + text3',
'text2 + text1', 'text3 + text1', 'text3 + text2', 'text2 + text3 + text1', 'text3 + text1 + text2',
'text3 + text2 + text1', 'text1 + text3 + text2']
outputs = ['output1','output2','output3']

@classmethod
Expand All @@ -4054,7 +4058,9 @@ def INPUT_TYPES(cls):
return {'required': {'text1': ('STRING', {'multiline': True, 'default': 'Text 1'}),
'text2': ('STRING', {'multiline': True, 'default': 'Text 2'}),
'text3': ('STRING', {'multiline': True, 'default': 'Text 3'}),
'operation': (cls.operations, {'default':cls.operations[0]}),
'output_1_contents': (cls.operations, {'default':cls.operations[0]}),
'output_2_contents': (cls.operations, {'default':cls.operations[1] if len(cls.operations) > 1 else cls.operations[0]}),
'output_3_contents': (cls.operations, {'default':cls.operations[2] if len(cls.operations) > 2 else cls.operations[0]}),
'delimiter': ('STRING', {'default': ' '}),
'use_seed': (['true','false'], {'default': 'false'}),
'seed': ('INT', {'default': 0, 'min': 0, 'max': 0xffffffffffffffff})},
Expand All @@ -4065,31 +4071,35 @@ def INPUT_TYPES(cls):
FUNCTION = 'mix'
CATEGORY = 'Mikey/Text'

def mix(self, text1, text2, text3, operation, delimiter, use_seed, seed, extra_pnginfo, prompt):
def mix(self, text1, text2, text3, output_1_contents, output_2_contents, output_3_contents, delimiter, use_seed, seed, extra_pnginfo, prompt):
# search and replace
text1 = search_and_replace(text1, extra_pnginfo, prompt)
text2 = search_and_replace(text2, extra_pnginfo, prompt)
text3 = search_and_replace(text3, extra_pnginfo, prompt)

text_dict = {'text1': text1, 'text2': text2, 'text3': text3}

# Process outputs with seed support
if use_seed == 'true' and len(self.operations) > 0:
offset = seed % len(self.operations)
operation = self.operations[offset]

# Parsing the operation string
ops = operation.split(", ")
output_texts = [op.split(" to ")[0] for op in ops]

# Generate the outputs
output_1_contents = self.operations[offset]
# Offset for output_2 to be different
offset_2 = (offset + 1) % len(self.operations)
output_2_contents = self.operations[offset_2]
# Offset for output_3 to be different
offset_3 = (offset + 2) % len(self.operations)
output_3_contents = self.operations[offset_3]

# Generate outputs
outputs = []

for output_text in output_texts:
for output_content in [output_1_contents, output_2_contents, output_3_contents]:
# Split the string by '+' to identify individual text components
components = output_text.split(" + ")

components = output_content.split(" + ")
# Generate the final string for each output
final_output = delimiter.join(eval(comp, {}, text_dict) for comp in components)

outputs.append(final_output)

return tuple(outputs)
Expand Down