@lobehub/chat 1.94.3 → 1.94.4

package/src/utils/fetch/__tests__/fetchSSE.test.ts

@@ -38,7 +38,7 @@ describe('fetchSSE', () => {
     await fetchSSE('/', {
       onMessageHandle: mockOnMessageHandle,
       onFinish: mockOnFinish,
-      smoothing: false,
+      responseAnimation: 'fadeIn',
     });
 
     expect(mockOnMessageHandle).toHaveBeenNthCalledWith(1, { text: 'Hello World', type: 'text' });
@@ -75,7 +75,7 @@ describe('fetchSSE', () => {
     await fetchSSE('/', {
       onMessageHandle: mockOnMessageHandle,
       onFinish: mockOnFinish,
-      smoothing: false,
+      responseAnimation: 'fadeIn',
     });
 
     expect(mockOnMessageHandle).toHaveBeenNthCalledWith(1, {
@@ -122,7 +122,7 @@ describe('fetchSSE', () => {
     });
   });
 
-  it.skip('should handle text event with smoothing correctly', async () => {
+  it('should handle text event with smoothing correctly', async () => {
     const mockOnMessageHandle = vi.fn();
     const mockOnFinish = vi.fn();
 
@@ -138,7 +138,7 @@ describe('fetchSSE', () => {
     await fetchSSE('/', {
       onMessageHandle: mockOnMessageHandle,
       onFinish: mockOnFinish,
-      smoothing: true,
+      responseAnimation: 'smooth',
     });
 
     const expectedMessages = [
@@ -168,6 +168,39 @@ describe('fetchSSE', () => {
     });
   });
 
+  it('should not handle text events', async () => {
+    const mockOnMessageHandle = vi.fn();
+    const mockOnFinish = vi.fn();
+
+    (fetchEventSource as any).mockImplementationOnce(
+      async (url: string, options: FetchEventSourceInit) => {
+        options.onopen!({ clone: () => ({ ok: true, headers: new Headers() }) } as any);
+        options.onmessage!({ event: 'text', data: JSON.stringify('He') } as any);
+        await sleep(100);
+        options.onmessage!({ event: 'text', data: JSON.stringify('llo') } as any);
+        await sleep(60);
+        options.onmessage!({ event: 'text', data: JSON.stringify(' World') } as any);
+      },
+    );
+
+    await fetchSSE('/', {
+      onMessageHandle: mockOnMessageHandle,
+      onFinish: mockOnFinish,
+      responseAnimation: 'none',
+    });
+
+    expect(mockOnMessageHandle).toHaveBeenNthCalledWith(1, { text: 'He', type: 'text' });
+    expect(mockOnMessageHandle).toHaveBeenNthCalledWith(2, { text: 'llo', type: 'text' });
+    expect(mockOnMessageHandle).toHaveBeenNthCalledWith(3, { text: ' World', type: 'text' });
+
+    expect(mockOnFinish).toHaveBeenCalledWith('Hello World', {
+      observationId: null,
+      toolCalls: undefined,
+      traceId: null,
+      type: 'done',
+    });
+  });
+
   describe('reasoning', () => {
     it('should handle reasoning event without smoothing', async () => {
       const mockOnMessageHandle = vi.fn();
@@ -187,7 +220,7 @@ describe('fetchSSE', () => {
       await fetchSSE('/', {
         onMessageHandle: mockOnMessageHandle,
         onFinish: mockOnFinish,
-        smoothing: false,
+        responseAnimation: 'fadeIn',
       });
 
       expect(mockOnMessageHandle).toHaveBeenNthCalledWith(1, { text: 'Hello', type: 'reasoning' });
@@ -265,7 +298,7 @@ describe('fetchSSE', () => {
     await fetchSSE('/', {
       onMessageHandle: mockOnMessageHandle,
       onFinish: mockOnFinish,
-      smoothing: true,
+      responseAnimation: 'smooth',
     });
 
     // TODO: need to check whether the `aarg1` is correct
@@ -317,10 +350,22 @@ describe('fetchSSE', () => {
       onMessageHandle: mockOnMessageHandle,
       onFinish: mockOnFinish,
       signal: abortController.signal,
-      smoothing: true,
+      responseAnimation: 'smooth',
     });
 
-    const expectedMessages = [{ text: 'Hello World', type: 'text' }];
+    const expectedMessages = [
+      { text: 'H', type: 'text' },
+      { text: 'e', type: 'text' },
+      { text: 'l', type: 'text' },
+      { text: 'l', type: 'text' },
+      { text: 'o', type: 'text' },
+      { text: ' ', type: 'text' },
+      { text: 'W', type: 'text' },
+      { text: 'o', type: 'text' },
+      { text: 'r', type: 'text' },
+      { text: 'l', type: 'text' },
+      { text: 'd', type: 'text' },
+    ];
 
     expectedMessages.forEach((message, index) => {
       expect(mockOnMessageHandle).toHaveBeenNthCalledWith(index + 1, message);
@@ -344,7 +389,7 @@ describe('fetchSSE', () => {
       },
     );
 
-    await fetchSSE('/', { onFinish: mockOnFinish, smoothing: false });
+    await fetchSSE('/', { onFinish: mockOnFinish, responseAnimation: 'fadeIn' });
 
     expect(mockOnFinish).toHaveBeenCalledWith('Hello', {
       observationId: null,
@@ -361,7 +406,7 @@ describe('fetchSSE', () => {
       },
     );
 
-    await fetchSSE('/', { onFinish: mockOnFinish, smoothing: false });
+    await fetchSSE('/', { onFinish: mockOnFinish, responseAnimation: 'fadeIn' });
 
     expect(mockOnFinish).toHaveBeenCalledWith('Hello', {
       observationId: null,
@@ -382,7 +427,7 @@ describe('fetchSSE', () => {
         },
       );
 
-      await fetchSSE('/', { onAbort: mockOnAbort, smoothing: false });
+      await fetchSSE('/', { onAbort: mockOnAbort, responseAnimation: 'fadeIn' });
 
       expect(mockOnAbort).toHaveBeenCalledWith('Hello');
     });
@@ -397,7 +442,7 @@ describe('fetchSSE', () => {
         },
       );
 
-      await fetchSSE('/', { onAbort: mockOnAbort, smoothing: false });
+      await fetchSSE('/', { onAbort: mockOnAbort, responseAnimation: 'fadeIn' });
 
       expect(mockOnAbort).toHaveBeenCalledWith('Hello');
     });

package/src/utils/fetch/fetchSSE.ts

@@ -1,10 +1,8 @@
-import { isObject } from 'lodash-es';
-
 import { MESSAGE_CANCEL_FLAT } from '@/const/message';
 import { LOBE_CHAT_OBSERVATION_ID, LOBE_CHAT_TRACE_ID } from '@/const/trace';
 import { parseToolCalls } from '@/libs/model-runtime';
 import { ChatErrorType } from '@/types/fetch';
-import { SmoothingParams } from '@/types/llm';
+import { ResponseAnimation, ResponseAnimationStyle } from '@/types/llm';
 import {
   ChatMessageError,
   MessageToolCall,
@@ -92,7 +90,7 @@ export interface FetchSSEOptions {
       | MessageBase64ImageChunk
       | MessageSpeedChunk,
   ) => void;
-  smoothing?: SmoothingParams | boolean;
+  responseAnimation?: ResponseAnimation;
 }
 
 const START_ANIMATION_SPEED = 10; // 默认起始速度
@@ -302,6 +300,14 @@ const createSmoothToolCalls = (params: {
   };
 };
 
+export const standardizeAnimationStyle = (
+  animationStyle?: ResponseAnimation,
+): Exclude<ResponseAnimation, ResponseAnimationStyle> => {
+  return typeof animationStyle === 'object'
+    ? animationStyle
+    : { text: animationStyle, toolsCalling: animationStyle };
+};
+
 /**
  * Fetch data using stream method
  */
@@ -313,16 +319,14 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
   let finishedType: SSEFinishType = 'done';
   let response!: Response;
 
-  const { smoothing } = options;
-
-  const textSmoothing = false;
-  // const toolsCallingSmoothing = false;
-  // TODO: 看下后面就是完全移除 smoothing 还是怎么说
-  // const textSmoothing = typeof smoothing === 'boolean' ? smoothing : (smoothing?.text ?? true);
-  const toolsCallingSmoothing =
-    typeof smoothing === 'boolean' ? smoothing : (smoothing?.toolsCalling ?? false);
-
-  const smoothingSpeed = isObject(smoothing) ? smoothing.speed : undefined;
+  const {
+    text,
+    toolsCalling,
+    speed: smoothingSpeed,
+  } = standardizeAnimationStyle(options.responseAnimation ?? {});
+  const shouldSkipTextProcessing = text === 'none';
+  const textSmoothing = text === 'smooth';
+  const toolsCallingSmoothing = toolsCalling === 'smooth';
 
   // 添加文本buffer和计时器相关变量
   let textBuffer = '';
@@ -453,7 +457,10 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
           // skip empty text
           if (!data) break;
 
-          if (textSmoothing) {
+          if (shouldSkipTextProcessing) {
+            output += data;
+            options.onMessageHandle?.({ text: data, type: 'text' });
+          } else if (textSmoothing) {
             textController.pushToQueue(data);
 
             if (!textController.isAnimationActive) textController.startAnimation();