@lobehub/chat 1.16.11 → 1.16.12

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.16.12](https://github.com/lobehub/lobe-chat/compare/v1.16.11...v1.16.12)
+
+<sup>Released on **2024-09-12**</sup>
+
+#### 💄 Styles
+
+- **misc**: Remove brackets from model names with dates in OpenAI.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Remove brackets from model names with dates in OpenAI, closes [#3927](https://github.com/lobehub/lobe-chat/issues/3927) ([2a937bc](https://github.com/lobehub/lobe-chat/commit/2a937bc))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.16.11](https://github.com/lobehub/lobe-chat/compare/v1.16.10...v1.16.11)
 
 <sup>Released on **2024-09-12**</sup>

package/docs/self-hosting/advanced/auth/next-auth/logto.zh-CN.mdx

@@ -75,4 +75,4 @@ tags:
 </Callout>
 </Steps>
 
-<Callout type={'info'}>部署成功后，用户将可以通过 Logto 身份认证并使用 LobeChat。</Callout>
+<Callout type={'info'}>部署成功后，用户将可以通过 Logto 身份认证并使用 LobeChat。</Callout>

package/locales/ar/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "إذا كنت تستخدم AWS SSO/STS، يرجى إدخال رمز جلسة AWS الخاص بك",
+      "placeholder": "رمز جلسة AWS",
+      "title": "رمز جلسة AWS (اختياري)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "منطقة خدمة مخصصة",
+      "customSessionToken": "رمز الجلسة المخصص",
       "description": "أدخل معرف الوصول / مفتاح الوصول السري الخاص بك في AWS لبدء الجلسة. لن يتم تسجيل تكوين المصادقة الخاص بك من قبل التطبيق",
       "title": "استخدام معلومات المصادقة الخاصة بـ Bedrock المخصصة"
     }

package/locales/bg-BG/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Ако използвате AWS SSO/STS, моля, въведете вашия AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (по избор)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Персонализиран регион за услуги",
+      "customSessionToken": "Персонализиран токен за сесия",
       "description": "Въведете вашия AWS AccessKeyId / SecretAccessKey, за да започнете сесия. Приложението няма да запази вашата удостоверителна конфигурация",
       "title": "Използване на персонализирана информация за удостоверяване на Bedrock"
     }

package/locales/de-DE/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Wenn Sie AWS SSO/STS verwenden, geben Sie Ihr AWS Session Token ein",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (optional)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Benutzerdefinierter Regionsservice",
+      "customSessionToken": "Benutzerdefiniertes Sitzungstoken",
       "description": "Geben Sie Ihren AWS AccessKeyId / SecretAccessKey ein, um das Gespräch zu beginnen. Die App speichert Ihre Authentifizierungsinformationen nicht.",
       "title": "Verwenden Sie benutzerdefinierte Bedrock-Authentifizierungsinformationen"
     }

package/locales/en-US/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "If you are using AWS SSO/STS, please enter your AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (optional)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Custom Service Region",
+      "customSessionToken": "Custom Session Token",
       "description": "Enter your AWS AccessKeyId / SecretAccessKey to start the session. The app will not store your authentication configuration",
       "title": "Use Custom Bedrock Authentication Information"
     }

package/locales/es-ES/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Si estás utilizando AWS SSO/STS, introduce tu Token de Sesión de AWS",
+      "placeholder": "Token de Sesión de AWS",
+      "title": "Token de Sesión de AWS (opcional)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Región de servicio personalizada",
+      "customSessionToken": "Token de sesión personalizado",
       "description": "Introduce tu AWS AccessKeyId / SecretAccessKey para comenzar la sesión. La aplicación no guardará tu configuración de autenticación.",
       "title": "Usar información de autenticación de Bedrock personalizada"
     }

package/locales/fr-FR/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "Clé d'accès secrète AWS",
       "title": "Clé d'accès secrète AWS"
     },
+    "sessionToken": {
+      "desc": "Si vous utilisez AWS SSO/STS, veuillez entrer votre jeton de session AWS",
+      "placeholder": "Jeton de session AWS",
+      "title": "Jeton de session AWS (facultatif)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Région de service personnalisée",
+      "customSessionToken": "Jeton de session personnalisé",
       "description": "Entrez votre ID de clé d'accès AWS / SecretAccessKey pour commencer la session. L'application ne stockera pas votre configuration d'authentification.",
       "title": "Utiliser des informations d'authentification Bedrock personnalisées"
     }

package/locales/it-IT/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "Chiave di accesso segreta AWS",
       "title": "Chiave di accesso segreta AWS"
     },
+    "sessionToken": {
+      "desc": "Se stai utilizzando AWS SSO/STS, inserisci il tuo AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (opzionale)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Regione del servizio personalizzata",
+      "customSessionToken": "Token di sessione personalizzato",
       "description": "Inserisci la tua chiave di accesso AWS AccessKeyId / SecretAccessKey per avviare la sessione. L'applicazione non memorizzerà la tua configurazione di autenticazione",
       "title": "Usa le informazioni di autenticazione Bedrock personalizzate"
     }

package/locales/ja-JP/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "AWS SSO/STSを使用している場合は、AWSセッショントークンを入力してください。",
+      "placeholder": "AWSセッショントークン",
+      "title": "AWSセッショントークン（オプション）"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "カスタムサービスリージョン",
+      "customSessionToken": "カスタムセッショントークン",
       "description": "AWS AccessKeyId / SecretAccessKey を入力するとセッションを開始できます。アプリは認証情報を記録しません",
       "title": "使用カスタム Bedrock 認証情報"
     }

package/locales/ko-KR/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS 비밀 액세스 키",
       "title": "AWS 비밀 액세스 키"
     },
+    "sessionToken": {
+      "desc": "AWS SSO/STS를 사용 중이라면 AWS 세션 토큰을 입력하세요.",
+      "placeholder": "AWS 세션 토큰",
+      "title": "AWS 세션 토큰 (선택 사항)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "사용자 정의 서비스 지역",
+      "customSessionToken": "사용자 정의 세션 토큰",
       "description": "AWS AccessKeyId / SecretAccessKey를 입력하면 세션이 시작됩니다. 애플리케이션은 인증 구성을 기록하지 않습니다.",
       "title": "사용자 정의 Bedrock 인증 정보 사용"
     }

package/locales/nl-NL/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Als je AWS SSO/STS gebruikt, voer dan je AWS Sessie Token in",
+      "placeholder": "AWS Sessie Token",
+      "title": "AWS Sessie Token (optioneel)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Aangepaste regio",
+      "customSessionToken": "Aangepaste sessietoken",
       "description": "Voer uw AWS AccessKeyId / SecretAccessKey in om een sessie te starten. De app zal uw verificatiegegevens niet opslaan",
       "title": "Gebruik aangepaste Bedrock-verificatiegegevens"
     }

package/locales/pl-PL/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Jeśli korzystasz z AWS SSO/STS, wprowadź swój token sesji AWS",
+      "placeholder": "Token sesji AWS",
+      "title": "Token sesji AWS (opcjonalnie)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Niestandardowy region usługi",
+      "customSessionToken": "Niestandardowy token sesji",
       "description": "Wprowadź swój AWS AccessKeyId / SecretAccessKey, aby rozpocząć sesję. Aplikacja nie będzie przechowywać Twojej konfiguracji uwierzytelniania",
       "title": "Użyj niestandardowych informacji uwierzytelniających Bedrock"
     }

package/locales/pt-BR/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Se você estiver usando AWS SSO/STS, insira seu Token de Sessão da AWS",
+      "placeholder": "Token de Sessão da AWS",
+      "title": "Token de Sessão da AWS (opcional)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Região de serviço personalizada",
+      "customSessionToken": "Token de Sessão Personalizado",
       "description": "Digite sua AWS AccessKeyId / SecretAccessKey para iniciar a sessão. O aplicativo não irá armazenar suas configurações de autenticação",
       "title": "Usar informações de autenticação Bedrock personalizadas"
     }

package/locales/ru-RU/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Если вы используете AWS SSO/STS, введите ваш AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (необязательно)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Пользовательский регион обслуживания",
+      "customSessionToken": "Пользовательский токен сессии",
       "description": "Введите свой ключ доступа AWS AccessKeyId / SecretAccessKey, чтобы начать сеанс. Приложение не будет сохранять вашу конфигурацию аутентификации",
       "title": "Использовать пользовательскую информацию аутентификации Bedrock"
     }

package/locales/tr-TR/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "AWS SSO/STS kullanıyorsanız, lütfen AWS Oturum Tokeninizi girin",
+      "placeholder": "AWS Oturum Tokeni",
+      "title": "AWS Oturum Tokeni (isteğe bağlı)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Özel Bölge",
+      "customSessionToken": "Özel Oturum Tokeni",
       "description": "AWS AccessKeyId / SecretAccessKey bilgilerinizi girerek oturumu başlatabilirsiniz. Uygulama kimlik doğrulama bilgilerinizi kaydetmez.",
       "title": "Özel Bedrock Kimlik Bilgilerini Kullan"
     }

package/locales/vi-VN/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "Nếu bạn đang sử dụng AWS SSO/STS, hãy nhập AWS Session Token của bạn",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (tùy chọn)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "Vùng Dịch vụ Tùy chỉnh",
+      "customSessionToken": "Mã thông báo phiên tùy chỉnh",
       "description": "Nhập AWS AccessKeyId / SecretAccessKey của bạn để bắt đầu phiên làm việc. Ứng dụng sẽ không lưu trữ cấu hình xác thực của bạn",
       "title": "Sử dụng Thông tin Xác thực Bedrock tùy chỉnh"
     }

package/locales/zh-CN/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "如果你正在使用 AWS SSO/STS，请输入你的 AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (可选)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "自定义服务区域",
+      "customSessionToken": "自定义 Session Token",
       "description": "输入你的 AWS AccessKeyId / SecretAccessKey 即可开始会话。应用不会记录你的鉴权配置",
       "title": "使用自定义 Bedrock 鉴权信息"
     }

package/locales/zh-TW/modelProvider.json

@@ -38,9 +38,15 @@
       "placeholder": "AWS Secret Access Key",
       "title": "AWS Secret Access Key"
     },
+    "sessionToken": {
+      "desc": "如果你正在使用 AWS SSO/STS，請輸入你的 AWS Session Token",
+      "placeholder": "AWS Session Token",
+      "title": "AWS Session Token (可選)"
+    },
     "title": "Bedrock",
     "unlock": {
       "customRegion": "自定義服務區域",
+      "customSessionToken": "自訂 Session Token",
       "description": "輸入你的 AWS AccessKeyId / SecretAccessKey 即可開始會話。應用程式不會記錄你的驗證配置",
       "title": "使用自定義 Bedrock 驗證資訊"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.16.11",
+  "version": "1.16.12",
   "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/(main)/settings/llm/ProviderList/Bedrock/index.tsx

@@ -39,6 +39,17 @@ export const useBedrockProvider = (): ProviderItem => {
         label: t(`${providerKey}.secretAccessKey.title`),
         name: [KeyVaultsConfigKey, providerKey, 'secretAccessKey'],
       },
+      {
+        children: (
+          <Input.Password
+            autoComplete={'new-password'}
+            placeholder={t(`${providerKey}.sessionToken.placeholder`)}
+          />
+        ),
+        desc: t(`${providerKey}.sessionToken.desc`),
+        label: t(`${providerKey}.sessionToken.title`),
+        name: [KeyVaultsConfigKey, providerKey, 'sessionToken'],
+      },
       {
         children: (
           <Select

package/src/app/api/chat/agentRuntime.test.ts

@@ -43,6 +43,7 @@ vi.mock('@/config/llm', () => ({
     AWS_SECRET_ACCESS_KEY: 'test-aws-secret',
     AWS_ACCESS_KEY_ID: 'test-aws-id',
     AWS_REGION: 'test-aws-region',
+    AWS_SESSION_TOKEN: 'test-aws-session-token',
     OLLAMA_PROXY_URL: 'https://test-ollama-url.local',
     PERPLEXITY_API_KEY: 'test-perplexity-key',
     DEEPSEEK_API_KEY: 'test-deepseek-key',

package/src/app/api/chat/agentRuntime.ts

@@ -75,17 +75,20 @@ const getLlmOptionsFromPayload = (provider: string, payload: JWTPayload) => {
       };
     }
     case ModelProvider.Bedrock: {
-      const { AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_REGION } = getLLMConfig();
+      const { AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_REGION, AWS_SESSION_TOKEN } =
+        getLLMConfig();
       let accessKeyId: string | undefined = AWS_ACCESS_KEY_ID;
       let accessKeySecret: string | undefined = AWS_SECRET_ACCESS_KEY;
       let region = AWS_REGION;
+      let sessionToken: string | undefined = AWS_SESSION_TOKEN;
       // if the payload has the api key, use user
       if (payload.apiKey) {
         accessKeyId = payload?.awsAccessKeyId;
         accessKeySecret = payload?.awsSecretAccessKey;
+        sessionToken = payload?.awsSessionToken;
         region = payload?.awsRegion;
       }
-      return { accessKeyId, accessKeySecret, region };
+      return { accessKeyId, accessKeySecret, region, sessionToken };
     }
     case ModelProvider.Ollama: {
       const { OLLAMA_PROXY_URL } = getLLMConfig();

package/src/config/llm.ts

@@ -73,6 +73,7 @@ export const getLLMConfig = () => {
       AWS_REGION: z.string().optional(),
       AWS_ACCESS_KEY_ID: z.string().optional(),
       AWS_SECRET_ACCESS_KEY: z.string().optional(),
+      AWS_SESSION_TOKEN: z.string().optional(),
 
       ENABLED_OLLAMA: z.boolean(),
       OLLAMA_PROXY_URL: z.string().optional(),
@@ -178,6 +179,7 @@ export const getLLMConfig = () => {
       AWS_REGION: process.env.AWS_REGION,
       AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
       AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
+      AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN,
 
       ENABLED_OLLAMA: process.env.ENABLED_OLLAMA !== '0',
       OLLAMA_PROXY_URL: process.env.OLLAMA_PROXY_URL || '',

package/src/config/modelProviders/openai.ts

@@ -35,7 +35,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
-      displayName: 'GPT-4o (240806)',
+      displayName: 'GPT-4o 0806',
       enabled: true,
       functionCall: true,
       id: 'gpt-4o-2024-08-06',
@@ -49,7 +49,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
-      displayName: 'GPT-4o (240513)',
+      displayName: 'GPT-4o 0513',
       functionCall: true,
       id: 'gpt-4o-2024-05-13',
       pricing: {
@@ -88,7 +88,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         '最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。',
-      displayName: 'GPT-4 Turbo Vision (240409)',
+      displayName: 'GPT-4 Turbo Vision 0409',
       functionCall: true,
       id: 'gpt-4-turbo-2024-04-09',
       pricing: {
@@ -113,7 +113,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         '最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。',
-      displayName: 'GPT-4 Turbo Preview (0125)',
+      displayName: 'GPT-4 Turbo Preview 0125',
       functionCall: true,
       id: 'gpt-4-0125-preview',
       pricing: {
@@ -148,7 +148,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         '最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。',
-      displayName: 'GPT-4 Turbo Preview (1106)',
+      displayName: 'GPT-4 Turbo Preview 1106',
       functionCall: true,
       id: 'gpt-4-1106-preview',
       pricing: {
@@ -172,7 +172,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。',
-      displayName: 'GPT-4 (0613)',
+      displayName: 'GPT-4 0613',
       functionCall: true,
       id: 'gpt-4-0613',
       pricing: {
@@ -197,7 +197,7 @@ const OpenAI: ModelProviderCard = {
       // Will be discontinued on June 6, 2025
       description:
         'GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。',
-      displayName: 'GPT-4 32K (0613)',
+      displayName: 'GPT-4 32K 0613',
       functionCall: true,
       id: 'gpt-4-32k-0613',
       pricing: {
@@ -221,7 +221,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125',
-      displayName: 'GPT-3.5 Turbo (0125)',
+      displayName: 'GPT-3.5 Turbo 0125',
       functionCall: true,
       id: 'gpt-3.5-turbo-0125',
       pricing: {
@@ -233,7 +233,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125',
-      displayName: 'GPT-3.5 Turbo (1106)',
+      displayName: 'GPT-3.5 Turbo 1106',
       functionCall: true,
       id: 'gpt-3.5-turbo-1106',
       pricing: {
@@ -269,7 +269,7 @@ const OpenAI: ModelProviderCard = {
     {
       description:
         'GPT-3.5 Turbo 是 OpenAI 的一款基础模型，结合了高效性和经济性，广泛用于文本生成、理解和分析，专为指导性提示进行调整，去除了与聊天相关的优化。',
-      displayName: 'GPT-3.5 Turbo (0613)',
+      displayName: 'GPT-3.5 Turbo 0613',
       // Will be discontinued on September 13, 2024
       id: 'gpt-3.5-turbo-0613',
       legacy: true,

package/src/const/auth.ts

@@ -35,6 +35,7 @@ export interface JWTPayload {
   awsAccessKeyId?: string;
   awsRegion?: string;
   awsSecretAccessKey?: string;
+  awsSessionToken?: string;
   /**
    * user id
    * in client db mode it's a uuid

package/src/features/Conversation/Error/APIKeyForm/Bedrock.tsx

@@ -2,7 +2,7 @@ import { Aws } from '@lobehub/icons';
 import { Icon } from '@lobehub/ui';
 import { Button, Input, Select } from 'antd';
 import { useTheme } from 'antd-style';
-import { Network } from 'lucide-react';
+import { Network, ShieldPlus } from 'lucide-react';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -15,10 +15,12 @@ import { FormAction } from '../style';
 const BedrockForm = memo(() => {
   const { t } = useTranslation('modelProvider');
   const [showRegion, setShow] = useState(false);
+  const [showSessionToken, setShowSessionToken] = useState(false);
 
-  const [accessKeyId, secretAccessKey, region, setConfig] = useUserStore((s) => [
+  const [accessKeyId, secretAccessKey, sessionToken, region, setConfig] = useUserStore((s) => [
     keyVaultsConfigSelectors.bedrockConfig(s).accessKeyId,
     keyVaultsConfigSelectors.bedrockConfig(s).secretAccessKey,
+    keyVaultsConfigSelectors.bedrockConfig(s).sessionToken,
     keyVaultsConfigSelectors.bedrockConfig(s).region,
     s.updateKeyVaultConfig,
   ]);
@@ -48,6 +50,28 @@ const BedrockForm = memo(() => {
         type={'block'}
         value={secretAccessKey}
       />
+      {showSessionToken ? (
+        <Input.Password
+          autoComplete={'new-password'}
+          onChange={(e) => {
+            setConfig(ModelProvider.Bedrock, { sessionToken: e.target.value });
+          }}
+          placeholder={'Aws Session Token'}
+          type={'block'}
+          value={sessionToken}
+        />
+      ) : (
+        <Button
+          block
+          icon={<Icon icon={ShieldPlus} />}
+          onClick={() => {
+            setShowSessionToken(true);
+          }}
+          type={'text'}
+        >
+          {t('bedrock.unlock.customSessionToken')}
+        </Button>
+      )}
       {showRegion ? (
         <Select
           onChange={(region) => {

package/src/libs/agent-runtime/AgentRuntime.ts

@@ -26,7 +26,6 @@ import { LobeSparkAI } from './spark';
 import { LobeStepfunAI } from './stepfun';
 import { LobeTaichuAI } from './taichu';
 import { LobeTogetherAI } from './togetherai';
-import { LobeUpstageAI } from './upstage';
 import {
   ChatCompetitionOptions,
   ChatStreamPayload,
@@ -35,6 +34,7 @@ import {
   ModelProvider,
   TextToImagePayload,
 } from './types';
+import { LobeUpstageAI } from './upstage';
 import { LobeZeroOneAI } from './zeroone';
 import { LobeZhipuAI } from './zhipu';
 
@@ -230,7 +230,7 @@ class AgentRuntime {
 
       case ModelProvider.FireworksAI: {
         runtimeModel = new LobeFireworksAI(params.fireworksai);
-        break
+        break;
       }
 
       case ModelProvider.ZeroOne: {
@@ -275,12 +275,12 @@ class AgentRuntime {
 
       case ModelProvider.Upstage: {
         runtimeModel = new LobeUpstageAI(params.upstage);
-        break
+        break;
       }
 
       case ModelProvider.Spark: {
         runtimeModel = new LobeSparkAI(params.spark);
-        break
+        break;
       }
     }
 

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

@@ -9,14 +9,11 @@ export const LobeBaichuanAI = LobeOpenAICompatibleFactory({
     handlePayload: (payload: ChatStreamPayload) => {
       const { temperature, ...rest } = payload;
 
-      return { 
-        ...rest, 
+      return {
+        ...rest,
         // [baichuan] frequency_penalty must be between 1 and 2.
         frequency_penalty: undefined,
-        temperature: 
-          temperature !== undefined 
-          ? temperature / 2
-          : undefined,
+        temperature: temperature !== undefined ? temperature / 2 : undefined,
       } as OpenAI.ChatCompletionCreateParamsStreaming;
     },
   },

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

@@ -21,6 +21,7 @@ export interface LobeBedrockAIParams {
   accessKeyId?: string;
   accessKeySecret?: string;
   region?: string;
+  sessionToken?: string;
 }
 
 export class LobeBedrockAI implements LobeRuntimeAI {
@@ -28,7 +29,7 @@ export class LobeBedrockAI implements LobeRuntimeAI {
 
   region: string;
 
-  constructor({ region, accessKeyId, accessKeySecret }: LobeBedrockAIParams = {}) {
+  constructor({ region, accessKeyId, accessKeySecret, sessionToken }: LobeBedrockAIParams = {}) {
     if (!(accessKeyId && accessKeySecret))
       throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidBedrockCredentials);
 
@@ -38,6 +39,7 @@ export class LobeBedrockAI implements LobeRuntimeAI {
       credentials: {
         accessKeyId: accessKeyId,
         secretAccessKey: accessKeySecret,
+        sessionToken: sessionToken,
       },
       region: this.region,
     });

package/src/libs/agent-runtime/openai/__snapshots__/index.test.ts.snap

@@ -49,7 +49,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-    "displayName": "GPT-4 Turbo Preview (0125)",
+    "displayName": "GPT-4 Turbo Preview 0125",
     "functionCall": true,
     "id": "gpt-4-0125-preview",
     "pricing": {
@@ -84,7 +84,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "GPT-3.5 Turbo 是 OpenAI 的一款基础模型，结合了高效性和经济性，广泛用于文本生成、理解和分析，专为指导性提示进行调整，去除了与聊天相关的优化。",
-    "displayName": "GPT-3.5 Turbo (0613)",
+    "displayName": "GPT-3.5 Turbo 0613",
     "id": "gpt-3.5-turbo-0613",
     "legacy": true,
     "pricing": {
@@ -95,7 +95,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125",
-    "displayName": "GPT-3.5 Turbo (1106)",
+    "displayName": "GPT-3.5 Turbo 1106",
     "functionCall": true,
     "id": "gpt-3.5-turbo-1106",
     "pricing": {
@@ -106,7 +106,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-    "displayName": "GPT-4 Turbo Preview (1106)",
+    "displayName": "GPT-4 Turbo Preview 1106",
     "functionCall": true,
     "id": "gpt-4-1106-preview",
     "pricing": {
@@ -139,7 +139,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125",
-    "displayName": "GPT-3.5 Turbo (0125)",
+    "displayName": "GPT-3.5 Turbo 0125",
     "functionCall": true,
     "id": "gpt-3.5-turbo-0125",
     "pricing": {
@@ -150,7 +150,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "description": "GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。",
-    "displayName": "GPT-4 (0613)",
+    "displayName": "GPT-4 0613",
     "functionCall": true,
     "id": "gpt-4-0613",
     "pricing": {

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

@@ -213,7 +213,7 @@ describe('LobeQwenAI', () => {
           expect.any(Object),
         );
         const callArgs = createMock.mock.calls[0][0];
-        expect(Number.isInteger(callArgs.temperature)).toBe(false); // Temperature is always not an integer 
+        expect(Number.isInteger(callArgs.temperature)).toBe(false); // Temperature is always not an integer
       });
     });
 

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

@@ -108,10 +108,8 @@ export class LobeQwenAI implements LobeRuntimeAI {
       messages,
       result_format: 'message',
       stream: !!tools?.length ? false : (stream ?? true),
-      temperature: 
-        temperature === 0 || temperature >= 2 
-        ? undefined 
-        : (temperature === 1 ? 0.999 : temperature), // 'temperature' must be Float
+      temperature:
+        temperature === 0 || temperature >= 2 ? undefined : temperature === 1 ? 0.999 : temperature, // 'temperature' must be Float
       top_p: top_p && top_p >= 1 ? 0.999 : top_p,
     };
 

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

@@ -18,9 +18,9 @@ import { AgentRuntimeError } from '../createError';
 import { debugResponse, debugStream } from '../debugStream';
 import { desensitizeUrl } from '../desensitizeUrl';
 import { handleOpenAIError } from '../handleOpenAIError';
+import { convertOpenAIMessages } from '../openaiHelpers';
 import { StreamingResponse } from '../response';
 import { OpenAIStream } from '../streams';
-import { convertOpenAIMessages } from '../openaiHelpers';
 
 // the model contains the following keywords is not a chat model, so we should filter them out
 const CHAT_MODELS_BLOCK_LIST = [

package/src/locales/default/modelProvider.ts

@@ -38,9 +38,15 @@ export default {
       placeholder: 'AWS Secret Access Key',
       title: 'AWS Secret Access Key',
     },
+    sessionToken: {
+      desc: '如果你正在使用 AWS SSO/STS，请输入你的 AWS Session Token',
+      placeholder: 'AWS Session Token',
+      title: 'AWS Session Token (可选)',
+    },
     title: 'Bedrock',
     unlock: {
       customRegion: '自定义服务区域',
+      customSessionToken: '自定义 Session Token',
       description:
         '输入你的 AWS AccessKeyId / SecretAccessKey 即可开始会话。应用不会记录你的鉴权配置',
       title: '使用自定义 Bedrock 鉴权信息',

package/src/server/globalConfig/index.ts

@@ -211,12 +211,12 @@ export const getServerGlobalConfig = () => {
           modelString: ZEROONE_MODEL_LIST,
         }),
       },
-      zhipu: { 
-        enabled: ENABLED_ZHIPU, 
-        enabledModels: extractEnabledModels(ZHIPU_MODEL_LIST), 
-        serverModelCards: transformToChatModelCards({ 
-          defaultChatModels: ZhiPuProviderCard.chatModels, 
-          modelString: ZHIPU_MODEL_LIST 
+      zhipu: {
+        enabled: ENABLED_ZHIPU,
+        enabledModels: extractEnabledModels(ZHIPU_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: ZhiPuProviderCard.chatModels,
+          modelString: ZHIPU_MODEL_LIST,
         }),
       },
     },

package/src/server/routers/edge/config/__snapshots__/index.test.ts.snap

@@ -39,7 +39,7 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
 [
   {
     "description": "GPT 3.5 Turbo，适用于各种文本生成和理解任务，Currently points to gpt-3.5-turbo-0125",
-    "displayName": "GPT-3.5 Turbo (1106)",
+    "displayName": "GPT-3.5 Turbo 1106",
     "enabled": true,
     "functionCall": true,
     "id": "gpt-3.5-turbo-1106",
@@ -99,7 +99,7 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
   },
   {
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-    "displayName": "GPT-4 Turbo Preview (1106)",
+    "displayName": "GPT-4 Turbo Preview 1106",
     "enabled": true,
     "functionCall": true,
     "id": "gpt-4-1106-preview",
@@ -127,7 +127,7 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
 exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST > show the hidden model 1`] = `
 {
   "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-  "displayName": "GPT-4 Turbo Preview (1106)",
+  "displayName": "GPT-4 Turbo Preview 1106",
   "enabled": true,
   "functionCall": true,
   "id": "gpt-4-1106-preview",

package/src/services/_auth.ts

@@ -8,16 +8,21 @@ import { createJWT } from '@/utils/jwt';
 export const getProviderAuthPayload = (provider: string) => {
   switch (provider) {
     case ModelProvider.Bedrock: {
-      const { accessKeyId, region, secretAccessKey } = keyVaultsConfigSelectors.bedrockConfig(
-        useUserStore.getState(),
-      );
+      const { accessKeyId, region, secretAccessKey, sessionToken } =
+        keyVaultsConfigSelectors.bedrockConfig(useUserStore.getState());
 
       const awsSecretAccessKey = secretAccessKey;
       const awsAccessKeyId = accessKeyId;
 
       const apiKey = (awsSecretAccessKey || '') + (awsAccessKeyId || '');
 
-      return { apiKey, awsAccessKeyId, awsRegion: region, awsSecretAccessKey };
+      return {
+        apiKey,
+        awsAccessKeyId,
+        awsRegion: region,
+        awsSecretAccessKey,
+        awsSessionToken: sessionToken,
+      };
     }
 
     case ModelProvider.Azure: {

package/src/services/chat.ts

@@ -114,6 +114,7 @@ export function initializeWithClientStore(provider: string, payload: any) {
           accessKeyId: providerAuthPayload?.awsAccessKeyId,
           accessKeySecret: providerAuthPayload?.awsSecretAccessKey,
           region: providerAuthPayload?.awsRegion,
+          sessionToken: providerAuthPayload?.awsSessionToken,
         };
       }
       break;

package/src/types/user/settings/keyVaults.ts

@@ -13,6 +13,7 @@ export interface AWSBedrockKeyVault {
   accessKeyId?: string;
   region?: string;
   secretAccessKey?: string;
+  sessionToken?: string;
 }
 
 export interface UserKeyVaults {

package/src/utils/format.ts

@@ -59,7 +59,7 @@ export const formatTokenNumber = (num: number): string => {
   if (num > 0 && num < 1024) return '1K';
 
   let kiloToken = Math.floor(num / 1024);
-  if (num >= 1024 && num < 1024 * 41 || num >= 128_000) {
+  if ((num >= 1024 && num < 1024 * 41) || num >= 128_000) {
     kiloToken = Math.floor(num / 1000);
   }
   if (num === 131_072) return '128K';