@lobehub/chat 0.149.3 → 0.149.4

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.149.4](https://github.com/lobehub/lobe-chat/compare/v0.149.3...v0.149.4)
+
+<sup>Released on **2024-04-25**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix chat client request not support abort.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix chat client request not support abort, closes [#2193](https://github.com/lobehub/lobe-chat/issues/2193) ([d22ef2c](https://github.com/lobehub/lobe-chat/commit/d22ef2c))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.149.3](https://github.com/lobehub/lobe-chat/compare/v0.149.2...v0.149.3)
 
 <sup>Released on **2024-04-25**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.149.3",
+  "version": "0.149.4",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/libs/agent-runtime/anthropic/index.test.ts

@@ -72,14 +72,17 @@ describe('LobeAnthropicAI', () => {
       });
 
       // Assert
-      expect(instance['client'].messages.create).toHaveBeenCalledWith({
-        max_tokens: 4096,
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'claude-3-haiku-20240307',
-        stream: true,
-        temperature: 0,
-        top_p: 1,
-      });
+      expect(instance['client'].messages.create).toHaveBeenCalledWith(
+        {
+          max_tokens: 4096,
+          messages: [{ content: 'Hello', role: 'user' }],
+          model: 'claude-3-haiku-20240307',
+          stream: true,
+          temperature: 0,
+          top_p: 1,
+        },
+        {},
+      );
       expect(result).toBeInstanceOf(Response);
     });
 
@@ -105,14 +108,17 @@ describe('LobeAnthropicAI', () => {
       });
 
       // Assert
-      expect(instance['client'].messages.create).toHaveBeenCalledWith({
-        max_tokens: 4096,
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'claude-3-haiku-20240307',
-        stream: true,
-        system: 'You are an awesome greeter',
-        temperature: 0,
-      });
+      expect(instance['client'].messages.create).toHaveBeenCalledWith(
+        {
+          max_tokens: 4096,
+          messages: [{ content: 'Hello', role: 'user' }],
+          model: 'claude-3-haiku-20240307',
+          stream: true,
+          system: 'You are an awesome greeter',
+          temperature: 0,
+        },
+        {},
+      );
       expect(result).toBeInstanceOf(Response);
     });
 
@@ -137,14 +143,17 @@ describe('LobeAnthropicAI', () => {
       });
 
       // Assert
-      expect(instance['client'].messages.create).toHaveBeenCalledWith({
-        max_tokens: 2048,
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'claude-3-haiku-20240307',
-        stream: true,
-        temperature: 0.5,
-        top_p: 1,
-      });
+      expect(instance['client'].messages.create).toHaveBeenCalledWith(
+        {
+          max_tokens: 2048,
+          messages: [{ content: 'Hello', role: 'user' }],
+          model: 'claude-3-haiku-20240307',
+          stream: true,
+          temperature: 0.5,
+          top_p: 1,
+        },
+        {},
+      );
       expect(result).toBeInstanceOf(Response);
     });
 
@@ -171,14 +180,17 @@ describe('LobeAnthropicAI', () => {
       });
 
       // Assert
-      expect(instance['client'].messages.create).toHaveBeenCalledWith({
-        max_tokens: 2048,
-        messages: [{ content: 'Hello', role: 'user' }],
-        model: 'claude-3-haiku-20240307',
-        stream: true,
-        temperature: 0.5,
-        top_p: 1,
-      });
+      expect(instance['client'].messages.create).toHaveBeenCalledWith(
+        {
+          max_tokens: 2048,
+          messages: [{ content: 'Hello', role: 'user' }],
+          model: 'claude-3-haiku-20240307',
+          stream: true,
+          temperature: 0.5,
+          top_p: 1,
+        },
+        {},
+      );
       expect(result).toBeInstanceOf(Response);
     });
 

package/src/libs/agent-runtime/anthropic/index.ts

@@ -32,15 +32,18 @@ export class LobeAnthropicAI implements LobeRuntimeAI {
     const user_messages = messages.filter((m) => m.role !== 'system');
 
     try {
-      const response = await this.client.messages.create({
-        max_tokens: max_tokens || 4096,
-        messages: buildAnthropicMessages(user_messages),
-        model: model,
-        stream: true,
-        system: system_message?.content as string,
-        temperature: temperature,
-        top_p: top_p,
-      });
+      const response = await this.client.messages.create(
+        {
+          max_tokens: max_tokens || 4096,
+          messages: buildAnthropicMessages(user_messages),
+          model: model,
+          stream: true,
+          system: system_message?.content as string,
+          temperature: temperature,
+          top_p: top_p,
+        },
+        { signal: options?.signal },
+      );
 
       const [prod, debug] = response.tee();
 

package/src/libs/agent-runtime/azureOpenai/index.ts

@@ -8,7 +8,7 @@ import { OpenAIStream, StreamingTextResponse } from 'ai';
 
 import { LobeRuntimeAI } from '../BaseAI';
 import { AgentRuntimeErrorType } from '../error';
-import { ChatStreamPayload, ModelProvider } from '../types';
+import { ChatCompetitionOptions, ChatStreamPayload, ModelProvider } from '../types';
 import { AgentRuntimeError } from '../utils/createError';
 import { debugStream } from '../utils/debugStream';
 
@@ -26,7 +26,7 @@ export class LobeAzureOpenAI implements LobeRuntimeAI {
 
   baseURL: string;
 
-  async chat(payload: ChatStreamPayload) {
+  async chat(payload: ChatStreamPayload, options?: ChatCompetitionOptions) {
     // ============  1. preprocess messages   ============ //
     const { messages, model, ...params } = payload;
 
@@ -36,10 +36,9 @@ export class LobeAzureOpenAI implements LobeRuntimeAI {
       const response = await this.client.streamChatCompletions(
         model,
         messages as ChatRequestMessage[],
-        params as GetChatCompletionsOptions,
+        { ...params, abortSignal: options?.signal } as GetChatCompletionsOptions,
       );
 
-      // TODO: we need to refactor this part in the future
       const stream = OpenAIStream(response as any);
 
       const [debug, prod] = stream.tee();

package/src/libs/agent-runtime/bedrock/index.ts

@@ -68,7 +68,7 @@ export class LobeBedrockAI implements LobeRuntimeAI {
 
     try {
       // Ask Claude for a streaming chat completion given the prompt
-      const bedrockResponse = await this.client.send(command);
+      const bedrockResponse = await this.client.send(command, { abortSignal: options?.signal });
 
       // Convert the response into a friendly text-stream
       const stream = AWSBedrockStream(

package/src/libs/agent-runtime/ollama/index.ts

@@ -31,6 +31,13 @@ export class LobeOllamaAI implements LobeRuntimeAI {
 
   async chat(payload: ChatStreamPayload, options?: ChatCompetitionOptions) {
     try {
+      const abort = () => {
+        this.client.abort();
+        options?.signal?.removeEventListener('abort', abort);
+      };
+
+      options?.signal?.addEventListener('abort', abort);
+
       const response = await this.client.chat({
         messages: this.buildOllamaMessages(payload.messages),
         model: payload.model,

package/src/libs/agent-runtime/perplexity/index.ts

@@ -33,6 +33,7 @@ export class LobePerplexityAI implements LobeRuntimeAI {
       };
       const response = await this.client.chat.completions.create(
         chatPayload as unknown as OpenAI.ChatCompletionCreateParamsStreaming,
+        { signal: options?.signal },
       );
       const [prod, debug] = response.tee();
 

package/src/libs/agent-runtime/types/chat.ts

@@ -90,8 +90,9 @@ export interface ChatStreamPayload {
 }
 
 export interface ChatCompetitionOptions {
-  callback: ChatStreamCallbacks;
+  callback?: ChatStreamCallbacks;
   headers?: Record<string, any>;
+  signal?: AbortSignal;
 }
 
 export interface ChatCompletionFunctions {

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts

@@ -76,6 +76,7 @@ export const LobeOpenAICompatibleFactory = ({
         const response = await this.client.chat.completions.create(postPayload, {
           // https://github.com/lobehub/lobe-chat/pull/318
           headers: { Accept: '*/*' },
+          signal: options?.signal,
         });
 
         const [prod, useForDebug] = response.tee();

package/src/services/chat.ts

@@ -168,18 +168,6 @@ export function initializeWithClientStore(provider: string, payload: any) {
   });
 }
 
-/**
- * Fetch chat completion on the client side.
- * @param provider - The provider name.
- * @param payload - The payload data for the chat stream.
- * @returns A promise that resolves to the chat response.
- */
-export async function fetchOnClient(provider: string, payload: Partial<ChatStreamPayload>) {
-  const agentRuntime = await initializeWithClientStore(provider, payload);
-  const data = payload as ChatStreamPayload;
-  return await agentRuntime.chat(data);
-}
-
 class ChatService {
   createAssistantMessage = async (
     { plugins: enabledPlugins, messages, ...params }: GetChatCompletionPayload,
@@ -279,7 +267,7 @@ class ChatService {
      */
     if (enableFetchOnClient) {
       try {
-        return await fetchOnClient(provider, payload);
+        return this.fetchOnClient({ payload, provider, signal });
       } catch (e) {
         const {
           errorType = ChatErrorType.BadRequest,
@@ -472,6 +460,21 @@ class ChatService {
       userId: commonSelectors.userId(useGlobalStore.getState()),
     };
   }
+
+  /**
+   * Fetch chat completion on the client side.
+
+   */
+  private fetchOnClient = async (params: {
+    payload: Partial<ChatStreamPayload>;
+    provider: string;
+    signal?: AbortSignal;
+  }) => {
+    const agentRuntime = await initializeWithClientStore(params.provider, params.payload);
+    const data = params.payload as ChatStreamPayload;
+
+    return agentRuntime.chat(data, { signal: params.signal });
+  };
 }
 
 export const chatService = new ChatService();