Don't use multicond parser for negative prompt counter #13118
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The negative prompt token counter uses the multicond prompt parser, which is currently only effectively used by the positive prompt when generating.
When using conds caching, if the user only changes the negative prompt, then
prompt_parser.get_multicond_prompt_list
is called only to update the negative counter, but is not called during generation. This creates issues for prompt extensions that patchget_multicond_prompt_list
to update the counter correctly. See for example ljleb/sd-webui-neutral-prompt#44Screenshots/videos:
Before (negative counter = 2/75, positive counter = 2/75):
After (negative counter = 4/75, positive counter = 2/75):
Checklist: