diff --git a/src/services/apis/azure-openai-api.mjs b/src/services/apis/azure-openai-api.mjs index f532831..59055a7 100644 --- a/src/services/apis/azure-openai-api.mjs +++ b/src/services/apis/azure-openai-api.mjs @@ -59,6 +59,7 @@ export async function generateAnswersWithAzureOpenaiApi(port, question, session) }, async onStart() {}, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) }, diff --git a/src/services/apis/chatgpt-web.mjs b/src/services/apis/chatgpt-web.mjs index 89f11c0..31e3269 100644 --- a/src/services/apis/chatgpt-web.mjs +++ b/src/services/apis/chatgpt-web.mjs @@ -123,7 +123,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session, }), onMessage(message) { console.debug('sse message', message) - if (message === '[DONE]') { + if (message.trim() === '[DONE]') { pushRecord(session, question, answer) console.debug('conversation history', { content: session.conversationRecords }) port.postMessage({ answer: null, done: true, session: session }) @@ -148,6 +148,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session, // sendModerations(accessToken, question, session.conversationId, session.messageId) }, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) }, diff --git a/src/services/apis/custom-api.mjs b/src/services/apis/custom-api.mjs index fbbf1a6..f148eee 100644 --- a/src/services/apis/custom-api.mjs +++ b/src/services/apis/custom-api.mjs @@ -47,7 +47,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK }), onMessage(message) { console.debug('sse message', message) - if (message === '[DONE]') { + if (message.trim() === '[DONE]') { pushRecord(session, question, answer) console.debug('conversation history', { content: session.conversationRecords }) port.postMessage({ answer: null, done: true, session: session }) @@ -72,6 +72,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK }, async onStart() {}, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) }, diff --git a/src/services/apis/openai-api.mjs b/src/services/apis/openai-api.mjs index b486981..e9d3d79 100644 --- a/src/services/apis/openai-api.mjs +++ b/src/services/apis/openai-api.mjs @@ -55,7 +55,7 @@ export async function generateAnswersWithGptCompletionApi( }), onMessage(message) { console.debug('sse message', message) - if (message === '[DONE]') { + if (message.trim() === '[DONE]') { pushRecord(session, question, answer) console.debug('conversation history', { content: session.conversationRecords }) port.postMessage({ answer: null, done: true, session: session }) @@ -73,6 +73,7 @@ export async function generateAnswersWithGptCompletionApi( }, async onStart() {}, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) }, @@ -122,7 +123,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api }), onMessage(message) { console.debug('sse message', message) - if (message === '[DONE]') { + if (message.trim() === '[DONE]') { pushRecord(session, question, answer) console.debug('conversation history', { content: session.conversationRecords }) port.postMessage({ answer: null, done: true, session: session }) @@ -144,6 +145,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api }, async onStart() {}, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) }, diff --git a/src/services/apis/waylaidwanderer-api.mjs b/src/services/apis/waylaidwanderer-api.mjs index a5797e2..c8c3053 100644 --- a/src/services/apis/waylaidwanderer-api.mjs +++ b/src/services/apis/waylaidwanderer-api.mjs @@ -36,7 +36,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess }), onMessage(message) { console.debug('sse message', message) - if (message === '[DONE]') { + if (message.trim() === '[DONE]') { pushRecord(session, question, answer) console.debug('conversation history', { content: session.conversationRecords }) port.postMessage({ answer: null, done: true, session: session }) @@ -64,6 +64,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess }, async onStart() {}, async onEnd() { + port.postMessage({ done: true }) port.onMessage.removeListener(messageListener) port.onDisconnect.removeListener(disconnectListener) },