mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: load image number from preset (#2611)

Browse Source 
* fix: add default_image_number to preset handling

* fix: use minimum image number of preset and config to prevent UI overflow
This commit is contained in:
Manuel Schmid 2024-03-23 12:49:20 +01:00 committed by GitHub
parent 978267f461
commit 7564dd5131
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/config.py
View File

@ -485,6 +485,7 @@ possible_preset_keys = {
"default_scheduler": "scheduler", "default_scheduler": "scheduler",
"default_overwrite_step": "steps", "default_overwrite_step": "steps",
"default_performance": "performance", "default_performance": "performance",
"default_image_number": "image_number",
"default_prompt": "prompt", "default_prompt": "prompt",
"default_prompt_negative": "negative_prompt", "default_prompt_negative": "negative_prompt",
"default_styles": "styles", "default_styles": "styles",

14
modules/meta_parser.py
View File

@ -27,8 +27,9 @@ def load_parameter_button_click(raw_metadata: dict | str, is_generating: bool):
loaded_parameter_dict = json.loads(raw_metadata) loaded_parameter_dict = json.loads(raw_metadata)
assert isinstance(loaded_parameter_dict, dict) assert isinstance(loaded_parameter_dict, dict)
results = [len(loaded_parameter_dict) > 0, 1] results = [len(loaded_parameter_dict) > 0]
get_image_number('image_number', 'Image Number', loaded_parameter_dict, results)
get_str('prompt', 'Prompt', loaded_parameter_dict, results) get_str('prompt', 'Prompt', loaded_parameter_dict, results)
get_str('negative_prompt', 'Negative Prompt', loaded_parameter_dict, results) get_str('negative_prompt', 'Negative Prompt', loaded_parameter_dict, results)
get_list('styles', 'Styles', loaded_parameter_dict, results) 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,
results.append(gr.update()) results.append(gr.update())
def get_image_number(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
try:
h = source_dict.get(key, source_dict.get(fallback, default))
assert h is not None
h = int(h)
h = min(h, modules.config.default_max_image_number)
results.append(h)
except:
results.append(1)
def get_steps(key: str, fallback: str | None, source_dict: dict, results: list, default=None): def get_steps(key: str, fallback: str | None, source_dict: dict, results: list, default=None):
try: try:
h = source_dict.get(key, source_dict.get(fallback, default)) h = source_dict.get(key, source_dict.get(fallback, default))