@chat-lab/ui 0.1.0-beta.41 → 0.1.0-beta.42

package/dist/packages/core/dist/index.js

@@ -3,8 +3,10 @@ import mitt from '../../../node_modules/.pnpm/mitt@3.0.1/node_modules/mitt/dist/
 import { proxy } from '../../../node_modules/.pnpm/valtio@2.1.8_patch_hash_boxi3qpsg2dztwe4vz7tsjpr3m_@types_react@17.0.2_react@17.0.2/node_modules/valtio/esm/vanilla.js';
 import v4 from '../../../node_modules/.pnpm/uuid@13.0.0/node_modules/uuid/dist/v4.js';
 import last from '../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/last.js';
+import throttle from '../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/throttle.js';
 import findIndex from '../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/findIndex.js';
 import compact from '../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/compact.js';
+import findLastIndex from '../../../node_modules/.pnpm/lodash-es@4.17.21/node_modules/lodash-es/findLastIndex.js';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -307,6 +309,7 @@ var BetterEventSource = class {
       },
       () => this.isNormalFinished = true
     );
+    const decoder = new TextDecoder();
     try {
       while (true) {
         const { done, value } = await reader.read();
@@ -324,7 +327,7 @@ var BetterEventSource = class {
           }
           break;
         }
-        const text = new TextDecoder().decode(value);
+        const text = decoder.decode(value, { stream: true });
         let response = null;
         if (text.startsWith("data:")) {
           response = text.slice(5);
@@ -768,7 +771,7 @@ var A2AProtocol = class extends BaseProtocols_default {
             });
           }
         }
-        return { ...message, content: message.content.concat(contents) };
+        return { ...message, content: contents };
     }
     return message;
   }
@@ -811,8 +814,6 @@ var A2AProtocol = class extends BaseProtocols_default {
   }
 };
 var a2a_default = A2AProtocol;
-
-// src/protocols/ark.ts
 var ArkProtocol = class extends BaseProtocols_default {
   // stream: boolean;
   constructor(options) {
@@ -825,19 +826,43 @@ var ArkProtocol = class extends BaseProtocols_default {
     const arkResponse = chunk.response;
     const text = arkResponse.choices?.[0]?.message?.content || "";
     const reasoningText = arkResponse?.choices?.[0]?.message?.reasoningContent || "";
-    return {
-      ...chunk.message,
-      content: [
-        ...chunk.message.content,
-        {
+    const newContent = [...chunk.message.content];
+    if (reasoningText) {
+      const lastReasoningIndex = findLastIndex(
+        newContent,
+        (c) => c.type === "reasoning"
+      );
+      if (lastReasoningIndex !== -1) {
+        const prev = newContent[lastReasoningIndex];
+        newContent[lastReasoningIndex] = {
+          ...prev,
+          text: prev.text + reasoningText
+        };
+      } else {
+        newContent.push({
           type: "reasoning",
           text: reasoningText
-        },
-        {
+        });
+      }
+    }
+    if (text) {
+      const lastTextIndex = findLastIndex(newContent, (c) => c.type === "text");
+      if (lastTextIndex !== -1) {
+        const prev = newContent[lastTextIndex];
+        newContent[lastTextIndex] = {
+          ...prev,
+          text: prev.text + text
+        };
+      } else {
+        newContent.push({
           type: "text",
           text
-        }
-      ]
+        });
+      }
+    }
+    return {
+      ...chunk.message,
+      content: newContent
     };
   }
   // 修改generateRequestBody方法，确保包含defaultParams参数
@@ -1327,7 +1352,7 @@ var AdkPlugin = class extends ChatkitPlugin {
           //       response: chunk,
           //     }),
           // ),
-          messages: data.events.reduce((prev, cur) => {
+          messages: data?.events?.reduce((prev, cur) => {
             if (prev.length === 0 || cur.author === "user" || last(prev)?.role !== (cur.author === "user" ? "user" : "assistant")) {
               prev.push(
                 this.adkProtocol.parseChunk({
@@ -1443,36 +1468,41 @@ async function fetchChatCompletion({
   storeManager
 }) {
   try {
+    let currentMessage = storeManager.getMessage(
+      message.threadId,
+      message.id
+    ) || message;
+    const throttledOnResponse = throttle(
+      (msg) => onResponse(msg),
+      500,
+      { leading: true, trailing: true }
+    );
     const onChunk = ({
       response
     }) => {
-      const _message = storeManager.getMessage(
-        message.threadId,
-        message.id
-      );
       const updatedMessage = protocolAdaptor.parseChunk({
-        message: _message,
+        message: currentMessage,
         response
       });
+      currentMessage = updatedMessage;
       if (updatedMessage.status === "error" /* ERROR */) {
+        throttledOnResponse.cancel();
         onResponse({ ...updatedMessage, status: "error" /* ERROR */ });
         return;
       }
-      onResponse({ ...updatedMessage, status: "pending" /* PENDING */ });
+      throttledOnResponse({ ...updatedMessage, status: "pending" /* PENDING */ });
     };
     try {
       if (abortController?.signal) {
         abortController.signal.addEventListener("abort", () => {
-          const _message = storeManager.getMessage(
-            message.threadId,
-            message.id
-          );
-          onResponse({
-            ..._message,
+          throttledOnResponse.cancel();
+          currentMessage = {
+            ...currentMessage,
             sending: false,
             status: "aborted" /* ABORTED */,
             endedAt: dayjs().unix()
-          });
+          };
+          onResponse(currentMessage);
         });
       }
       await completions({
@@ -1481,25 +1511,27 @@ async function fetchChatCompletion({
         onChunk
       });
     } catch (error) {
+      throttledOnResponse.cancel();
       console.log(error);
-      const _message = storeManager.getMessage(
-        message.threadId,
-        message.id
-      );
-      _message.status = "error" /* ERROR */;
-      _message.sending = false;
-      _message.endedAt = Date.now();
-      _message.error = {
-        message: error.message || "\u672A\u77E5\u9519\u8BEF",
-        extra: error.stack
+      currentMessage = {
+        ...currentMessage,
+        status: "error" /* ERROR */,
+        sending: false,
+        endedAt: Date.now(),
+        error: {
+          message: error.message || "\u672A\u77E5\u9519\u8BEF",
+          extra: error.stack
+        }
       };
-      onResponse(_message);
+      onResponse(currentMessage);
       return;
     }
+    throttledOnResponse.cancel();
     onResponse({
-      id: message.id,
-      threadId: message.threadId,
-      status: message.status !== "error" /* ERROR */ ? "success" /* SUCCESS */ : "error" /* ERROR */,
+      ...currentMessage,
+      id: currentMessage.id,
+      threadId: currentMessage.threadId,
+      status: currentMessage.status !== "error" /* ERROR */ ? "success" /* SUCCESS */ : "error" /* ERROR */,
       endedAt: Date.now()
     });
   } catch (error) {
@@ -1717,6 +1749,7 @@ var ChatController = class {
       dynamicParams: hookContext.dynamicParams,
       requestOptions: hookContext.extraRequestOptions
     };
+    const storeManager = this.store;
     try {
       const protocolAdaptor = getProtocolAdaptor(this.protocolOptions);
       const requestBody = protocolAdaptor.generateRequestBody({
@@ -1726,7 +1759,7 @@ var ChatController = class {
         thread,
         contextMessages: allMessages
       });
-      this.store.addMessage(threadId, userMessage);
+      storeManager.addMessage(threadId, userMessage);
       assistantMessage = generateModelMessage({
         threadId
       });
@@ -1745,13 +1778,13 @@ var ChatController = class {
         pluginManager: this.pluginManager,
         completions: this.requestOptions.completions,
         protocolAdaptor,
-        storeManager: this.store,
+        storeManager,
         onResponse: async (updatedMessage) => {
           if (updatedMessage.status === "pending" /* PENDING */ && !updatedMessage.createdAt) {
             updatedMessage.createdAt = Date.now();
           }
           this.pluginManager.hooks.message.received.callAsync(updatedMessage);
-          this.store.updateMessage(threadId, updatedMessage.id, {
+          storeManager.updateMessage(threadId, updatedMessage.id, {
             updatedMessage,
             partial: true
           });
@@ -1760,8 +1793,8 @@ var ChatController = class {
     } catch (error) {
       onErrorFromProps?.(error);
     } finally {
-      this.store.setSending(threadId, false);
-      this.store.setLoading(threadId, false);
+      storeManager.setSending(threadId, false);
+      storeManager.setLoading(threadId, false);
       return;
     }
   }