Upload 2 files
Browse files- src/index.js +14 -21
src/index.js
CHANGED
|
@@ -151,6 +151,7 @@ const makeRequest = async (session_id, requestModel, messages) => {
|
|
| 151 |
const handleStreamData = (text, messageId, model, ctx) => {
|
| 152 |
const textContent = [...text.matchAll(/data:.*(?:}|]$)/g)]
|
| 153 |
let lastContent = null;
|
|
|
|
| 154 |
|
| 155 |
for (let index = 0; index < textContent.length; index++) {
|
| 156 |
const item = textContent[index];
|
|
@@ -177,32 +178,31 @@ const handleStreamData = (text, messageId, model, ctx) => {
|
|
| 177 |
|
| 178 |
let contentToSend = null;
|
| 179 |
|
| 180 |
-
//
|
| 181 |
-
if (content?.delta) {
|
| 182 |
-
|
| 183 |
-
|
| 184 |
-
|
| 185 |
-
} else if (content?.content && typeof content.content === 'string') {
|
| 186 |
-
// 只在非增量更新时处理完整内容
|
| 187 |
-
if (content.type !== 'message_field_delta') {
|
| 188 |
-
contentToSend = content.content;
|
| 189 |
}
|
| 190 |
-
}
|
| 191 |
-
|
|
|
|
| 192 |
if (content.field_name === 'session_state.answer' ||
|
| 193 |
content.field_name === 'content') {
|
| 194 |
// 检查是否是最终的完整消息
|
| 195 |
if (content.field_value.includes('</thinking>') ||
|
| 196 |
content.field_value.includes('</result>')) {
|
|
|
|
| 197 |
contentToSend = content.field_value;
|
| 198 |
}
|
| 199 |
}
|
| 200 |
-
}
|
| 201 |
-
|
|
|
|
|
|
|
| 202 |
if (typeof content.content === 'string') {
|
| 203 |
contentToSend = content.content;
|
| 204 |
} else if (content.content.content) {
|
| 205 |
-
// 如果content是对象且有content属性
|
| 206 |
contentToSend = content.content.content;
|
| 207 |
}
|
| 208 |
}
|
|
@@ -210,13 +210,6 @@ const handleStreamData = (text, messageId, model, ctx) => {
|
|
| 210 |
// 如果有内容要发送,且与上一次不同
|
| 211 |
if (contentToSend && contentToSend !== lastContent) {
|
| 212 |
lastContent = contentToSend;
|
| 213 |
-
// 如果是增量更新,检查是否包含完整消息标记
|
| 214 |
-
if (content?.type === 'message_field_delta' &&
|
| 215 |
-
(contentToSend.includes('</thinking>') ||
|
| 216 |
-
contentToSend.includes('</result>'))) {
|
| 217 |
-
// 跳过增量更新中的完整消息
|
| 218 |
-
continue;
|
| 219 |
-
}
|
| 220 |
ctx.res.write(`data: ${JSON.stringify({
|
| 221 |
"id": `chatcmpl-${messageId}`,
|
| 222 |
"choices": [
|
|
|
|
| 151 |
const handleStreamData = (text, messageId, model, ctx) => {
|
| 152 |
const textContent = [...text.matchAll(/data:.*(?:}|]$)/g)]
|
| 153 |
let lastContent = null;
|
| 154 |
+
let isCompletingMessage = false;
|
| 155 |
|
| 156 |
for (let index = 0; index < textContent.length; index++) {
|
| 157 |
const item = textContent[index];
|
|
|
|
| 178 |
|
| 179 |
let contentToSend = null;
|
| 180 |
|
| 181 |
+
// 处理增量更新
|
| 182 |
+
if (content?.type === 'message_field_delta' && content?.delta) {
|
| 183 |
+
// 如果正在完成消息,跳过增量更新
|
| 184 |
+
if (!isCompletingMessage) {
|
| 185 |
+
contentToSend = content.delta;
|
|
|
|
|
|
|
|
|
|
|
|
|
| 186 |
}
|
| 187 |
+
}
|
| 188 |
+
// 处理完整消息
|
| 189 |
+
else if (content?.type === 'message_field' && content?.field_value) {
|
| 190 |
if (content.field_name === 'session_state.answer' ||
|
| 191 |
content.field_name === 'content') {
|
| 192 |
// 检查是否是最终的完整消息
|
| 193 |
if (content.field_value.includes('</thinking>') ||
|
| 194 |
content.field_value.includes('</result>')) {
|
| 195 |
+
isCompletingMessage = true;
|
| 196 |
contentToSend = content.field_value;
|
| 197 |
}
|
| 198 |
}
|
| 199 |
+
}
|
| 200 |
+
// 处理最终结果
|
| 201 |
+
else if (content?.type === 'message_result' && content?.content) {
|
| 202 |
+
isCompletingMessage = true;
|
| 203 |
if (typeof content.content === 'string') {
|
| 204 |
contentToSend = content.content;
|
| 205 |
} else if (content.content.content) {
|
|
|
|
| 206 |
contentToSend = content.content.content;
|
| 207 |
}
|
| 208 |
}
|
|
|
|
| 210 |
// 如果有内容要发送,且与上一次不同
|
| 211 |
if (contentToSend && contentToSend !== lastContent) {
|
| 212 |
lastContent = contentToSend;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 213 |
ctx.res.write(`data: ${JSON.stringify({
|
| 214 |
"id": `chatcmpl-${messageId}`,
|
| 215 |
"choices": [
|