Merge branch 'main' into main

readme.md

@@ -315,7 +315,7 @@ See [demos/demo-reverse-proxy](./demos/demo-reverse-proxy.ts) for a full example
 npx tsx demos/demo-reverse-proxy.ts
 ```
 
-`ChatGPTUnofficialProxyAPI` messages also contain a `conversationid` in addition to `parentMessageId`, since the ChatGPT webapp can't reference messages across
+`ChatGPTUnofficialProxyAPI` messages also contain a `conversationid` in addition to `parentMessageId`, since the ChatGPT webapp can't reference messages across different accounts & conversations.
 
 #### Reverse Proxy
 

src/chatgpt-api.ts

@@ -210,17 +210,15 @@ export class ChatGPTAPI {
 
                   if (response?.choices?.length) {
                     const delta = response.choices[0].delta
-                    if (delta?.content) {
+                    result.delta = delta.content
-                      result.delta = delta.content
+                    if (delta?.content) result.text += delta.content
-                      result.text += delta.content
+                    result.detail = response
-                      result.detail = response
 
-                      if (delta.role) {
+                    if (delta.role) {
-                        result.role = delta.role
+                      result.role = delta.role
-                      }
-
-                      onProgress?.(result)
                     }
+
+                    onProgress?.(result)
                   }
                 } catch (err) {
                   console.warn('OpenAI stream SEE event unexpected error', err)
@@ -333,13 +331,17 @@ export class ChatGPTAPI {
     }
 
     const systemMessageOffset = messages.length
-    let nextMessages = messages.concat([
+    let nextMessages = text
-      {
+      ? messages.concat([
-        role: 'user',
+          {
-        content: text,
+            ...{
-        name: opts.name
+              role: 'user',
-      }
+              content: text,
-    ])
+              name: opts.name
+            }
+          }
+        ])
+      : messages
     let numTokens = 0
 
     do {