Fix xAI example messages conversion

5eeba8894e692410cd5bb788900eb5c422924228

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

Parents: 91fc50b82da98466a96d5cbebd278d66509b7c31

src/endpoints/backends/chat-completions.js+2 -0 Viewed

     convertCohereMessages,
     convertMistralMessages,
     convertAI21Messages,
 +    convertXAIMessages,
     mergeMessages,
     cachingAtDepthForOpenRouterClaude,
     cachingAtDepthForClaude,

         apiKey = readSecret(request.user.directories, SECRET_KEYS.XAI);
         headers = {};
         bodyParams = {};
 +        request.body.messages = convertXAIMessages(request.body.messages, getPromptNames(request));
     } else {
         console.warn('This chat completion source is not supported yet.');
         return response.status(400).send({ error: true });

src/prompt-converters.js+37 -0 Viewed

+}
 /**
 + * Convert a prompt from the messages objects to the format used by xAI.
 + * @param {object[]} messages Array of messages
 + * @param {PromptNames} names Prompt names
 + * @returns {object[]} Prompt for xAI
 + */
 +export function convertXAIMessages(messages, names) {
 +    if (!Array.isArray(messages)) {
 +        return [];
 +    }
++
 +    messages.forEach(msg => {
 +        if (!msg.name || msg.role === 'user') {
 +            return;
 +        }
++
 +        const needsCharNamePrefix = [
 +            { role: 'assistant', condition: names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(msg.content) },
 +            { role: 'system', name: 'example_assistant', condition: names.charName && !msg.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(msg.content) },
 +            { role: 'system', name: 'example_user', condition: names.userName && !msg.content.startsWith(`${names.userName}: `) },
 +        ];
++
 +        const matchingRule = needsCharNamePrefix.find(rule =>
 +            msg.role === rule.role && (!rule.name || msg.name === rule.name) && rule.condition,
 +        );
++
 +        if (matchingRule) {
 +            const prefix = msg.role === 'system' && msg.name === 'example_user' ? names.userName : names.charName;
 +            msg.content = `${prefix}: ${msg.content}`;
 +        }
++
 +        delete msg.name;
 +    });
++
 +    return messages;
 +}
++
 +/**
  * Merge messages with the same consecutive role, removing names if they exist.
  * @param {any[]} messages Messages to merge
  * @param {PromptNames} names Prompt names