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

Clean-up continue nudge init

Browse Source
This commit is contained in:
Cohee
2024-03-23 23:11:05 +02:00
parent 6665666098
commit 7b9c0e303f
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/scripts/openai.js
View File

@ -727,19 +727,12 @@ async function populateChatHistory(messages, prompts, chatCompletion, type = nul
let continueMessage = null; let continueMessage = null;
const instruct = isOpenRouterWithInstruct(); const instruct = isOpenRouterWithInstruct();
if (type === 'continue' && cyclePrompt && !instruct && !oai_settings.continue_prefill) { if (type === 'continue' && cyclePrompt && !instruct && !oai_settings.continue_prefill) {
const promptObject = oai_settings.continue_prefill ? const promptObject = {
{ identifier: 'continueNudge',
identifier: 'continueNudge', role: 'system',
role: 'assistant', content: oai_settings.continue_nudge_prompt.replace('{{lastChatMessage}}', String(cyclePrompt).trim()),
content: cyclePrompt, system_prompt: true,
system_prompt: true, };
} :
{
identifier: 'continueNudge',
role: 'system',
content: oai_settings.continue_nudge_prompt.replace('{{lastChatMessage}}', cyclePrompt),
system_prompt: true,
};
const continuePrompt = new Prompt(promptObject); const continuePrompt = new Prompt(promptObject);
const preparedPrompt = promptManager.preparePrompt(continuePrompt); const preparedPrompt = promptManager.preparePrompt(continuePrompt);
continueMessage = Message.fromPrompt(preparedPrompt); continueMessage = Message.fromPrompt(preparedPrompt);
@ -3494,7 +3487,7 @@ async function onModelChange() {
if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) { if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
if (oai_settings.max_context_unlocked) { if (oai_settings.max_context_unlocked) {
$('#openai_max_context').attr('max', unlocked_max); $('#openai_max_context').attr('max', unlocked_max);
} else if (value === 'gemini-1.5-pro') { } else if (value === 'gemini-1.5-pro') {
$('#openai_max_context').attr('max', max_1mil); $('#openai_max_context').attr('max', max_1mil);
} else if (value === 'gemini-pro') { } else if (value === 'gemini-pro') {
$('#openai_max_context').attr('max', max_32k); $('#openai_max_context').attr('max', max_32k);