diff options
| -rw-r--r-- | modules/scripts.py | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/modules/scripts.py b/modules/scripts.py index 7d89979d..45230f9a 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -31,15 +31,6 @@ class Script: def show(self, is_img2img):
return True
-
- # Called when the ui for this script has been shown.
- # Useful for hiding some controls, since the scripts module sets visibility to
- # everything to true. The parameters will be the parameters returned by the ui method
- # The return value should be gradio updates, similar to what you would return
- # from a Gradio event handler.
- def on_show(self, *args):
- return [ui.gr_show(True)] * len(args)
-
# This is where the additional processing is implemented. The parameters include
# self, the model object "p" (a StableDiffusionProcessing class, see
# processing.py), and the parameters returned by the ui method.
@@ -134,35 +125,20 @@ class ScriptRunner: inputs += controls
script.args_to = len(inputs)
- def select_script(*args):
- script_index = args[0]
- on_show_updates = []
+ def select_script(script_index):
if 0 < script_index <= len(self.scripts):
script = self.scripts[script_index-1]
args_from = script.args_from
args_to = script.args_to
- script_args = args[args_from:args_to]
- 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:
args_from = 0
args_to = 0
- ret = [ ui.gr_show(True)] # always show the dropdown
- for i in range(1, len(inputs)):
- if (args_from <= i < args_to):
- if (i - args_from) < len(on_show_updates):
- ret.append( on_show_updates[i - args_from] )
- else:
- ret.append(ui.gr_show(True))
- else:
- ret.append(ui.gr_show(False))
- return ret
+ return [ui.gr_show(True if i == 0 else args_from <= i < args_to) for i in range(len(inputs))]
dropdown.change(
fn=select_script,
- inputs=inputs,
+ inputs=[dropdown],
outputs=inputs
)
@@ -222,4 +198,4 @@ def reload_scripts(basedir): load_scripts(basedir)
scripts_txt2img = ScriptRunner()
- scripts_img2img = ScriptRunner()
\ No newline at end of file + scripts_img2img = ScriptRunner()
|