diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-11-05 19:30:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 19:30:57 +0300 |
| commit | ff805d8d0eb8e3de42f04747de0d1c7354491810 (patch) | |
| tree | c6e557895ff3172bad42da469a6912ac718078a1 /modules/scripts.py | |
| parent | 44c5097375ae4cf40300c09473bb46cf6c5d6cb7 (diff) | |
| parent | c3699d4fd185d5a7285c5519f9bb4b6fec236d9f (diff) | |
Merge branch 'dev' into master
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..5c6e0226 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:
+ 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(
|