rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:staging' into staging

Browse Source
This commit is contained in:
Tony Ribeiro
2023-08-12 14:36:23 +02:00
committed by GitHub
parent 62b6f08d25 b77cc8672d
commit 1eb4dd9a4f
11 changed files with 188 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/extensions/infinity-context/index.js
View File

@ -125,7 +125,7 @@ async function loadSettings() {
$('#chromadb_auto_adjust').prop('checked', extension_settings.chromadb.auto_adjust);
$('#chromadb_freeze').prop('checked', extension_settings.chromadb.freeze);
$('#chromadb_query_last_only').val(extension_settings.chromadb.query_last_only).trigger('input');
$('#chromadb_query_last_only').prop('checked', extension_settings.chromadb.query_last_only);
enableDisableSliders();
onStrategyChange();
}
@ -573,6 +573,11 @@ function getCharacterDataLength() {
* on the chat history and a specified maximum context length.
*/
function doAutoAdjust(chat, maxContext) {
// Only valid for chat injections strategy
if (extension_settings.chromadb.recall_strategy !== 0) {
return;
}
console.debug('CHROMADB: Auto-adjusting sliders (messages: %o, maxContext: %o)', chat.length, maxContext);
// Get mean message length
const meanMessageLength = chat.reduce((acc, cur) => acc + (cur?.mes?.length ?? 0), 0) / chat.length;

46
public/scripts/nai-settings.js
View File

@ -47,8 +47,17 @@ export function setNovelData(data) {
novel_data = data;
}
export function getNovelMaxContextTokens() {
return novel_data?.perks?.contextTokens;
export function getKayraMaxContextTokens() {
switch (novel_data?.tier) {
case 1:
return 3072;
case 2:
return 6144;
case 3:
return 8192;
}
return null;
}
function getNovelTier(tier) {
@ -80,6 +89,9 @@ function loadNovelPreset(preset) {
nai_settings.min_length = preset.min_length;
nai_settings.cfg_scale = preset.cfg_scale;
nai_settings.phrase_rep_pen = preset.phrase_rep_pen;
nai_settings.top_g = preset.top_g;
nai_settings.mirostat_lr = preset.mirostat_lr;
nai_settings.mirostat_tau = preset.mirostat_tau;
loadNovelSettingsUi(nai_settings);
}
@ -105,6 +117,9 @@ function loadNovelSettings(settings) {
nai_settings.min_length = settings.min_length;
nai_settings.phrase_rep_pen = settings.phrase_rep_pen;
nai_settings.cfg_scale = settings.cfg_scale;
nai_settings.top_g = settings.top_g;
nai_settings.mirostat_lr = settings.mirostat_lr;
nai_settings.mirostat_tau = settings.mirostat_tau;
nai_settings.streaming_novel = !!settings.streaming_novel;
loadNovelSettingsUi(nai_settings);
}
@ -169,6 +184,12 @@ function loadNovelSettingsUi(ui_settings) {
$("#cfg_scale_counter_novel").text(Number(ui_settings.cfg_scale).toFixed(2));
$("#phrase_rep_pen_novel").val(getPhraseRepPenCounter(ui_settings.phrase_rep_pen));
$("#phrase_rep_pen_counter_novel").text(getPhraseRepPenCounter(ui_settings.phrase_rep_pen));
$("#top_g_novel").val(ui_settings.top_g);
$("#top_g_counter_novel").text(Number(ui_settings.top_g).toFixed(0));
$("#mirostat_lr_novel").val(ui_settings.mirostat_lr);
$("#mirostat_lr_counter_novel").text(Number(ui_settings.mirostat_lr).toFixed(2));
$("#mirostat_tau_novel").val(ui_settings.mirostat_tau);
$("#mirostat_tau_counter_novel").text(Number(ui_settings.mirostat_tau).toFixed(2));
$("#min_length_novel").val(ui_settings.min_length);
$("#min_length_counter_novel").text(Number(ui_settings.min_length).toFixed(0));
$('#nai_preamble_textarea').val(ui_settings.nai_preamble);
@ -243,6 +264,24 @@ const sliders = [
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.typical_p = Number(val).toFixed(2); },
},
{
sliderId: "#top_g_novel",
counterId: "#top_g_counter_novel",
format: (val) => Number(val).toFixed(0),
setValue: (val) => { nai_settings.top_g = Number(val).toFixed(0); },
},
{
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: "#cfg_scale_novel",
counterId: "#cfg_scale_counter_novel",
@ -298,6 +337,9 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
"top_p": parseFloat(nai_settings.top_p),
"top_k": parseInt(nai_settings.top_k),
"typical_p": parseFloat(nai_settings.typical_p),
"top_g": parseFloat(nai_settings.top_g),
"mirostat_lr": parseFloat(nai_settings.mirostat_lr),
"mirostat_tau": parseFloat(nai_settings.mirostat_tau),
"cfg_scale": parseFloat(nai_settings.cfg_scale),
"cfg_uc": "",
"phrase_rep_pen": nai_settings.phrase_rep_pen,

7
public/scripts/power-user.js
View File

@ -193,6 +193,7 @@ let power_user = {
custom_stopping_strings_macro: true,
fuzzy_search: false,
encode_tags: false,
lazy_load: 0,
};
let themes = [];
@ -688,6 +689,7 @@ function loadPowerUserSettings(settings, data) {
$('#fuzzy_search_checkbox').prop("checked", power_user.fuzzy_search);
$('#persona_show_notifications').prop("checked", power_user.persona_show_notifications);
$('#encode_tags').prop("checked", power_user.encode_tags);
$('#lazy_load').val(Number(power_user.lazy_load));
$("#console_log_prompts").prop("checked", power_user.console_log_prompts);
$('#auto_fix_generated_markdown').prop("checked", power_user.auto_fix_generated_markdown);
@ -2040,6 +2042,11 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#lazy_load').on('input', function () {
power_user.lazy_load = Number($(this).val());
saveSettingsDebounced();
});
$(window).on('focus', function () {
browser_has_focus = true;
});