michael/stable-diffusion-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle case where on_show returns the wrong number of arguments

Browse source
This commit is contained in:
Tony Beeman 2022-10-08 10:40:30 -07:00 committed by AUTOMATIC1111
parent 86cb16886f
commit cbf6dad02d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/scripts.py
View file

@ -143,6 +143,8 @@ class ScriptRunner:
args_to = script.args_to args_to = script.args_to
script_args = args[args_from:args_to] script_args = args[args_from:args_to]
on_show_updates = wrap_call(script.on_show, script.filename, "on_show", *script_args) on_show_updates = wrap_call(script.on_show, script.filename, "on_show", *script_args)
if (len(on_show_updates) != (args_to - args_from)):
print("Error in custom script (" + script.filename + "): on_show() method should return the same number of arguments as ui().", file=sys.stderr)
else: else:
args_from = 0 args_from = 0
args_to = 0 args_to = 0
@ -150,13 +152,14 @@ class ScriptRunner:
ret = [ ui.gr_show(True)] # always show the dropdown ret = [ ui.gr_show(True)] # always show the dropdown
for i in range(1, len(inputs)): for i in range(1, len(inputs)):
if (args_from <= i < args_to): if (args_from <= i < args_to):
ret.append( on_show_updates[i - args_from] ) if (i - args_from) < len(on_show_updates):
ret.append( on_show_updates[i - args_from] )
else:
ret.append(ui.gr_show(True))
else: else:
ret.append(ui.gr_show(False)) ret.append(ui.gr_show(False))
return ret return ret
# return [ui.gr_show(True if (i == 0) else on_show_updates[i - args_from] if args_from <= i < args_to else False) for i in range(len(inputs))]
dropdown.change( dropdown.change(
fn=select_script, fn=select_script,
inputs=inputs, inputs=inputs,