Improved feedback for bad user input

app.py

@@ -665,10 +665,10 @@ with gr.Blocks(
     def token_selected(
         meta: MetadataState,
         key: str,
-        choice: int,
+        choice: int | None,
         indices: list[int],
     ):
-        if choice < 0 or choice >= len(indices) or (token := indices[choice]) < 0:
+        if choice is None or choice < 0 or choice >= len(indices) or (token := indices[choice]) < 0:
             raise gr.Error('Token not found')
 
         tokens = meta.key.get('tokenizer.ggml.tokens', (-1, []))[1]
@@ -748,14 +748,16 @@ with gr.Blocks(
 
         match key:
             case 'tokenizer.ggml.scores' | 'tokenizer.ggml.token_type':
-                if choice >= 0 and choice < len(indices) and (token := indices[choice]) >= 0:
-                    tok = meta.add.setdefault(key, (typ, {}))[1]
-                    tok[str(token)] = val + 1 if key == 'tokenizer.ggml.token_type' else val
-
-                    data = meta.key.setdefault(key, (typ, [0.0 if key == 'tokenizer.ggml.scores' else int(TokenType.NORMAL)] * len(meta.key.get('tokenizer.ggml.tokens', (-1, []))[1])))[1]
-                    if data:
-                        for k, v in tok.items():
-                            data[int(k)] = v
+                if choice is None or choice < 0 or choice >= len(indices) or (token := indices[choice]) < 0:
+                    raise gr.Error('Token not found')
+
+                tok = meta.add.setdefault(key, (typ, {}))[1]
+                tok[str(token)] = val + 1 if key == 'tokenizer.ggml.token_type' else val
+
+                data = meta.key.setdefault(key, (typ, [0.0 if key == 'tokenizer.ggml.scores' else int(TokenType.NORMAL)] * len(meta.key.get('tokenizer.ggml.tokens', (-1, []))[1])))[1]
+                if data:
+                    for k, v in tok.items():
+                        data[int(k)] = v
             case _:
                 meta.key[key] = meta.add[key] = (typ, val)