Move NovelAI settings to respective module (#4238) * Move NovelAI settings to respective module * Update public/scripts/nai-settings.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

2f56a733684daf66e564f07399915388f1fca6c4

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

Signed

Parents: 88ef9ca0dea61d409616deddf33d8eb0efd6dae2

public/script.js+7 -71 Viewed

     generateNovelWithStreaming,
     getNovelGenerationData,
     getKayraMaxContextTokens,
 -    getNovelTier,
 -    loadNovelPreset,
     loadNovelSettings,
     nai_settings,
     adjustNovelInstructionPrompt,
 -    loadNovelSubscriptionData,
     parseNovelAILogprobs,
 +    novelai_settings,
 +    novelai_setting_names,
 +    initNovelAISettings,
 } from './scripts/nai-settings.js';
 import {

     SECRET_KEYS,
     initSecrets,
     readSecretState,
 -    secret_state,
     writeSecret,
 } from './scripts/secrets.js';
 import { EventEmitter } from './lib/eventemitter.js';

     findItemizedPromptSet,
     koboldai_settings,
     koboldai_setting_names,
 +    novelai_settings,
 +    novelai_setting_names,
 };
 /**

 export let extension_prompts = {};
 export let main_api;// = "kobold";
 -//novel settings
 -export let novelai_settings;
 -export let novelai_setting_names;
 /** @type {AbortController} */
 let abortController;

     initTextGenModels();
     initOpenAI();
     initKoboldSettings();
 +    initNovelAISettings();
     initSystemPrompts();
     initExtensions();
     initExtensionSlashCommands();

     return resultCheckStatus();
+}
 -async function getStatusNovel() {
 -    try {
 -        const result = await loadNovelSubscriptionData();
+-
 -        if (!result) {
 -            throw new Error('Could not load subscription data');
 -        }
+-
 -        setOnlineStatus(getNovelTier());
 -    } catch {
 -        setOnlineStatus('no_connection');
 -    }
+-
 -    resultCheckStatus();
 -}
+-
 export function startStatusLoading() {
     $('.api_loading').show();
     $('.api_button').addClass('disabled');

         // Allow subscribers to mutate settings
         await eventSource.emit(event_types.SETTINGS_LOADED_BEFORE, settings);
 -        novelai_setting_names = data.novelai_setting_names;
 -        novelai_settings = data.novelai_settings;
 -        novelai_settings.forEach(function (item, i, arr) {
 -            novelai_settings[i] = JSON.parse(item);
 -        });
 -        const arr_holder = {};
+-
 -        $('#settings_preset_novel').empty();
+-
 -        novelai_setting_names.forEach(function (item, i, arr) {
 -            arr_holder[item] = i;
 -            $('#settings_preset_novel').append(`<option value=${i}>${item}</option>`);
 -        });
 -        novelai_setting_names = {};
 -        novelai_setting_names = arr_holder;
+-
         //Load AI model config settings
         amount_gen = settings.amount_gen;
         if (settings.max_context !== undefined)

         loadKoboldSettings(data, settings.kai_settings ?? settings, settings);
         // Novel
         loadNovelSettings(data, settings.nai_settings ?? settings);
 -        $(`#settings_preset_novel option[value=${novelai_setting_names[nai_settings.preset_settings_novel]}]`).attr('selected', 'true');
         // TextGen
         loadTextGenSettings(data, settings);

         getStatusTextgen();
     });
 -    $('#api_button_novel').on('click', async function (e) {
 -        e.stopPropagation();
 -        const api_key_novel = String($('#api_key_novel').val()).trim();
+-
 -        if (api_key_novel.length) {
 -            await writeSecret(SECRET_KEYS.NOVEL, api_key_novel);
 -        }
+-
 -        if (!secret_state[SECRET_KEYS.NOVEL]) {
 -            console.log('No secret key saved for NovelAI');
 -            return;
 -        }
+-
 -        startStatusLoading();
 -        // Check near immediately rather than waiting for up to 90s
 -        await getStatusNovel();
 -    });
     const button = $('#options_button');
     const menu = $('#options');

         is_delete_mode = false;
     });
 -    $('#settings_preset_novel').on('change', function () {
 -        nai_settings.preset_settings_novel = $('#settings_preset_novel')
 -            .find(':selected')
 -            .text();
+-
 -        const preset = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]];
 -        loadNovelPreset(preset);
 -        amount_gen = Number($('#amount_gen').val());
 -        max_context = Number($('#max_context').val());
+-
 -        saveSettingsDebounced();
 -    });
+-
     $('#main_api').on('change', function () {
         cancelStatusCheck('Canceled because main api changed');
         changeMainAPI();

public/scripts/nai-settings.js+81 -19 Viewed

     abortStatusCheck,
     getRequestHeaders,
     getStoppingStrings,
     novelai_setting_namesresultCheckStatus,
     saveSettingsDebounced,
     setGenerationParamsFromPreset,
 +    setOnlineStatus,
 +    startStatusLoading,
 } from '../script.js';
 import { MAX_CONTEXT_DEFAULT, MAX_RESPONSE_DEFAULT, power_user } from './power-user.js';
 import { getTextTokens, tokenizers } from './tokenizers.js';

     onlyUnique,
 } from './utils.js';
 import { BIAS_CACHE, createNewLogitBiasEntry, displayLogitBias, getLogitBiasListResult } from './logit-bias.js';
 +import { SECRET_KEYS, secret_state, writeSecret } from './secrets.js';
 const default_preamble = '[ Style: chat, complex, sensory, visceral ]';
 const default_order = [1, 5, 0, 2, 3, 4];

     'llama-3-erato-v1': 'Erato-Dragonfruit',
 };
 +export let novelai_settings;
 +export let novelai_setting_names;
++
 export const nai_settings = {
     temperature: 1.5,
     repetition_penalty: 2.25,

     loadNovelSettingsUi(nai_settings);
+}
 export function loadNovelSettings(data, settings) {
 +    novelai_setting_names = data.novelai_setting_names;
 +    novelai_settings = data.novelai_settings;
 +    novelai_settings.forEach(function (item, i, arr) {
 +        novelai_settings[i] = JSON.parse(item);
 +    });
++
 +    $('#settings_preset_novel').empty();
 +    const presetNames = {};
 +    novelai_setting_names.forEach(function (item, i, arr) {
 +        presetNames[item] = i;
 +        $('#settings_preset_novel').append(`<option value=${i}>${item}</option>`);
 +    });
 +    novelai_setting_names = presetNames;
++
     //load the rest of the Novel settings without any checks
     nai_settings.model_novel = settings.model_novel;
     $('#model_novel_select').val(nai_settings.model_novel);

     $('#math1_quad_counter_novel').val(Number(ui_settings.math1_quad).toFixed(2));
     $('#math1_quad_entropy_scale_novel').val(ui_settings.math1_quad_entropy_scale);
     $('#math1_quad_entropy_scale_counter_novel').val(Number(ui_settings.math1_quad_entropy_scale).toFixed(2));
 +    $(`#settings_preset_novel option[value=${novelai_setting_names[nai_settings.preset_settings_novel]}]`).prop('selected', true);
     $('#streaming_novel').prop('checked', ui_settings.streaming_novel);
     sortItemsByOrder(ui_settings.order);

         sliderId: '#temp_novel',
         counterId: '#temp_counter_novel',
         format: (val) => Number(val).toFixed(2),
         setValue: (val) => { nai_settings.temperature = Number(val).toFixed(2); },
     },
+    {
         sliderId: '#rep_pen_novel',
         counterId: '#rep_pen_counter_novel',
         format: (val) => Number(val).toFixed(3),
         setValue: (val) => { nai_settings.repetition_penalty = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#rep_pen_size_novel',
         counterId: '#rep_pen_size_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.repetition_penalty_range = Number(val).toFixed(0); },
     },
+    {
         sliderId: '#rep_pen_slope_novel',
         counterId: '#rep_pen_slope_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.repetition_penalty_slope = Number(val).toFixed(2); },
     },
+    {
         sliderId: '#rep_pen_freq_novel',
         counterId: '#rep_pen_freq_counter_novel',
         format: (val) => Number(val).toFixed(2),
         setValue: (val) => { nai_settings.repetition_penalty_frequency = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#rep_pen_presence_novel',
         counterId: '#rep_pen_presence_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.repetition_penalty_presence = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#tail_free_sampling_novel',
         counterId: '#tail_free_sampling_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.tail_free_sampling = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#top_k_novel',
         counterId: '#top_k_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.top_k = Number(val).toFixed(0); },
     },
+    {
         sliderId: '#top_p_novel',
         counterId: '#top_p_counter_novel',
         format: (val) => Number(val).toFixed(3),
         setValue: (val) => { nai_settings.top_p = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#top_a_novel',
         counterId: '#top_a_counter_novel',
         format: (val) => Number(val).toFixed(2),
         setValue: (val) => { nai_settings.top_a = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#typical_p_novel',
         counterId: '#typical_p_counter_novel',
         format: (val) => Number(val).toFixed(3),
         setValue: (val) => { nai_settings.typical_p = Number(val).toFixed(3); },
     },
+    {
         sliderId: '#mirostat_tau_novel',
         counterId: '#mirostat_tau_counter_novel',
         format: (val) => Number(val).toFixed(2),
         setValue: (val) => { nai_settings.mirostat_tau = Number(val).toFixed(2); },
     },
+    {
         sliderId: '#mirostat_lr_novel',
         counterId: '#mirostat_lr_counter_novel',
         format: (val) => Number(val).toFixed(2),
         setValue: (val) => { nai_settings.mirostat_lr = Number(val).toFixed(2); },
     },
+    {
         sliderId: '#min_length_novel',
         counterId: '#min_length_counter_novel',
         format: (val) => `${val}`,
         setValue: (val) => { nai_settings.min_length = Number(val).toFixed(0); },
     },
+    {
         sliderId: '#nai_banned_tokens',

  * for a single token into a TokenLogprobs object used by the Token Probabilities
  * feature.
  * @param {NAITokenLogprobs} data - NAI logprobs object for one token
  * @returns {import('./logprobs.js').TokenLogprobs | null} converted logprobs
  */
 export function parseNovelAILogprobs(data) {
     if (!data) {

     // text so we will use the IDs instead and bulk decode them in
     // StreamingProcessor. JSDoc typechecking may complain about this, but it's
     // intentional.
 +    // @ts-ignore
     return { token: chosenId, topLogprobs: merged };
+}

     saveSettingsDebounced();
 });
 jQuery(export async function getStatusNovel() {
 +    try {
 +        const result = await loadNovelSubscriptionData();
++
 +        if (!result) {
 +            throw new Error('Could not load subscription data');
 +        }
++
 +        setOnlineStatus(getNovelTier());
 +    } catch {
 +        setOnlineStatus('no_connection');
 +    }
++
 +    return resultCheckStatus();
 +}
++
 +export function initNovelAISettings() {
     sliders.forEach(slider => {
         $(document).on('input', slider.sliderId, function () {
             const value = $(this).val();

         });
     });
 +    $('#api_button_novel').on('click', async function (e) {
 +        e.stopPropagation();
 +        const api_key_novel = String($('#api_key_novel').val()).trim();
++
 +        if (api_key_novel.length) {
 +            await writeSecret(SECRET_KEYS.NOVEL, api_key_novel);
 +        }
++
 +        if (!secret_state[SECRET_KEYS.NOVEL]) {
 +            console.log('No secret key saved for NovelAI');
 +            return;
 +        }
++
 +        startStatusLoading();
 +        await getStatusNovel();
 +    });
++
 +    $('#settings_preset_novel').on('change', function () {
 +        nai_settings.preset_settings_novel = $('#settings_preset_novel').find(':selected').text();
 +        const preset = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]];
 +        loadNovelPreset(preset);
 +        saveSettingsDebounced();
 +    });
++
     $('#streaming_novel').on('input', function () {
         const value = !!$(this).prop('checked');
         nai_settings.streaming_novel = value;

     });
     $('#novelai_logit_bias_new_entry').on('click', () => createNewLogitBiasEntry(nai_settings.logit_bias, BIAS_KEY));
 });