Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

🔄 fix: o-Series Model Regex for System Messages (#7245)

Browse source 
* fix: no system message only for o1-preview and o1-mini

* chore(OpenAIClient): linting

* fix: update regex to include o1-preview and o1-mini in noSystemModelRegex

* refactor: rename variable for consistency with AgentClient

---------

Co-authored-by: Andres <9771158+andresgit@users.noreply.github.com>
This commit is contained in:
Danny Avila 2025-05-06 08:40:00 -04:00 • committed by GitHub
parent fc6e14efe2
commit 4fbb81c774
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/app/clients/OpenAIClient.js
View file

@ -475,7 +475,9 @@ class OpenAIClient extends BaseClient {
promptPrefix = this.augmentedPrompt + promptPrefix; promptPrefix = this.augmentedPrompt + promptPrefix;
} }
if (promptPrefix && this.isOmni !== true) { const noSystemModelRegex = /\b(o1-preview|o1-mini)\b/i.test(this.modelOptions.model);
if (promptPrefix && !noSystemModelRegex) {
promptPrefix = `Instructions:\n${promptPrefix.trim()}`; promptPrefix = `Instructions:\n${promptPrefix.trim()}`;
instructions = { instructions = {
role: 'system', role: 'system',
@ -503,7 +505,7 @@ class OpenAIClient extends BaseClient {
}; };
/** EXPERIMENTAL */ /** EXPERIMENTAL */
if (promptPrefix && this.isOmni === true) { if (promptPrefix && noSystemModelRegex) {
const lastUserMessageIndex = payload.findLastIndex((message) => message.role === 'user'); const lastUserMessageIndex = payload.findLastIndex((message) => message.role === 'user');
if (lastUserMessageIndex !== -1) { if (lastUserMessageIndex !== -1) {
if (Array.isArray(payload[lastUserMessageIndex].content)) { if (Array.isArray(payload[lastUserMessageIndex].content)) {

2
api/server/controllers/agents/client.js
View file

@ -58,7 +58,7 @@ const payloadParser = ({ req, agent, endpoint }) => {
const legacyContentEndpoints = new Set([KnownEndpoints.groq, KnownEndpoints.deepseek]); const legacyContentEndpoints = new Set([KnownEndpoints.groq, KnownEndpoints.deepseek]);
const noSystemModelRegex = [/\b(o1)\b/gi]; const noSystemModelRegex = [/\b(o1-preview|o1-mini)\b/gi];
// const { processMemory, memoryInstructions } = require('~/server/services/Endpoints/agents/memory'); // const { processMemory, memoryInstructions } = require('~/server/services/Endpoints/agents/memory');
// const { getFormattedMemories } = require('~/models/Memory'); // const { getFormattedMemories } = require('~/models/Memory');