Skip to content
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

Don't use multicond parser for negative prompt counter #13118

Merged
merged 2 commits into from
Sep 9, 2023
Merged

Don't use multicond parser for negative prompt counter #13118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b44b85
refact
ljleb Sep 9, 2023
349f893
Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusi…
ljleb Sep 9, 2023
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
10 changes: 7 additions & 3 deletions modules/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import datetime
import functools
import mimetypes
import os
import sys
Expand Down Expand Up @@ -151,11 +152,14 @@ def connect_clear_prompt(button):
)


def update_token_counter(text, steps):
def update_token_counter(text, steps, is_positive=True):
try:
text, _ = extra_networks.parse_prompt(text)

_, prompt_flat_list, _ = prompt_parser.get_multicond_prompt_list([text])
if is_positive:
_, prompt_flat_list, _ = prompt_parser.get_multicond_prompt_list([text])
else:
prompt_flat_list = [text]
prompt_schedules = prompt_parser.get_learned_conditioning_prompt_schedules(prompt_flat_list, steps)

except Exception:
Expand Down Expand Up @@ -533,7 +537,7 @@ def create_ui():
]

toprow.token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[toprow.prompt, steps], outputs=[toprow.token_counter])
toprow.negative_token_button.click(fn=wrap_queued_call(update_token_counter), inputs=[toprow.negative_prompt, steps], outputs=[toprow.negative_token_counter])
toprow.negative_token_button.click(fn=wrap_queued_call(functools.partial(update_token_counter, is_positive=False)), inputs=[toprow.negative_prompt, steps], outputs=[toprow.negative_token_counter])

extra_networks_ui = ui_extra_networks.create_ui(txt2img_interface, [txt2img_generation_tab], 'txt2img')
ui_extra_networks.setup_ui(extra_networks_ui, txt2img_gallery)
Expand Down
Loading