Skip to content

Commit 321e13c

Browse files
committed
produce a readable error message when setting an option fails on the settings screen
1 parent ccf1a15 commit 321e13c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

modules/ui.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,7 @@ def run_settings(*args):
14391439
changed = 0
14401440

14411441
for key, value, comp in zip(opts.data_labels.keys(), args, components):
1442-
if comp != dummy_component and not opts.same_type(value, opts.data_labels[key].default):
1443-
return f"Bad value for setting {key}: {value}; expecting {type(opts.data_labels[key].default).__name__}", opts.dumpjson()
1442+
assert comp == dummy_component or opts.same_type(value, opts.data_labels[key].default), f"Bad value for setting {key}: {value}; expecting {type(opts.data_labels[key].default).__name__}"
14441443

14451444
for key, value, comp in zip(opts.data_labels.keys(), args, components):
14461445
if comp == dummy_component:
@@ -1458,7 +1457,7 @@ def run_settings(*args):
14581457

14591458
opts.save(shared.config_filename)
14601459

1461-
return f'{changed} settings changed.', opts.dumpjson()
1460+
return opts.dumpjson(), f'{changed} settings changed.'
14621461

14631462
def run_settings_single(value, key):
14641463
if not opts.same_type(value, opts.data_labels[key].default):
@@ -1622,9 +1621,9 @@ def request_restart():
16221621

16231622
text_settings = gr.Textbox(elem_id="settings_json", value=lambda: opts.dumpjson(), visible=False)
16241623
settings_submit.click(
1625-
fn=run_settings,
1624+
fn=wrap_gradio_call(run_settings, extra_outputs=[gr.update()]),
16261625
inputs=components,
1627-
outputs=[result, text_settings],
1626+
outputs=[text_settings, result],
16281627
)
16291628

16301629
for i, k, item in quicksettings_list:

0 commit comments

Comments
 (0)