repair openai system format processing

index.mjs

@@ -98,6 +98,9 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
         res.setHeader("Access-Control-Allow-Origin", "*");
         let jsonBody = JSON.parse(req.rawBody);
 
+        // Normalize messages
+        jsonBody.messages = openaiNormalizeMessages(jsonBody.messages);
+
         console.log("message length:" + jsonBody.messages.length);
         // decide which session to use randomly
         let randomSession = Object.keys(provider.sessions)[Math.floor(Math.random() * Object.keys(provider.sessions).length)];
@@ -115,24 +118,22 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
         console.log("Using model " + jsonBody.model);
 
         // call provider to get completion
-        await provider
+        try {
-            .getCompletion(
+            const {completion, cancel} = await provider.getCompletion({
-                {
                 username: randomSession,
                 messages: jsonBody.messages,
                 stream: !!jsonBody.stream,
                 proxyModel: jsonBody.model,
                 useCustomMode: process.env.USE_CUSTOM_MODE === "true"
-                }
+            });
-            )
+
-            .then(({completion, cancel}) => {
             completion.on("start", (id) => {
                 if (jsonBody.stream) {
                     // send message start
                     res.write(createEvent(":", "queue heartbeat 114514"));
                     res.write(
                         createEvent("data", {
-                                id: msgid,
+                            id: id,
                             object: "chat.completion.chunk",
                             created: Math.floor(new Date().getTime() / 1000),
                             model: jsonBody.model,
@@ -216,9 +217,9 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
                 completion.removeAllListeners();
                 cancel();
             });
-            })
+        } catch (error) {
-            .catch((error) => {
             console.error(error);
+            const errorMessage = "Error occurred, please check the log.\n\n出现错误，请检查日志：<pre>" + (error.stack || error) + "</pre>";
             if (jsonBody.stream) {
                 res.write(
                     createEvent("data", {
@@ -230,9 +231,7 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
                                     sexual: {filtered: false, severity: "safe"},
                                     violence: {filtered: false, severity: "safe"},
                                 },
-                                    delta: {
+                                delta: {content: errorMessage},
-                                        content: "Error occurred, please check the log.\n\n出现错误，请检查日志：<pre>" + error.stack || error + "</pre>",
-                                    },
                                 finish_reason: null,
                                 index: 0,
                             },
@@ -244,7 +243,6 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
                         system_fingerprint: "114514",
                     })
                 );
-                    res.end();
             } else {
                 res.write(
                     JSON.stringify({
@@ -258,7 +256,7 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
                                 index: 0,
                                 message: {
                                     role: "assistant",
-                                        content: "Error occurred, please check the log.\n\n出现错误，请检查日志：<pre>" + error.stack || error + "</pre>",
+                                    content: errorMessage,
                                 },
                                 logprobs: null,
                                 finish_reason: "stop",
@@ -271,11 +269,41 @@ app.post("/v1/chat/completions", OpenAIApiKeyAuth, (req, res) => {
                         },
                     })
                 );
+            }
             res.end();
         }
     });
-    });
 });
+
+// Helper function: Normalize messages
+function openaiNormalizeMessages(messages) {
+    let normalizedMessages = [];
+    let currentSystemMessage = "";
+
+    for (let message of messages) {
+        if (message.role === 'system') {
+            if (currentSystemMessage) {
+                currentSystemMessage += "\n" + message.content;
+            } else {
+                currentSystemMessage = message.content;
+            }
+        } else {
+            if (currentSystemMessage) {
+                normalizedMessages.push({role: 'system', content: currentSystemMessage});
+                currentSystemMessage = "";
+            }
+            normalizedMessages.push(message);
+        }
+    }
+
+    if (currentSystemMessage) {
+        normalizedMessages.push({role: 'system', content: currentSystemMessage});
+    }
+
+    return normalizedMessages;
+}
+
+
 // handle anthropic format model request
 app.post("/v1/messages", AnthropicApiKeyAuth, (req, res) => {
     req.rawBody = "";
@@ -292,7 +320,7 @@ app.post("/v1/messages", AnthropicApiKeyAuth, (req, res) => {
         let jsonBody = JSON.parse(req.rawBody);
 
         // 处理消息格式
-        jsonBody.messages = normalizeMessages(jsonBody.messages);
+        jsonBody.messages = anthropicNormalizeMessages(jsonBody.messages);
 
         if (jsonBody.system) {
             // 把系统消息加入messages的首条
@@ -419,7 +447,7 @@ app.post("/v1/messages", AnthropicApiKeyAuth, (req, res) => {
 });
 
 // 辅助函数：规范化消息格式
-function normalizeMessages(messages) {
+function anthropicNormalizeMessages(messages) {
     return messages.map(message => {
         if (typeof message.content === 'string') {
             return message;