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

fix: correctly set preset config and loras in meta parser

Browse Source
This commit is contained in:
Manuel Schmid 2024-03-20 21:12:21 +01:00 committed by Manuel Schmid
parent e9bc5e50c6
commit 978267f461
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/config.py
View File

@ -124,14 +124,6 @@ def try_get_preset_content(preset):
print(e) print(e)
return {} return {}
try:
with open(os.path.abspath(f'./presets/default.json'), "r", encoding="utf-8") as json_file:
config_dict.update(json.load(json_file))
except Exception as e:
print(f'Load default preset failed.')
print(e)
available_presets = get_presets() available_presets = get_presets()
preset = args_manager.args.preset preset = args_manager.args.preset
config_dict.update(try_get_preset_content(preset)) config_dict.update(try_get_preset_content(preset))

19
modules/meta_parser.py
View File

@ -169,11 +169,20 @@ def get_freeu(key: str, fallback: str | None, source_dict: dict, results: list,
def get_lora(key: str, fallback: str | None, source_dict: dict, results: list): def get_lora(key: str, fallback: str | None, source_dict: dict, results: list):
try: try:
n, w = source_dict.get(key, source_dict.get(fallback)).split(' : ') split_data = source_dict.get(key, source_dict.get(fallback)).split(' : ')
w = float(w) enabled = True
results.append(True) name = split_data[0]
results.append(n) weight = split_data[1]
results.append(w)
if len(split_data) == 3:
enabled = split_data[0] == 'True'
name = split_data[1]
weight = split_data[2]
weight = float(weight)
results.append(enabled)
results.append(name)
results.append(weight)
except: except:
results.append(True) results.append(True)
results.append('None') results.append('None')