Do not apply instruct formatting if on CC

This commit is contained in:
Cohee
2025-03-07 22:53:30 +02:00
parent e476063f32
commit 0423cb7ad3

View File

@ -2719,8 +2719,11 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
environment.mesExamples = () => { environment.mesExamples = () => {
const isInstruct = power_user.instruct.enabled && main_api !== 'openai'; const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
const mesExamplesArray = parseMesExamples(fields.mesExamples, isInstruct); const mesExamplesArray = parseMesExamples(fields.mesExamples, isInstruct);
if (isInstruct) {
const instructExamples = formatInstructModeExamples(mesExamplesArray, name1, name2); const instructExamples = formatInstructModeExamples(mesExamplesArray, name1, name2);
return instructExamples.join(''); return instructExamples.join('');
}
return mesExamplesArray.join('');
}; };
environment.mesExamplesRaw = fields.mesExamples || ''; environment.mesExamplesRaw = fields.mesExamples || '';
environment.charVersion = fields.version || ''; environment.charVersion = fields.version || '';
@ -3303,7 +3306,7 @@ class StreamingProcessor {
'send_date': chat[messageId]['send_date'], 'send_date': chat[messageId]['send_date'],
'gen_started': chat[messageId]['gen_started'], 'gen_started': chat[messageId]['gen_started'],
'gen_finished': chat[messageId]['gen_finished'], 'gen_finished': chat[messageId]['gen_finished'],
'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])) 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])),
}; };
} }