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

Adjust novel max context calculation

Browse Source
This commit is contained in:
Cohee
2023-08-10 19:15:52 +03:00
parent f226fe99aa
commit 104d983449
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/script.js
View File

@ -102,10 +102,12 @@ import {
import { import {
generateNovelWithStreaming, generateNovelWithStreaming,
getNovelGenerationData, getNovelGenerationData,
getNovelMaxContextTokens,
getNovelTier, getNovelTier,
loadNovelPreset, loadNovelPreset,
loadNovelSettings, loadNovelSettings,
nai_settings, nai_settings,
setNovelData,
} from "./scripts/nai-settings.js"; } from "./scripts/nai-settings.js";
import { import {
@ -797,7 +799,6 @@ let extension_prompts = {};
var main_api;// = "kobold"; var main_api;// = "kobold";
//novel settings //novel settings
let novel_tier;
export let novelai_settings; export let novelai_settings;
export let novelai_setting_names; export let novelai_setting_names;
let abortController; let abortController;
@ -3176,14 +3177,22 @@ function getMaxContextSize() {
this_max_context = Number(max_context); this_max_context = Number(max_context);
if (nai_settings.model_novel == 'krake-v2' || nai_settings.model_novel == 'euterpe-v2') { if (nai_settings.model_novel == 'krake-v2' || nai_settings.model_novel == 'euterpe-v2') {
// Krake and Euterpe have a max context of 2048 // Krake and Euterpe have a max context of 2048
// Should be used with nerdstash tokenizer for best results // Should be used with classic gpt tokenizer for best results
this_max_context = Math.min(max_context, 2048); this_max_context = Math.min(max_context, 2048);
} }
if (nai_settings.model_novel == 'clio-v1' || nai_settings.model_novel == 'kayra-v1') { if (nai_settings.model_novel == 'clio-v1' || nai_settings.model_novel == 'kayra-v1') {
// Clio and Kayra has a max context of 8192 // Clio and Kayra have a max context of 8192
// Should be used with nerdstash / nerdstash_v2 tokenizer for best results // Should be used with nerdstash / nerdstash_v2 tokenizer for best results
this_max_context = Math.min(max_context, 8192); this_max_context = Math.min(max_context, 8192);
} }
const subscriptionLimit = getNovelMaxContextTokens();
if (typeof subscriptionLimit === "number" && this_max_context > subscriptionLimit) {
this_max_context = subscriptionLimit;
console.log(`NovelAI subscription limit reached. Max context size is now ${this_max_context}`);
}
this_max_context = this_max_context - amount_gen;
} }
if (main_api == 'openai') { if (main_api == 'openai') {
this_max_context = oai_settings.openai_max_context; this_max_context = oai_settings.openai_max_context;
@ -5476,8 +5485,8 @@ async function getStatusNovel() {
contentType: "application/json", contentType: "application/json",
success: function (data) { success: function (data) {
if (data.error != true) { if (data.error != true) {
novel_tier = data.tier; setNovelData(data);
online_status = getNovelTier(novel_tier); online_status = `${getNovelTier(data.tier)} (${getNovelMaxContextTokens()} context tokens)`;
} }
resultCheckStatusNovel(); resultCheckStatusNovel();
}, },

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

@ -41,6 +41,16 @@ const nai_tiers = {
3: 'Opus', 3: 'Opus',
}; };
let novel_data = null;
export function setNovelData(data) {
novel_data = data;
}
export function getNovelMaxContextTokens() {
return novel_data?.perks?.contextTokens;
}
function getNovelTier(tier) { function getNovelTier(tier) {
return nai_tiers[tier] ?? 'no_connection'; return nai_tiers[tier] ?? 'no_connection';
} }