Skip to content

Commit 978267f

Browse files
committed
fix: correctly set preset config and loras in meta parser
1 parent e9bc5e5 commit 978267f

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

modules/config.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,6 @@ def try_get_preset_content(preset):
124124
print(e)
125125
return {}
126126

127-
128-
try:
129-
with open(os.path.abspath(f'./presets/default.json'), "r", encoding="utf-8") as json_file:
130-
config_dict.update(json.load(json_file))
131-
except Exception as e:
132-
print(f'Load default preset failed.')
133-
print(e)
134-
135127
available_presets = get_presets()
136128
preset = args_manager.args.preset
137129
config_dict.update(try_get_preset_content(preset))

modules/meta_parser.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,20 @@ def get_freeu(key: str, fallback: str | None, source_dict: dict, results: list,
169169

170170
def get_lora(key: str, fallback: str | None, source_dict: dict, results: list):
171171
try:
172-
n, w = source_dict.get(key, source_dict.get(fallback)).split(' : ')
173-
w = float(w)
174-
results.append(True)
175-
results.append(n)
176-
results.append(w)
172+
split_data = source_dict.get(key, source_dict.get(fallback)).split(' : ')
173+
enabled = True
174+
name = split_data[0]
175+
weight = split_data[1]
176+
177+
if len(split_data) == 3:
178+
enabled = split_data[0] == 'True'
179+
name = split_data[1]
180+
weight = split_data[2]
181+
182+
weight = float(weight)
183+
results.append(enabled)
184+
results.append(name)
185+
results.append(weight)
177186
except:
178187
results.append(True)
179188
results.append('None')

0 commit comments

Comments
 (0)