Do not apply instruct formatting if on CC

0423cb7ad36dc30a81fb60e9ab8e47e03e9cadea

Cohee <18619528+Cohee1207@users.noreply.github.com>

1 files changed, +4 -1Showing whitespace changes
public/script.js+4 -1
@@ -2719,8 +2719,11 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
2719 environment.mesExamples = () => {2719 environment.mesExamples = () => {
2720 const isInstruct = power_user.instruct.enabled && main_api !== 'openai';2720 const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
2721 const mesExamplesArray = parseMesExamples(fields.mesExamples, isInstruct);2721 const mesExamplesArray = parseMesExamples(fields.mesExamples, isInstruct);
2722 if (isInstruct) {
2722 const instructExamples = formatInstructModeExamples(mesExamplesArray, name1, name2);2723 const instructExamples = formatInstructModeExamples(mesExamplesArray, name1, name2);
2723 return instructExamples.join('');2724 return instructExamples.join('');
2725 }
2726 return mesExamplesArray.join('');
2724 };2727 };
2725 environment.mesExamplesRaw = fields.mesExamples || '';2728 environment.mesExamplesRaw = fields.mesExamples || '';
2726 environment.charVersion = fields.version || '';2729 environment.charVersion = fields.version || '';
@@ -3303,7 +3306,7 @@ class StreamingProcessor {
3303 'send_date': chat[messageId]['send_date'],3306 'send_date': chat[messageId]['send_date'],
3304 'gen_started': chat[messageId]['gen_started'],3307 'gen_started': chat[messageId]['gen_started'],
3305 'gen_finished': chat[messageId]['gen_finished'],3308 'gen_finished': chat[messageId]['gen_finished'],
3306 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra']))3309 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])),
3307 };3310 };
3308 }3311 }
33093312