Small update to enum display + consistency

b68969ee3b9ae3fdac13b39f5492c811ee28f95d

Wolfsblvt <wolfsblvt@gmail.com>

Parents: 53c71d80598bca435df9c97de54432bf7b8dab7c

public/script.js+8 -6 Viewed

 async function selectTokenizerCallback(_, name) {
     if (!name) {
-        return getFriendlyTokenizerName(main_api).tokenizerName;
+        return getAvailableTokenizers().find(tokenizer => tokenizer.tokenizerId === power_user.tokenizer)?.tokenizerKey ?? '';
+    }
     const tokenizers = getAvailableTokenizers();
-    const fuse = new Fuse(tokenizers, { keys: ['tokenizerName'] });
+    const fuse = new Fuse(tokenizers, { keys: ['tokenizerKey', 'tokenizerName'] });
     const result = fuse.search(name);
     if (result.length === 0) {

@@ -8465,9 +8465,11 @@ async function selectTokenizerCallback(_, name) {
8465	return '';	8465	return '';
8466	}	8466	}
8467		8467
		8468	/** @type {import('./scripts/tokenizers.js').Tokenizer} */
8468	const foundTokenizer = result[0].item;	8469	const foundTokenizer = result[0].item;
8469	selectTokenizer(foundTokenizer.tokenizerName, foundTokenizer.tokenizerId);	8470	selectTokenizer(foundTokenizer.tokenizerId);
8470	return foundTokenizer.tokenizerName;	8471
		8472	return foundTokenizer.tokenizerKey;
8471	}	8473	}
8472		8474
8473	async function enableInstructCallback() {	8475	async function enableInstructCallback() {

                 description: 'tokenizer name',
                 typeList: [ARGUMENT_TYPE.STRING],
                 enumList: getAvailableTokenizers().map(tokenizer =>
-                    new SlashCommandEnumValue(tokenizer.tokenizerName, null, enumTypes.enum, enumIcons.default)),
+                    new SlashCommandEnumValue(tokenizer.tokenizerKey, tokenizer.tokenizerName, enumTypes.enum, enumIcons.default)),
             }),
         ],
         helpString: `

             </div>
             <div>
                 <strong>Available tokenizers:</strong>
-                <pre><code>${getAvailableTokenizers().map(t => t.tokenizerName).join(', ')}</code></pre>
+                <pre><code>${getAvailableTokenizers().map(t => t.tokenizerKey).join(', ')}</code></pre>
             </div>
+        `
     }));

public/scripts/tokenizers.js+22 -8 Viewed

+}
 /**
+ * @typedef {object} Tokenizer
+ * @property {number} tokenizerId - The id of the tokenizer option
+ * @property {string} tokenizerKey - Internal name/key of the tokenizer
+ * @property {string} tokenizerName - Human-readable detailed name of the tokenizer (as displayed in the UI)
+ */
+/**
  * Gets all tokenizers available to the user.
- * @returns { { tokenizerName: string, tokenizerId: number }[] } Tokenizer info.
+ * @returns {Tokenizer[]} Tokenizer info.
  */
 export function getAvailableTokenizers() {
     const tokenizerOptions = $('#tokenizer').find('option').toArray();
     return tokenizerOptions.map(tokenizerOption => ({
-        tokenizerName: tokenizerOption.text,
         tokenizerId: Number(tokenizerOption.value),
+        tokenizerKey: Object.entries(tokenizers).find(([_, value]) => value === Number(tokenizerOption.value))[0].toLocaleLowerCase(),
+        tokenizerName: tokenizerOption.text,
     }))
+}
 /**
  * Selects tokenizer if not already selected.
- * @param {string} tokenizerName Tokenizer name.
  * @param {number} tokenizerId Tokenizer ID.
  */
-export function selectTokenizer(tokenizerName, tokenizerId) {
+export function selectTokenizer(tokenizerId) {
     if (tokenizerId !== power_user.tokenizer) {
-        $('#tokenizer').val(tokenizerId).trigger('change');
+        const tokenizer = getAvailableTokenizers().find(tokenizer => tokenizer.tokenizerId === tokenizerId);
-        toastr.info(`Tokenizer: "${tokenizerName}" selected`);
+        if (!tokenizer) {
+            console.warn('Failed to find tokenizer with id', tokenizerId);
+            return;
+        }
+        $('#tokenizer').val(tokenizer.tokenizerId).trigger('change');
+        toastr.info(`Tokenizer: "${tokenizer.tokenizerName}" selected`);
+    }
+}
 /**
  * Gets the friendly name of the current tokenizer.
  * @param {string} forApi API to get the tokenizer for. Defaults to the main API.
- * @returns { { tokenizerName: string, tokenizerId: number } } Tokenizer info
+ * @returns {Tokenizer} Tokenizer info
  */
 export function getFriendlyTokenizerName(forApi) {
     if (!forApi) {

         ? tokenizers.OPENAI
         : tokenizerId;
-    return { tokenizerName, tokenizerId };
+    const tokenizerKey = Object.entries(tokenizers).find(([_, value]) => value === tokenizerId)[0].toLocaleLowerCase();
+    return { tokenizerName, tokenizerKey, tokenizerId };
+}
 /**