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

create_infotext allow index and callable, re-work Hires prompt infotext #15460

Merged
merged 5 commits into from
Apr 9, 2024
Merged

create_infotext allow index and callable, re-work Hires prompt infotext #15460

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6efdfe3
if use use_main_prompt index = 0
w-e-w Apr 7, 2024
47ed9b2
allow list or callables in generation_params
w-e-w Apr 7, 2024
219e644
re-work extra_generation_params for Hires prompt
w-e-w Apr 7, 2024
1e1176b
non-serializable as None
w-e-w Apr 8, 2024
e3aabe6
add documentation for create_infotext
w-e-w Apr 8, 2024
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
Prev Previous commit
Next Next commit
allow list or callables in generation_params
  • Loading branch information
@w-e-w
w-e-w committed Apr 7, 2024
commit 47ed9b2d398287f14a6dcab6fa4fe8b78bccf1c8
10 changes: 10 additions & 0 deletions modules/processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,16 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
"User": p.user if opts.add_user_name_to_info else None,
}

for key, value in generation_params.items():
try:
if isinstance(value, list):
generation_params[key] = value[index]
elif callable(value):
generation_params[key] = value(**locals())
except Exception:
errors.report(f'Error creating infotext for key "{key}"', exc_info=True)
generation_params[key] = None

if all_hr_prompts := all_hr_prompts or getattr(p, 'all_hr_prompts', None):
generation_params['Hires prompt'] = all_hr_prompts[index] if all_hr_prompts[index] != all_prompts[index] else None
if all_hr_negative_prompts := all_hr_negative_prompts or getattr(p, 'all_hr_negative_prompts', None):
Expand Down