improve delta process (#657)

josStorer · Mar 23, 2024 · d49280c · d49280c
1 parent dba68e7
commit d49280c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/services/apis/custom-api.mjs b/src/services/apis/custom-api.mjs
@@ -62,12 +62,18 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
       }
 
       if (data.response) answer = data.response
-      else
-        answer +=
-          data.choices[0]?.delta?.content ||
-          data.choices[0]?.message?.content ||
-          data.choices[0]?.text ||
-          ''
+      else {
+        const delta = data.choices[0]?.delta?.content
+        const content = data.choices[0]?.message?.content
+        const text = data.choices[0]?.text
+        if (delta !== undefined) {
+          answer += delta
+        } else if (content) {
+          answer = content
+        } else if (text) {
+          answer += text
+        }
+      }
       port.postMessage({ answer: answer, done: false, session: null })
     },
     async onStart() {},

diff --git a/src/services/apis/openai-api.mjs b/src/services/apis/openai-api.mjs
@@ -154,11 +154,16 @@ export async function generateAnswersWithChatgptApiCompat(
         console.debug('json error', error)
         return
       }
-      answer +=
-        data.choices[0]?.delta?.content ||
-        data.choices[0]?.message?.content ||
-        data.choices[0]?.text ||
-        ''
+      const delta = data.choices[0]?.delta?.content
+      const content = data.choices[0]?.message?.content
+      const text = data.choices[0]?.text
+      if (delta !== undefined) {
+        answer += delta
+      } else if (content) {
+        answer = content
+      } else if (text) {
+        answer += text
+      }
       port.postMessage({ answer: answer, done: false, session: null })
     },
     async onStart() {},