From d4cf9eb13ea786adfeae0d117b80191d38ee3e9b Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Wed, 24 May 2023 07:03:03 +0900 Subject: [PATCH 1/5] new strategy for ChromaDB --- .../extensions/infinity-context/index.js | 70 ++++++++++++++++--- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/public/scripts/extensions/infinity-context/index.js b/public/scripts/extensions/infinity-context/index.js index 5d1c034d6..062301264 100644 --- a/public/scripts/extensions/infinity-context/index.js +++ b/public/scripts/extensions/infinity-context/index.js @@ -1,12 +1,14 @@ import { saveSettingsDebounced, getCurrentChatId, system_message_types } from "../../../script.js"; import { humanizedDateTime } from "../../RossAscends-mods.js"; -import { getApiUrl, extension_settings } from "../../extensions.js"; +import { getApiUrl, extension_settings, getContext } from "../../extensions.js"; import { getFileText, onlyUnique, splitRecursive } from "../../utils.js"; export { MODULE_NAME }; const MODULE_NAME = 'chromadb'; const defaultSettings = { + strategy: 'original', + keep_context: 10, keep_context_min: 1, keep_context_max: 100, @@ -38,12 +40,25 @@ async function loadSettings() { Object.assign(extension_settings.chromadb, defaultSettings); } + console.log(`loading chromadb strat:${extension_settings.chromadb.strategy}`); + $("#chromadb_strategy option[value=" + extension_settings.chromadb.strategy + "]").attr( + "selected", + "true" + ); $('#chromadb_keep_context').val(extension_settings.chromadb.keep_context).trigger('input'); $('#chromadb_n_results').val(extension_settings.chromadb.n_results).trigger('input'); $('#chromadb_split_length').val(extension_settings.chromadb.split_length).trigger('input'); $('#chromadb_file_split_length').val(extension_settings.chromadb.file_split_length).trigger('input'); } +function onStrategyChange() { + console.log('changing chromadb strat'); + extension_settings.chromadb.strategy = $('#chromadb_strategy').val(); + + //$('#chromadb_strategy').select(extension_settings.chromadb.strategy); + saveSettingsDebounced(); +} + function onKeepContextInput() { extension_settings.chromadb.keep_context = Number($('#chromadb_keep_context').val()); $('#chromadb_keep_context_value').text(extension_settings.chromadb.keep_context); @@ -158,7 +173,7 @@ async function onSelectInjectFile(e) { const split = splitRecursive(text, extension_settings.chromadb.file_split_length).filter(onlyUnique); - const messages = split.map(m => ({ + const messages = split.map(m => ({ id: `${file.name}-${split.indexOf(m)}`, role: 'system', content: m, @@ -205,7 +220,7 @@ async function onSelectInjectFile(e) { window.chromadb_interceptGeneration = async (chat) => { const currentChatId = getCurrentChatId(); - + const selectedStrategy = extension_settings.chromadb.strategy; if (currentChatId) { const messagesToStore = chat.slice(0, -extension_settings.chromadb.keep_context); @@ -219,10 +234,41 @@ window.chromadb_interceptGeneration = async (chat) => { queriedMessages.sort((a, b) => a.date - b.date); - const newChat = queriedMessages.map(m => JSON.parse(m.meta)); + const newChat = []; - chat.splice(0, messagesToStore.length, ...newChat); + if (selectedStrategy === 'ross') { + //adds chroma to the end of chat and allows Generate() to cull old messages naturally. + const context = getContext(); + const charname = context.name2; + newChat.push( + { + is_name: false, + is_user: false, + mes: `[Use these past chat exchanges to inform ${charname}'s next response:`, + name: "system", + send_date: 0, + } + ); + newChat.push(...queriedMessages.map(m => JSON.parse(m.meta))); + newChat.push( + { + is_name: false, + is_user: false, + mes: `]\n`, + name: "system", + send_date: 0, + } + ); + chat.splice(chat.length, 0, ...newChat); + } + if (selectedStrategy === 'original') { + //removes .length # messages from the start of 'kept messages' + //replaces them with chromaDB results (with no separator) + newChat.push(...queriedMessages.map(m => JSON.parse(m.meta))); + chat.splice(0, messagesToStore.length, ...newChat); + + } console.log('ChromaDB chat after injection', chat); } } @@ -238,13 +284,18 @@ jQuery(async () => {
- + Memory Injection Strategy + + - + - + - +
`; $('#extensions_settings').append(settingsHtml); + $('#chromadb_strategy').on('change', onStrategyChange); $('#chromadb_keep_context').on('input', onKeepContextInput); $('#chromadb_n_results').on('input', onNResultsInput); $('#chromadb_split_length').on('input', onSplitLengthInput); From 411aebd47f5e8b42de297b764b4c9b72a8824700 Mon Sep 17 00:00:00 2001 From: Reguile Date: Tue, 23 May 2023 23:06:02 -0500 Subject: [PATCH 2/5] Move KAI Horde to dedicated dropdown --- public/index.html | 96 +++++++++++++++--------------- public/script.js | 125 ++++++++++++++++++++++++---------------- public/scripts/horde.js | 19 ------ public/style.css | 3 + 4 files changed, 127 insertions(+), 116 deletions(-) diff --git a/public/index.html b/public/index.html index 9324e47e1..2059ce9c3 100644 --- a/public/index.html +++ b/public/index.html @@ -980,19 +980,65 @@
-
+
-
+
+

API url

Example: http://127.0.0.1:5000/api
@@ -1000,48 +1046,6 @@
-
- - - - - -

API key

-
Get it here: Register
- Enter 0000000000 to use anonymous mode. -
- -
- -
-
-
For privacy reasons, your API key will be hidden after you reload the page.
-

- Model -
-
-
-

- Hold Control / Command key to select multiple models. - -
Not connected
diff --git a/public/script.js b/public/script.js index 38c16338e..a049997c2 100644 --- a/public/script.js +++ b/public/script.js @@ -627,6 +627,8 @@ function checkOnlineStatus() { if (online_status == "no_connection") { $("#online_status_indicator2").css("background-color", "red"); //Kobold $("#online_status_text2").html("No connection..."); + $("#online_status_indicator_horde").css("background-color", "red"); //Kobold Horde + $("#online_status_text_horde").html("No connection..."); $("#online_status_indicator3").css("background-color", "red"); //Novel $("#online_status_text3").html("No connection..."); $(".online_status_indicator4").css("background-color", "red"); //OAI / ooba @@ -638,6 +640,8 @@ function checkOnlineStatus() { } else { $("#online_status_indicator2").css("background-color", "green"); //kobold $("#online_status_text2").html(online_status); + $("#online_status_indicator_horde").css("background-color", "green"); //Kobold Horde + $("#online_status_text_horde").html(online_status); $("#online_status_indicator3").css("background-color", "green"); //novel $("#online_status_text3").html(online_status); $(".online_status_indicator4").css("background-color", "green"); //OAI / ooba @@ -647,7 +651,7 @@ function checkOnlineStatus() { async function getStatus() { if (is_get_status) { - if (main_api == "kobold" && horde_settings.use_horde) { + if (main_api == "koboldhorde") { try { const hordeStatus = await checkHordeStatus(); online_status = hordeStatus ? 'Connected' : 'no_connection'; @@ -693,7 +697,7 @@ async function getStatus() { } // determine if we can use stop sequence - if (main_api == "kobold") { + if (main_api === "kobold" || main_api === "koboldhorde") { kai_settings.use_stop_sequence = canUseKoboldStopSequence(data.version); } @@ -1887,7 +1891,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, // Adjust token limit for Horde let adjustedParams; - if (main_api == 'kobold' && horde_settings.use_horde && (horde_settings.auto_adjust_context_length || horde_settings.auto_adjust_response_length)) { + if (main_api == 'koboldhorde' && (horde_settings.auto_adjust_context_length || horde_settings.auto_adjust_response_length)) { try { adjustedParams = await adjustHordeGenerationParams(max_context, amount_gen); } @@ -2153,7 +2157,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, let thisPromptBits = []; - if (main_api == 'kobold' && horde_settings.use_horde && horde_settings.auto_adjust_response_length) { + if (main_api == 'koboldhorde' && horde_settings.auto_adjust_response_length) { this_amount_gen = Math.min(this_amount_gen, adjustedParams.maxLength); this_amount_gen = Math.max(this_amount_gen, MIN_AMOUNT_GEN); // prevent validation errors } @@ -2169,10 +2173,13 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, singleline: kai_settings.single_line, }; - if (preset_settings != 'gui' || horde_settings.use_horde) { - const maxContext = horde_settings.use_horde && horde_settings.auto_adjust_context_length ? adjustedParams.maxContextLength : max_context; + } + else if(main_api == 'koboldhorde'){ + if (preset_settings != 'gui') { + const maxContext = horde_settings.auto_adjust_context_length ? adjustedParams.maxContextLength : max_context; generate_data = getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, maxContext, isImpersonate); } + } else if (main_api == 'textgenerationwebui') { generate_data = getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate); @@ -2211,7 +2218,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, sendOpenAIRequest(type, generate_data.prompt).then(onSuccess).catch(onError); } } - else if (main_api == 'kobold' && horde_settings.use_horde) { + else if (main_api == 'koboldhorde') { generateHorde(finalPromt, generate_data).then(onSuccess).catch(onError); } else if (main_api == 'poe') { @@ -2464,7 +2471,7 @@ function sendMessageAsUser(textareaText, messageBias) { function getMaxContextSize() { let this_max_context = 1487; - if (main_api == 'kobold' || main_api == 'textgenerationwebui') { + if (main_api == 'kobold' || main_api == 'koboldhorde' || main_api == 'textgenerationwebui') { this_max_context = (max_context - amount_gen); } if (main_api == 'novel') { @@ -3017,7 +3024,7 @@ function throwCircuitBreakerError() { } function extractTitleFromData(data) { - if (main_api == 'kobold' && horde_settings.use_horde) { + if (main_api == 'koboldhorde') { return data.workerName; } @@ -3027,11 +3034,11 @@ function extractTitleFromData(data) { function extractMessageFromData(data) { let getMessage = ""; - if (main_api == 'kobold' && !horde_settings.use_horde) { + if (main_api == 'kobold') { getMessage = data.results[0].text; } - if (main_api == 'kobold' && horde_settings.use_horde) { + if (main_api == 'koboldhorde') { getMessage = data.text; } @@ -3227,7 +3234,7 @@ function extractImageFromMessage(getMessage) { } export function isMultigenEnabled() { - return power_user.multigen && (main_api == 'textgenerationwebui' || main_api == 'kobold' || main_api == 'novel'); + return power_user.multigen && (main_api == 'textgenerationwebui' || main_api == 'kobold' || main_api == 'koboldhorde' || main_api == 'novel'); } function activateSendButtons() { @@ -3539,6 +3546,15 @@ function changeMainAPI() { const selectedVal = $("#main_api").val(); //console.log(selectedVal); const apiElements = { + "koboldhorde": { + apiSettings: $("#kobold_api-settings"), + apiConnector: $("#kobold_horde"), + apiPresets: $('#kobold_api-presets'), + apiRanges: $("#range_block"), + maxContextElem: $("#max_context_block"), + amountGenElem: $("#amount_gen_block"), + softPromptElem: $("#softprompt_block") + }, "kobold": { apiSettings: $("#kobold_api-settings"), apiConnector: $("#kobold_api"), @@ -3588,49 +3604,62 @@ function changeMainAPI() { //console.log('--- apiElements--- '); //console.log(apiElements); + //first, disable everything so the old elements stop showing for (const apiName in apiElements) { const apiObj = apiElements[apiName]; - const isCurrentApi = selectedVal === apiName; - - apiObj.apiSettings.css("display", isCurrentApi ? "block" : "none"); - apiObj.apiConnector.css("display", isCurrentApi ? "block" : "none"); - apiObj.apiRanges.css("display", isCurrentApi ? "block" : "none"); - apiObj.apiPresets.css("display", isCurrentApi ? "block" : "none"); - - if (isCurrentApi && apiName === "openai") { - apiObj.apiPresets.css("display", "flex"); + //do not hide items to then proceed to immediately show them. + if(selectedVal === apiName){ + continue; } + apiObj.apiSettings.css("display", "none"); + apiObj.apiConnector.css("display", "none"); + apiObj.apiRanges.css("display", "none"); + apiObj.apiPresets.css("display", "none"); + } - if (isCurrentApi && apiName === "kobold") { - //console.log("enabling SP for kobold"); - $("#softprompt_block").css("display", "block"); - } + //then, find and enable the active item. + //This is split out of the loop so that different apis can share settings divs + let activeItem = apiElements[selectedVal]; - if (isCurrentApi && (apiName === "textgenerationwebui" || apiName === "novel")) { - console.log("enabling amount_gen for ooba/novel"); - apiObj.amountGenElem.find('input').prop("disabled", false); - apiObj.amountGenElem.css("opacity", 1.0); - } + activeItem.apiSettings.css("display", "block"); + activeItem.apiConnector.css("display", "block"); + activeItem.apiRanges.css("display", "block"); + activeItem.apiPresets.css("display", "block"); - // Hide common settings for OpenAI - if (selectedVal == "openai") { - $("#common-gen-settings-block").css("display", "none"); - } else { - $("#common-gen-settings-block").css("display", "block"); - } - // Hide amount gen for poe - if (selectedVal == "poe") { - $("#amount_gen_block").css("display", "none"); - } else { - $("#amount_gen_block").css("display", "flex"); - } + if (selectedVal === "openai") { + activeItem.apiPresets.css("display", "flex"); + } + if (selectedVal === "kobold" || selectedVal === 'koboldhorde') { + //console.log("enabling SP for kobold"); + $("#softprompt_block").css("display", "block"); + } + + if (selectedVal === "textgenerationwebui" || selectedVal === "novel") { + console.log("enabling amount_gen for ooba/novel"); + activeItem.amountGenElem.find('input').prop("disabled", false); + activeItem.amountGenElem.css("opacity", 1.0); + } + + // Hide common settings for OpenAI + console.log('value?', selectedVal); + if (selectedVal == "openai") { + console.log('hiding settings?'); + $("#common-gen-settings-block").css("display", "none"); + } else { + $("#common-gen-settings-block").css("display", "block"); + } + // Hide amount gen for poe + if (selectedVal == "poe") { + $("#amount_gen_block").css("display", "none"); + } else { + $("#amount_gen_block").css("display", "flex"); } main_api = selectedVal; online_status = "no_connection"; - if (main_api == "kobold" && horde_settings.use_horde) { + if (main_api == "koboldhorde") { is_get_status = true; getStatus(); getHordeModels(); @@ -4572,7 +4601,7 @@ function setGenerationProgress(progress) { } function isHordeGenerationNotAllowed() { - if (main_api == "kobold" && horde_settings.use_horde && preset_settings == "gui") { + if (main_api == "koboldhorde" && preset_settings == "gui") { toastr.error('GUI Settings preset is not supported for Horde. Please select another preset.'); return true; } @@ -5676,7 +5705,7 @@ $(document).ready(function () { $("#api_button").click(function (e) { e.stopPropagation(); - if ($("#api_url_text").val() != "" && !horde_settings.use_horde) { + if ($("#api_url_text").val() != "") { let value = formatKoboldUrl($.trim($("#api_url_text").val())); if (!value) { @@ -5697,12 +5726,6 @@ $(document).ready(function () { clearSoftPromptsList(); getSoftPromptsList(); } - else if (horde_settings.use_horde) { - main_api = "kobold"; - is_get_status = true; - getStatus(); - clearSoftPromptsList(); - } }); $("#api_button_textgenerationwebui").click(function (e) { diff --git a/public/scripts/horde.js b/public/scripts/horde.js index a5dc63b18..8361033be 100644 --- a/public/scripts/horde.js +++ b/public/scripts/horde.js @@ -16,7 +16,6 @@ let models = []; let horde_settings = { models: [], - use_horde: false, auto_adjust_response_length: true, auto_adjust_context_length: false, }; @@ -180,7 +179,6 @@ function loadHordeSettings(settings) { Object.assign(horde_settings, settings.horde_settings); } - $('#use_horde').prop("checked", horde_settings.use_horde).trigger('input'); $('#horde_auto_adjust_response_length').prop("checked", horde_settings.auto_adjust_response_length); $('#horde_auto_adjust_context_length').prop("checked", horde_settings.auto_adjust_context_length); } @@ -208,23 +206,6 @@ async function showKudos() { } jQuery(function () { - $("#use_horde").on("input", async function () { - horde_settings.use_horde = !!$(this).prop("checked"); - - if (horde_settings.use_horde) { - $('#kobold_api_block').hide(); - $('#kobold_horde_block').show(); - } - else { - $('#kobold_api_block').show(); - $('#kobold_horde_block').hide(); - } - - // Trigger status check - changeMainAPI(); - saveSettingsDebounced(); - }); - $("#horde_model").on("change", function () { horde_settings.models = $('#horde_model').val(); console.log('Updated Horde models', horde_settings.models); diff --git a/public/style.css b/public/style.css index 4d2c203ef..fe976a30d 100644 --- a/public/style.css +++ b/public/style.css @@ -1721,6 +1721,7 @@ input[type=search]:focus::-webkit-search-cancel-button { /* ------ online status indicators and texts. 2 = kobold AI, 3 = Novel AI ----------*/ #online_status2, +#online_status_horde, .online_status4 { opacity: 0.5; margin-top: 2px; @@ -1728,6 +1729,7 @@ input[type=search]:focus::-webkit-search-cancel-button { } #online_status_indicator2, +#online_status_indicator_horde, .online_status_indicator4 { border-radius: 7px; width: 14px; @@ -1737,6 +1739,7 @@ input[type=search]:focus::-webkit-search-cancel-button { } #online_status_text2, +#online_status_text_horde, .online_status_text4 { margin-left: 4px; display: inline-block; From 85ef2b6848a563088e864559f961c6acd53a9a77 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Wed, 24 May 2023 11:48:39 +0300 Subject: [PATCH 3/5] Move Poe nudges to Generate anchors appendage --- public/index.html | 4 ++-- public/script.js | 9 ++++++++- public/scripts/poe.js | 38 +++++++++++++++++--------------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/public/index.html b/public/index.html index 9324e47e1..698ebfbc0 100644 --- a/public/index.html +++ b/public/index.html @@ -945,7 +945,7 @@ Influences bot behavior in its responses.
- +
@@ -959,7 +959,7 @@ Prompt that is used for Impersonation function
- +
diff --git a/public/script.js b/public/script.js index 38c16338e..d3d96b96b 100644 --- a/public/script.js +++ b/public/script.js @@ -105,6 +105,7 @@ import { generatePoe, is_get_status_poe, setPoeOnlineStatus, + appendPoeAnchors, } from "./scripts/poe.js"; import { @@ -1901,11 +1902,17 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, } // Extension added strings - const allAnchors = getAllExtensionPrompts(); + let allAnchors = getAllExtensionPrompts(); const afterScenarioAnchor = getExtensionPrompt(extension_prompt_types.AFTER_SCENARIO); let zeroDepthAnchor = getExtensionPrompt(extension_prompt_types.IN_CHAT, 0, ' '); let { worldInfoString, worldInfoBefore, worldInfoAfter } = getWorldInfoPrompt(chat2); + // Moved here to not overflow the Poe context with added prompt bits + if (main_api == 'poe') { + allAnchors = appendPoeAnchors(type, allAnchors); + zeroDepthAnchor = appendPoeAnchors(type, zeroDepthAnchor); + } + // hack for regeneration of the first message if (chat2.length == 0) { chat2.push(''); diff --git a/public/scripts/poe.js b/public/scripts/poe.js index 6371d0ed9..2e1b7e15b 100644 --- a/public/scripts/poe.js +++ b/public/scripts/poe.js @@ -86,6 +86,23 @@ function onBotChange() { saveSettingsDebounced(); } +export function appendPoeAnchors(type, prompt) { + const isImpersonate = type === 'impersonate'; + const isQuiet = type === 'quiet'; + + if (poe_settings.character_nudge && !isQuiet && !isImpersonate) { + let characterNudge = '\n' + substituteParams(poe_settings.character_nudge_message); + prompt += characterNudge; + } + + if (poe_settings.impersonation_prompt && isImpersonate) { + let impersonationNudge = '\n' + substituteParams(poe_settings.impersonation_prompt); + prompt += impersonationNudge; + } + + return prompt; +} + async function generatePoe(type, finalPrompt, signal) { if (poe_settings.auto_purge) { let count_to_delete = -1; @@ -115,28 +132,7 @@ async function generatePoe(type, finalPrompt, signal) { console.log('Could not jailbreak the bot'); } - const isImpersonate = type === 'impersonate'; const isQuiet = type === 'quiet'; - - if (poe_settings.character_nudge && !isQuiet && !isImpersonate) { - let characterNudge = '\n' + substituteParams(poe_settings.character_nudge_message); - finalPrompt += characterNudge; - } - - if (poe_settings.impersonation_prompt && isImpersonate) { - let impersonationNudge = '\n' + substituteParams(poe_settings.impersonation_prompt); - finalPrompt += impersonationNudge; - } - - // If prompt overflows the max context, reduce it (or the generation would fail) - // Split by sentence boundary and remove sentence-by-sentence from the beginning - while (getTokenCount(finalPrompt) > max_context) { - const sentences = finalPrompt.split(/([.?!])\s+/); - const removed = sentences.shift(); - console.log(`Reducing Poe context due to overflow. Sentence dropped from prompt: "${removed}"`); - finalPrompt = sentences.join(''); - } - const reply = await sendMessage(finalPrompt, !isQuiet, signal); got_reply = true; return reply; From 64bc0646c485f647ec30b637a62b295cba068567 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Wed, 24 May 2023 12:38:25 +0300 Subject: [PATCH 4/5] [skip ci] Reformat code --- public/script.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/script.js b/public/script.js index 6b9e81f97..e8bc45452 100644 --- a/public/script.js +++ b/public/script.js @@ -2181,7 +2181,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, }; } - else if(main_api == 'koboldhorde'){ + else if (main_api == 'koboldhorde') { if (preset_settings != 'gui') { const maxContext = horde_settings.auto_adjust_context_length ? adjustedParams.maxContextLength : max_context; generate_data = getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, maxContext, isImpersonate); @@ -3241,7 +3241,7 @@ function extractImageFromMessage(getMessage) { } export function isMultigenEnabled() { - return power_user.multigen && (main_api == 'textgenerationwebui' || main_api == 'kobold' || main_api == 'koboldhorde' || main_api == 'novel'); + return power_user.multigen && (main_api == 'textgenerationwebui' || main_api == 'kobold' || main_api == 'koboldhorde' || main_api == 'novel'); } function activateSendButtons() { @@ -3615,7 +3615,7 @@ function changeMainAPI() { for (const apiName in apiElements) { const apiObj = apiElements[apiName]; //do not hide items to then proceed to immediately show them. - if(selectedVal === apiName){ + if (selectedVal === apiName) { continue; } apiObj.apiSettings.css("display", "none"); @@ -3624,7 +3624,7 @@ function changeMainAPI() { apiObj.apiPresets.css("display", "none"); } - //then, find and enable the active item. + //then, find and enable the active item. //This is split out of the loop so that different apis can share settings divs let activeItem = apiElements[selectedVal]; @@ -3649,7 +3649,7 @@ function changeMainAPI() { } // Hide common settings for OpenAI - console.log('value?', selectedVal); + console.log('value?', selectedVal); if (selectedVal == "openai") { console.log('hiding settings?'); $("#common-gen-settings-block").css("display", "none"); From a293830d95a9606e25ce45d7731d5d8ab1b460c3 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Wed, 24 May 2023 13:47:37 +0300 Subject: [PATCH 5/5] #372 Add Clio model for NovelAI --- public/NovelAI Settings/Chat-Clio.settings | 20 ++++++++++++++++++++ public/index.html | 1 + public/script.js | 11 +++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 public/NovelAI Settings/Chat-Clio.settings diff --git a/public/NovelAI Settings/Chat-Clio.settings b/public/NovelAI Settings/Chat-Clio.settings new file mode 100644 index 000000000..cc9be1bfc --- /dev/null +++ b/public/NovelAI Settings/Chat-Clio.settings @@ -0,0 +1,20 @@ +{ + "order": [ + 1, + 3, + 4, + 0, + 2 + ], + "temperature": 1.05, + "max_length": 90, + "min_length": 1, + "tail_free_sampling": 0.989, + "repetition_penalty": 1.5, + "repetition_penalty_range": 8192, + "repetition_penalty_frequency": 0.03, + "repetition_penalty_presence": 0.005, + "top_a": 0.075, + "top_k": 79, + "top_p": 0.95 +} diff --git a/public/index.html b/public/index.html index c85272e72..833cab6cf 100644 --- a/public/index.html +++ b/public/index.html @@ -1079,6 +1079,7 @@
diff --git a/public/script.js b/public/script.js index e8bc45452..ffb496578 100644 --- a/public/script.js +++ b/public/script.js @@ -2193,7 +2193,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, } else if (main_api == 'novel') { const this_settings = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]]; - generate_data = getNovelGenerationData(finalPromt, this_settings); + generate_data = getNovelGenerationData(finalPromt, this_settings, this_amount_gen); } else if (main_api == 'openai') { let [prompt, counts] = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type, quiet_prompt); @@ -2485,7 +2485,7 @@ function getMaxContextSize() { if (novel_tier === 1) { this_max_context = 1024; } else { - this_max_context = 2048 - 60; //fix for fat tokens + this_max_context = Number(max_context); if (nai_settings.model_novel == 'krake-v2') { this_max_context -= 160; } @@ -2938,19 +2938,22 @@ function getTextGenGenerationData(finalPromt, this_amount_gen, isImpersonate) { } // TODO: move to nai-settings.js -function getNovelGenerationData(finalPromt, this_settings) { +function getNovelGenerationData(finalPromt, this_settings, this_amount_gen) { return { "input": finalPromt, "model": nai_settings.model_novel, "use_string": true, "temperature": parseFloat(nai_settings.temp_novel), - "max_length": this_settings.max_length, + "max_length": this_amount_gen, // this_settings.max_length, // <= why? "min_length": this_settings.min_length, "tail_free_sampling": this_settings.tail_free_sampling, "repetition_penalty": parseFloat(nai_settings.rep_pen_novel), "repetition_penalty_range": parseInt(nai_settings.rep_pen_size_novel), "repetition_penalty_frequency": this_settings.repetition_penalty_frequency, "repetition_penalty_presence": this_settings.repetition_penalty_presence, + "top_a": this_settings.top_a, + "top_p": this_settings.top_p, + "top_k": this_settings.top_k, //"stop_sequences": {{187}}, //bad_words_ids = {{50256}, {0}, {1}}; //generate_until_sentence = true;