Skip to content

Commit 7564dd5

Browse files
authored
fix: load image number from preset (#2611)
* fix: add default_image_number to preset handling * fix: use minimum image number of preset and config to prevent UI overflow
1 parent 978267f commit 7564dd5

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

modules/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ def init_temp_path(path: str | None, default_path: str) -> str:
485485
"default_scheduler": "scheduler",
486486
"default_overwrite_step": "steps",
487487
"default_performance": "performance",
488+
"default_image_number": "image_number",
488489
"default_prompt": "prompt",
489490
"default_prompt_negative": "negative_prompt",
490491
"default_styles": "styles",

modules/meta_parser.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ def load_parameter_button_click(raw_metadata: dict | str, is_generating: bool):
2727
loaded_parameter_dict = json.loads(raw_metadata)
2828
assert isinstance(loaded_parameter_dict, dict)
2929

30-
results = [len(loaded_parameter_dict) > 0, 1]
30+
results = [len(loaded_parameter_dict) > 0]
3131

32+
get_image_number('image_number', 'Image Number', loaded_parameter_dict, results)
3233
get_str('prompt', 'Prompt', loaded_parameter_dict, results)
3334
get_str('negative_prompt', 'Negative Prompt', loaded_parameter_dict, results)
3435
get_list('styles', 'Styles', loaded_parameter_dict, results)
@@ -92,6 +93,17 @@ def get_float(key: str, fallback: str | None, source_dict: dict, results: list,
9293
results.append(gr.update())
9394

9495

96+
def get_image_number(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
97+
try:
98+
h = source_dict.get(key, source_dict.get(fallback, default))
99+
assert h is not None
100+
h = int(h)
101+
h = min(h, modules.config.default_max_image_number)
102+
results.append(h)
103+
except:
104+
results.append(1)
105+
106+
95107
def get_steps(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
96108
try:
97109
h = source_dict.get(key, source_dict.get(fallback, default))

0 commit comments

Comments
 (0)