@lobehub/chat 0.149.2 → 0.149.4

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # 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>
+
+#### 💄 Styles
+
+- **misc**: Add displaying the message "Reset Successfully.".
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Add displaying the message "Reset Successfully.", closes [#2158](https://github.com/lobehub/lobe-chat/issues/2158) ([27913ef](https://github.com/lobehub/lobe-chat/commit/27913ef))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.149.2](https://github.com/lobehub/lobe-chat/compare/v0.149.1...v0.149.2)
 
 <sup>Released on **2024-04-24**</sup>

package/locales/ar/setting.json

@@ -22,6 +22,7 @@
       "confirm": "هل تؤكد إعادة تعيين جميع الإعدادات؟",
       "currentVersion": "الإصدار الحالي",
       "desc": "إعادة تعيين جميع عناصر الإعدادات إلى القيم الافتراضية",
+      "success": "تمت إعادة ضبط جميع الإعدادات",
       "title": "إعادة تعيين جميع الإعدادات"
     }
   },

package/locales/bg-BG/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Потвърдете нулирането на всички настройки?",
       "currentVersion": "Текуща версия",
       "desc": "Нулирайте всички настройки до стойностите по подразбиране",
+      "success": "Всички настройки са нулирани успешно",
       "title": "Нулиране на всички настройки"
     }
   },

package/locales/de-DE/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Alle Einstellungen zurücksetzen?",
       "currentVersion": "Aktuelle Version",
       "desc": "Alle Einstellungen auf Standardwerte zurücksetzen",
+      "success": "Alle Einstellungen wurden zurückgesetzt",
       "title": "Alle Einstellungen zurücksetzen"
     }
   },

package/locales/en-US/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Confirm to reset all settings?",
       "currentVersion": "Current Version",
       "desc": "Reset all settings to default values",
+      "success": "All settings have been reset",
       "title": "Reset All Settings"
     }
   },

package/locales/es-ES/setting.json

@@ -22,6 +22,7 @@
       "confirm": "¿Confirmar el restablecimiento de todas las configuraciones?",
       "currentVersion": "Versión actual",
       "desc": "Restablecer todas las opciones de configuración a sus valores predeterminados",
+      "success": "Se han restablecido todas las configuraciones",
       "title": "Restablecer todas las configuraciones"
     }
   },

package/locales/fr-FR/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Confirmer la réinitialisation de tous les paramètres ?",
       "currentVersion": "Version actuelle",
       "desc": "Réinitialiser tous les paramètres aux valeurs par défaut",
+      "success": "Toutes les configurations ont été réinitialisées avec succès",
       "title": "Réinitialiser tous les paramètres"
     }
   },

package/locales/it-IT/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Confermi di ripristinare tutte le impostazioni?",
       "currentVersion": "Versione corrente",
       "desc": "Ripristina tutte le impostazioni ai valori predefiniti",
+      "success": "Tutte le impostazioni sono state ripristinate con successo",
       "title": "Ripristina tutte le impostazioni"
     }
   },

package/locales/ja-JP/setting.json

@@ -22,6 +22,7 @@
       "confirm": "すべての設定をリセットしますか？",
       "currentVersion": "現在のバージョン",
       "desc": "すべての設定をデフォルト値にリセットします",
+      "success": "すべての設定がリセットされました",
       "title": "すべての設定をリセット"
     }
   },

package/locales/ko-KR/setting.json

@@ -22,6 +22,7 @@
       "confirm": "모든 설정을 재설정하시겠습니까?",
       "currentVersion": "현재 버전",
       "desc": "모든 설정을 기본값으로 재설정합니다",
+      "success": "모든 설정이 재설정되었습니다",
       "title": "모든 설정 재설정"
     }
   },

package/locales/nl-NL/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Alle instellingen resetten bevestigen?",
       "currentVersion": "Huidige versie",
       "desc": "Alle instellingen worden teruggezet naar de standaardwaarden",
+      "success": "Alle instellingen zijn succesvol gereset",
       "title": "Alle instellingen resetten"
     }
   },

package/locales/pl-PL/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Potwierdź zresetowanie wszystkich ustawień?",
       "currentVersion": "Aktualna wersja",
       "desc": "Zresetuj wszystkie ustawienia do wartości domyślnych",
+      "success": "Wszystkie ustawienia zostały zresetowane",
       "title": "Zresetuj wszystkie ustawienia"
     }
   },

package/locales/pt-BR/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Confirmar a redefinição de todas as configurações?",
       "currentVersion": "Versão Atual",
       "desc": "Redefinir todas as configurações para os valores padrão",
+      "success": "Todas as configurações foram redefinidas com sucesso",
       "title": "Redefinir Todas as Configurações"
     }
   },

package/locales/ru-RU/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Вы уверены, что хотите сбросить все настройки?",
       "currentVersion": "Текущая версия",
       "desc": "Сброс всех параметров настройки до значений по умолчанию",
+      "success": "Все настройки были успешно сброшены",
       "title": "Сброс всех настроек"
     }
   },

package/locales/tr-TR/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Tüm ayarları sıfırlamayı onaylıyor musunuz?",
       "currentVersion": "Geçerli Sürüm",
       "desc": "Tüm ayarları varsayılan değerlere sıfırlar",
+      "success": "Tüm ayarlar sıfırlandı",
       "title": "Tüm Ayarları Sıfırla"
     }
   },

package/locales/vi-VN/setting.json

@@ -22,6 +22,7 @@
       "confirm": "Xác nhận đặt lại tất cả cài đặt?",
       "currentVersion": "Phiên bản hiện tại",
       "desc": "Đặt lại tất cả cài đặt về giá trị mặc định",
+      "success": "Đã đặt lại tất cả cài đặt",
       "title": "Đặt lại tất cả cài đặt"
     }
   },

package/locales/zh-CN/setting.json

@@ -21,7 +21,8 @@
       "action": "立即重置",
       "confirm": "确认重置所有设置？",
       "currentVersion": "当前版本",
-      "desc": "重置所有设置项回默认值",
+      "desc": "重置所有设置，使用默认值",
+      "success": "已重置所有设置",
       "title": "重置所有设置"
     }
   },

package/locales/zh-TW/setting.json

@@ -22,6 +22,7 @@
       "confirm": "確認重置所有設定？",
       "currentVersion": "當前版本",
       "desc": "重置所有設定項回預設值",
+      "success": "已重設所有設定",
       "title": "重置所有設定"
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.149.2",
+  "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/app/api/chat/google/route.test.ts

@@ -15,8 +15,7 @@ describe('Configuration tests', () => {
   });
 
   it('should contain specific regions in preferredRegion', () => {
-    expect(preferredRegion).not.contain(['hkg1']);
-    expect(preferredRegion).not.contain(['dub1']);
+    expect(preferredRegion).not.contain(['hk1']);
   });
 });
 

package/src/app/api/chat/google/route.ts

@@ -15,23 +15,6 @@ export const runtime = 'edge';
 
 // due to Gemini-1.5-pro is not available in Hong Kong and Ireland, we need to set the preferred region to exclude "Hong Kong" or "Ireland".
 // refs: https://github.com/lobehub/lobe-chat/pull/2149
-export const preferredRegion = [
-  'icn1', 
-  'sin1', 
-  'hnd1', 
-  'kix1',
-  'bom1', 
-  'cdg1',
-  'lhr1', 
-  'cpt1',
-  'pdx1', 
-  'arn1',
-  'cle1',
-  'syd1',
-  'iad1', 
-  'fra1', 
-  'sfo1',
-  'gru1'
-];
+export const preferredRegion = ['cle1', 'iad1', 'pdx1', 'sfo1'];
 
 export const POST = async (req: Request) => UniverseRoute(req, { params: { provider: 'google' } });

package/src/app/settings/common/Common.tsx

@@ -68,6 +68,7 @@ const Common = memo<SettingsCommonProps>(({ showAccessCodeConfig, showOAuthLogin
       onOk: () => {
         resetSettings();
         form.setFieldsValue(DEFAULT_SETTINGS);
+        message.success(t('danger.reset.success'));
       },
       title: t('danger.reset.confirm'),
     });

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/locales/default/setting.ts

@@ -21,7 +21,8 @@ export default {
       action: '立即重置',
       confirm: '确认重置所有设置？',
       currentVersion: '当前版本',
-      desc: '重置所有设置项回默认值',
+      desc: '重置所有设置，使用默认值',
+      success: '已重置所有设置',
       title: '重置所有设置',
     },
   },

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();