Skip to content

Commit 3bef0c0

Browse files
committed
fix: when requests stop, input box sometimes isn't reset properly (#462)
1 parent ad4f93e commit 3bef0c0

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

src/services/apis/azure-openai-api.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export async function generateAnswersWithAzureOpenaiApi(port, question, session)
5959
},
6060
async onStart() {},
6161
async onEnd() {
62+
port.postMessage({ done: true })
6263
port.onMessage.removeListener(messageListener)
6364
port.onDisconnect.removeListener(disconnectListener)
6465
},

src/services/apis/chatgpt-web.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
123123
}),
124124
onMessage(message) {
125125
console.debug('sse message', message)
126-
if (message === '[DONE]') {
126+
if (message.trim() === '[DONE]') {
127127
pushRecord(session, question, answer)
128128
console.debug('conversation history', { content: session.conversationRecords })
129129
port.postMessage({ answer: null, done: true, session: session })
@@ -148,6 +148,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
148148
// sendModerations(accessToken, question, session.conversationId, session.messageId)
149149
},
150150
async onEnd() {
151+
port.postMessage({ done: true })
151152
port.onMessage.removeListener(messageListener)
152153
port.onDisconnect.removeListener(disconnectListener)
153154
},

src/services/apis/custom-api.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
4747
}),
4848
onMessage(message) {
4949
console.debug('sse message', message)
50-
if (message === '[DONE]') {
50+
if (message.trim() === '[DONE]') {
5151
pushRecord(session, question, answer)
5252
console.debug('conversation history', { content: session.conversationRecords })
5353
port.postMessage({ answer: null, done: true, session: session })
@@ -72,6 +72,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
7272
},
7373
async onStart() {},
7474
async onEnd() {
75+
port.postMessage({ done: true })
7576
port.onMessage.removeListener(messageListener)
7677
port.onDisconnect.removeListener(disconnectListener)
7778
},

src/services/apis/openai-api.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export async function generateAnswersWithGptCompletionApi(
5555
}),
5656
onMessage(message) {
5757
console.debug('sse message', message)
58-
if (message === '[DONE]') {
58+
if (message.trim() === '[DONE]') {
5959
pushRecord(session, question, answer)
6060
console.debug('conversation history', { content: session.conversationRecords })
6161
port.postMessage({ answer: null, done: true, session: session })
@@ -73,6 +73,7 @@ export async function generateAnswersWithGptCompletionApi(
7373
},
7474
async onStart() {},
7575
async onEnd() {
76+
port.postMessage({ done: true })
7677
port.onMessage.removeListener(messageListener)
7778
port.onDisconnect.removeListener(disconnectListener)
7879
},
@@ -122,7 +123,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
122123
}),
123124
onMessage(message) {
124125
console.debug('sse message', message)
125-
if (message === '[DONE]') {
126+
if (message.trim() === '[DONE]') {
126127
pushRecord(session, question, answer)
127128
console.debug('conversation history', { content: session.conversationRecords })
128129
port.postMessage({ answer: null, done: true, session: session })
@@ -144,6 +145,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
144145
},
145146
async onStart() {},
146147
async onEnd() {
148+
port.postMessage({ done: true })
147149
port.onMessage.removeListener(messageListener)
148150
port.onDisconnect.removeListener(disconnectListener)
149151
},

src/services/apis/waylaidwanderer-api.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess
3636
}),
3737
onMessage(message) {
3838
console.debug('sse message', message)
39-
if (message === '[DONE]') {
39+
if (message.trim() === '[DONE]') {
4040
pushRecord(session, question, answer)
4141
console.debug('conversation history', { content: session.conversationRecords })
4242
port.postMessage({ answer: null, done: true, session: session })
@@ -64,6 +64,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess
6464
},
6565
async onStart() {},
6666
async onEnd() {
67+
port.postMessage({ done: true })
6768
port.onMessage.removeListener(messageListener)
6869
port.onDisconnect.removeListener(disconnectListener)
6970
},

0 commit comments

Comments
 (0)