diff options
| author | ljleb <lebel.louisjacob@gmail.com> | 2023-09-09 06:06:04 +0000 |
|---|---|---|
| committer | ljleb <lebel.louisjacob@gmail.com> | 2023-09-09 06:06:04 +0000 |
| commit | 349f89302445e094394685c13c1ce95cd14975b8 (patch) | |
| tree | b0495d9294310e3337af3ff469217dbe9601feb7 /modules/scripts.py | |
| parent | 7b44b85730d392733a285fe7e5c9e077f7bbccd3 (diff) | |
| parent | 329c8ab93216f9e77002e68aab418d63d82cd872 (diff) | |
| download | stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.tar.gz stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.tar.bz2 stable-diffusion-webui-gfx803-349f89302445e094394685c13c1ce95cd14975b8.zip | |
Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into fix-counter
Diffstat (limited to 'modules/scripts.py')
| -rw-r--r-- | modules/scripts.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/scripts.py b/modules/scripts.py index e8518ad0..f1f17a5f 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -491,11 +491,15 @@ class ScriptRunner: arg_info = api_models.ScriptArg(label=control.label or "")
- for field in ("value", "minimum", "maximum", "step", "choices"):
+ for field in ("value", "minimum", "maximum", "step"):
v = getattr(control, field, None)
if v is not None:
setattr(arg_info, field, v)
+ choices = getattr(control, 'choices', None) # as of gradio 3.41, some items in choices are strings, and some are tuples where the first elem is the string
+ if choices is not None:
+ setattr(arg_info, 'choices', [x[0] if isinstance(x, tuple) else x for x in choices])
+
api_args.append(arg_info)
script.api_info = api_models.ScriptInfo(
|