Move command registration

976be98dd755b1e2ff5bb8f3f9cceef5520f6c4e

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+1 -44 Viewed

     selectContextPreset,
 } from './scripts/instruct-mode.js';
 import { initLocales, t, translate } from './scripts/i18n.js';
 import { getAvailableTokenizers, getFriendlyTokenizerName, getTokenCount, getTokenCountAsync, getTokenizerModel, initTokenizers, saveTokenCache, selectTokenizer } from './scripts/tokenizers.js';
 import {
     user_avatar,
     getUserAvatars,

     return foundName;
+}
 -async function selectTokenizerCallback(_, name) {
 -    if (!name) {
 -        return getAvailableTokenizers().find(tokenizer => tokenizer.tokenizerId === power_user.tokenizer)?.tokenizerKey ?? '';
 -    }
+-
 -    const tokenizers = getAvailableTokenizers();
 -    const fuse = new Fuse(tokenizers, { keys: ['tokenizerKey', 'tokenizerName'] });
 -    const result = fuse.search(name);
+-
 -    if (result.length === 0) {
 -        toastr.warning(`Tokenizer "${name}" not found`);
 -        return '';
 -    }
+-
 -    /** @type {import('./scripts/tokenizers.js').Tokenizer} */
 -    const foundTokenizer = result[0].item;
 -    selectTokenizer(foundTokenizer.tokenizerId);
+-
 -    return foundTokenizer.tokenizerKey;
 -}
+-
 async function enableInstructCallback() {
     $('#instruct_enabled').prop('checked', true).trigger('change');
     return '';

         `,
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
 -        name: 'tokenizer',
 -        callback: selectTokenizerCallback,
 -        returns: 'current tokenizer',
 -        unnamedArgumentList: [
 -            SlashCommandArgument.fromProps({
 -                description: 'tokenizer name',
 -                typeList: [ARGUMENT_TYPE.STRING],
 -                enumList: getAvailableTokenizers().map(tokenizer =>
 -                    new SlashCommandEnumValue(tokenizer.tokenizerKey, tokenizer.tokenizerName, enumTypes.enum, enumIcons.default)),
 -            }),
 -        ],
 -        helpString: `
 -            <div>
 -                Selects tokenizer by name. Gets the current tokenizer if no name is provided.
 -            </div>
 -            <div>
 -                <strong>Available tokenizers:</strong>
 -                <pre><code>${getAvailableTokenizers().map(t => t.tokenizerKey).join(', ')}</code></pre>
 -            </div>
 -        `
 -    }));
 -    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'instruct-on',
         callback: enableInstructCallback,
         helpString: 'Enables instruct mode.',

public/scripts/slash-commands.js+44 -1 Viewed

 import { autoSelectPersona, retriggerFirstMessageOnEmptyChat, setPersonaLockState, togglePersonaLock, user_avatar } from './personas.js';
 import { addEphemeralStoppingString, chat_styles, flushEphemeralStoppingStrings, power_user } from './power-user.js';
 import { SERVER_INPUTS, textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
 import { decodeTextTokens, getAvailableTokenizers, getFriendlyTokenizerName, getTextTokens, getTokenCountAsync, selectTokenizer } from './tokenizers.js';
 import { debounce, delay, isFalseBoolean, isTrueBoolean, showFontAwesomePicker, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
 import { registerVariableCommands, resolveVariable } from './variables.js';
 import { background_settings } from './backgrounds.js';

             </div>
         `,
     }));
 +    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
 +        name: 'tokenizer',
 +        callback: selectTokenizerCallback,
 +        returns: 'current tokenizer',
 +        unnamedArgumentList: [
 +            SlashCommandArgument.fromProps({
 +                description: 'tokenizer name',
 +                typeList: [ARGUMENT_TYPE.STRING],
 +                enumList: getAvailableTokenizers().map(tokenizer =>
 +                    new SlashCommandEnumValue(tokenizer.tokenizerKey, tokenizer.tokenizerName, enumTypes.enum, enumIcons.default)),
 +            }),
 +        ],
 +        helpString: `
 +            <div>
 +                Selects tokenizer by name. Gets the current tokenizer if no name is provided.
 +            </div>
 +            <div>
 +                <strong>Available tokenizers:</strong>
 +                <pre><code>${getAvailableTokenizers().map(t => t.tokenizerKey).join(', ')}</code></pre>
 +            </div>
 +        `,
 +    }));
     registerVariableCommands();
+}

     return textgenerationwebui_settings.server_urls[type] ?? '';
+}
 +async function selectTokenizerCallback(_, name) {
 +    if (!name) {
 +        return getAvailableTokenizers().find(tokenizer => tokenizer.tokenizerId === power_user.tokenizer)?.tokenizerKey ?? '';
 +    }
++
 +    const tokenizers = getAvailableTokenizers();
 +    const fuse = new Fuse(tokenizers, { keys: ['tokenizerKey', 'tokenizerName'] });
 +    const result = fuse.search(name);
++
 +    if (result.length === 0) {
 +        toastr.warning(`Tokenizer "${name}" not found`);
 +        return '';
 +    }
++
 +    /** @type {import('./tokenizers.js').Tokenizer} */
 +    const foundTokenizer = result[0].item;
 +    selectTokenizer(foundTokenizer.tokenizerId);
++
 +    return foundTokenizer.tokenizerKey;
 +}
++
 export let isExecutingCommandsFromChatInput = false;
 export let commandsFromChatInputAbortController;