wassname/chatGPTBox
1
0
Fork 0
mirror of https://github.com/wassname/chatGPTBox.git synced 2026-07-17 11:26:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve fetch onmessage

Browse Source
This commit is contained in:
josc146
2024-04-16 12:32:46 +08:00
parent e29f8a111f
commit 97fc651785
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/apis/custom-api.mjs
+14 -12
View File
@@ -32,6 +32,12 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
let answer = ''
let finished = false
const finish = () => {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
}
await fetchSSE(apiUrl, {
method: 'POST',
signal: controller.signal,
@@ -48,11 +54,9 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
}),
onMessage(message) {
console.debug('sse message', message)
if (!finished && message.trim() === '[DONE]') {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
if (finished) return
if (message.trim() === '[DONE]') {
finish()
return
}
let data
@@ -62,13 +66,6 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
console.debug('json error', error)
return
}
if (!finished && data.choices[0]?.finish_reason) {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
return
}
if (data.response) answer = data.response
else {
@@ -84,6 +81,11 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
}
}
port.postMessage({ answer: answer, done: false, session: null })
if (data.choices[0]?.finish_reason) {
finish()
return
}
},
async onStart() {},
async onEnd() {
src/services/apis/openai-api.mjs
+28 -24
View File
@@ -39,6 +39,12 @@ export async function generateAnswersWithGptCompletionApi(
let answer = ''
let finished = false
const finish = () => {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
}
await fetchSSE(`${apiUrl}/v1/completions`, {
method: 'POST',
signal: controller.signal,
@@ -56,11 +62,9 @@ export async function generateAnswersWithGptCompletionApi(
}),
onMessage(message) {
console.debug('sse message', message)
if (!finished && message.trim() === '[DONE]') {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
if (finished) return
if (message.trim() === '[DONE]') {
finish()
return
}
let data
@@ -70,16 +74,14 @@ export async function generateAnswersWithGptCompletionApi(
console.debug('json error', error)
return
}
if (!finished && data.choices[0]?.finish_reason) {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
return
}
answer += data.choices[0].text
port.postMessage({ answer: answer, done: false, session: null })
if (data.choices[0]?.finish_reason) {
finish()
return
}
},
async onStart() {},
async onEnd() {
@@ -136,6 +138,12 @@ export async function generateAnswersWithChatgptApiCompat(
let answer = ''
let finished = false
const finish = () => {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
}
await fetchSSE(`${baseUrl}/v1/chat/completions`, {
method: 'POST',
signal: controller.signal,
@@ -152,11 +160,9 @@ export async function generateAnswersWithChatgptApiCompat(
}),
onMessage(message) {
console.debug('sse message', message)
if (!finished && message.trim() === '[DONE]') {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
if (finished) return
if (message.trim() === '[DONE]') {
finish()
return
}
let data
@@ -166,13 +172,6 @@ export async function generateAnswersWithChatgptApiCompat(
console.debug('json error', error)
return
}
if (!finished && data.choices[0]?.finish_reason) {
finished = true
pushRecord(session, question, answer)
console.debug('conversation history', { content: session.conversationRecords })
port.postMessage({ answer: null, done: true, session: session })
return
}
const delta = data.choices[0]?.delta?.content
const content = data.choices[0]?.message?.content
@@ -185,6 +184,11 @@ export async function generateAnswersWithChatgptApiCompat(
answer += text
}
port.postMessage({ answer: answer, done: false, session: null })
if (data.choices[0]?.finish_reason) {
finish()
return
}
},
async onStart() {},
async onEnd() {