nodes/sn0w12-ComfyUI-Sn0w-Scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update prompt combine simplify logic

Browse Source
This commit is contained in:
sn0w12
2024-02-20 18:16:41 +01:00
parent 65367665e5
commit 4ed41fc55a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prompt_combine.py
+10 -11
View File
@@ -23,11 +23,11 @@ class CombineStringNode:
# Configuration for special phrases
special_phrases = {
'eye': {
'remove': ['covering eyes', 'over eyes', 'covered eyes', 'covering face', 'covering own eyes', 'from behind', 'facing away', 'penis over eyes'],
'remove': ['covering eyes', 'over eyes', 'covered eyes', 'covering face', 'covering own eyes', 'from behind', 'facing away'],
'keep': ['looking at viewer']
},
'sclera': {
'remove': ['covering eyes', 'over eyes', 'covered eyes', 'covering face', 'covering own eyes', 'from behind', 'facing away', 'penis over eyes'],
'remove': ['covering eyes', 'over eyes', 'covered eyes', 'covering face', 'covering own eyes', 'from behind', 'facing away'],
'keep': ['looking at viewer']
},
'mouth': {
@@ -57,6 +57,13 @@ class CombineStringNode:
# Check for 'keep' conditions globally
global_keep_conditions = {keyword: any(keep_phrase in tags_string for keep_phrase in conditions['keep']) for keyword, conditions in special_phrases.items()}
# Identify tags that should not be removed because they are contained in 'remove' phrases
non_removable_tags = set()
for tag in tags:
for keyword, conditions in special_phrases.items():
if any(remove_phrase in tag for remove_phrase in conditions['remove']):
non_removable_tags.add(tag)
for tag in tags:
if tag in tag_map:
# Append non-superior tags to removed_tags if their superior counterparts are not already included
@@ -67,8 +74,7 @@ class CombineStringNode:
should_remove_tag = False
for keyword, conditions in special_phrases.items():
if keyword in tag:
# Ensure the tag itself is not in the 'remove' array to be preserved
if tag not in conditions['remove'] and not global_keep_conditions[keyword] and any(remove_phrase in tags_string for remove_phrase in conditions['remove']):
if not global_keep_conditions[keyword] and any(remove_phrase in tags_string for remove_phrase in conditions['remove']) and tag not in non_removable_tags:
should_remove_tag = True
break
@@ -91,13 +97,6 @@ class CombineStringNode:
simplified_tags_string = ', '.join(final_tags)
return simplified_tags_string, removed_tags
# Remove duplicates in the removed_tags list by converting it to a set and back to a list
removed_tags = list(set(removed_tags))
# Join the final list of tags back into a string
simplified_tags_string = ', '.join(final_tags)
return simplified_tags_string, removed_tags
def combine_string(self, separator, simplify, **kwargs):
strings = [kwargs.get(f"string_{char}") for char in ['a', 'b', 'c', 'd'] if kwargs.get(f"string_{char}") is not None]