Merge pull request #3989 from bmen25124/prefill_custom_request Added prefill for custom-request->text completion

ad15e4f172ac77ecfdac9e571df690220dd5c9db

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

Signed

Parents: 8100a542e2e97d420aa8c3368cc3ab34ef5d472c 294dc3b3b149f57e60a0e3164a0b058edc844dea

public/scripts/custom-request.js+43 -18 Viewed

                 // Format messages using instruct formatting
                 const formattedMessages = [];
 +                const prefillActive = prompt.length > 0 ? prompt[prompt.length - 1].role === 'assistant' : false;
                 for (const message of prompt) {
                     let messageContent = message.content;
                     if (!message.ignoreInstruct) {
 -                        messageContent = formatInstructModeChat(
 +                        const isLastMessage = message === prompt[prompt.length - 1];
 -                            message.role,
++
 -                            message.content,
 +                        // This complicated logic means:
 -                            message.role === 'user',
 +                        // 1. If prefill is not active, format all messages
 -                            false,
 +                        // 2. If prefill is active, format all messages except the last one
 -                            undefined,
 +                        if (!isLastMessage || !prefillActive) {
 -                            undefined,
 +                            messageContent = formatInstructModeChat(
 -                            undefined,
 +                                message.role,
 -                            undefined,
 +                                message.content,
 -                            instructPreset,
 +                                message.role === 'user',
 -                        );
+-
 -                        // Add prompt formatting for the last message
 -                        if (message === prompt[prompt.length - 1]) {
 -                            messageContent += formatInstructModePrompt(
 -                                undefined,
                                 false,
                                 undefined,
                                 undefined,
                                 undefined,
                                 falseundefined,
 -                                false,
                                 instructPreset,
                             );
+                        }
++
 +                        // Add prompt formatting for the last message.
 +                        if (isLastMessage) {
 +                            if (!prefillActive) { // e.g. "<|im_start|>user:"
 +                                messageContent += formatInstructModePrompt(
 +                                    undefined,
 +                                    false,
 +                                    undefined,
 +                                    undefined,
 +                                    undefined,
 +                                    false,
 +                                    false,
 +                                    instructPreset,
 +                                );
 +                            } else { // e.g. "<|im_start|>assistant: Hello, my name is"
 +                                const overridenInstructPreset = structuredClone(instructPreset);
 +                                overridenInstructPreset.output_suffix = '';
 +                                overridenInstructPreset.wrap = false;
 +                                messageContent = formatInstructModeChat(
 +                                    message.role,
 +                                    message.content,
 +                                    false, // since it is assistant
 +                                    false,
 +                                    undefined,
 +                                    undefined,
 +                                    undefined,
 +                                    undefined,
 +                                    overridenInstructPreset,
 +                                );
 +                            }
 +                        }
+                    }
                     formattedMessages.push(messageContent);
+                }