Don't add user placeholders

c9db7a1574811ee33fd98b3735f493a0e03b9982

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

src/endpoints/backends/chat-completions.js+3 -3 Viewed

     switch (type) {
         case 'merge':
         case 'claude':
             return mergeMessages(messages, names, false, true);
         case 'strict':
             return mergeMessages(messages, names, true, true);
         case 'deepseek':
             return (x => x.length && (x[x.length - 1].role !== 'assistant' || (x[x.length - 1].prefix = true)) ? x : x)([...mergeMessages(messages, names, true, false)]);
         default:
             return messages;
+    }

src/prompt-converters.js+7 -6 Viewed

  * @param {any[]} messages Messages to merge
  * @param {PromptNames} names Prompt names
  * @param {boolean} strict Enable strict mode: only allow one system message at the start, force user first message
 + * @param {boolean} placeholders Add user placeholders to the messages in strict mode
  * @returns {any[]} Merged messages
  */
 export function mergeMessages(messages, names, strict, placeholders) {
     let mergedMessages = [];
     /** @type {Map<string,object>} */

+        }
     });
     // Prevent erroring out if the messagesmergedMessages array is empty.
     if (messagesmergedMessages.length === 0) {
         messagesmergedMessages.unshift({
             role: 'user',
             content: PROMPT_PLACEHOLDER,
         });

@@ -741,7 +742,7 @@ export function mergeMessages(messages, names, strict) {
741	742	mergedMessages[i].role = 'user';
742	743	}
743	744	}
744	745	if (mergedMessages.length && placeholders) {
745	746	if (mergedMessages[0].role === 'system' && (mergedMessages.length === 1 \|\| mergedMessages[1].role !== 'user')) {
746	747	mergedMessages.splice(1, 0, { role: 'user', content: PROMPT_PLACEHOLDER });
747	748	}

@@ -749,7 +750,7 @@ export function mergeMessages(messages, names, strict) {
749	750	mergedMessages.unshift({ role: 'user', content: PROMPT_PLACEHOLDER });
750	751	}
751	752	}
752	753	return mergeMessages(mergedMessages, names, false, placeholders);
753	754	}
754	755
755	756	return mergedMessages;