@lobehub/chat 0.117.1 → 0.117.3

package/CHANGELOG.md

@@ -2,6 +2,58 @@
 
 # Changelog
 
+### [Version 0.117.3](https://github.com/lobehub/lobe-chat/compare/v0.117.2...v0.117.3)
+
+<sup>Released on **2023-12-28**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix tool calls at end, fix vision model max tokens, improve vision model checker.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix tool calls at end ([b0b615a](https://github.com/lobehub/lobe-chat/commit/b0b615a))
+- **misc**: Fix vision model max tokens ([8b704a0](https://github.com/lobehub/lobe-chat/commit/8b704a0))
+- **misc**: Improve vision model checker ([da7d177](https://github.com/lobehub/lobe-chat/commit/da7d177))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.117.2](https://github.com/lobehub/lobe-chat/compare/v0.117.1...v0.117.2)
+
+<sup>Released on **2023-12-28**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix market locale missing.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix market locale missing, closes [#851](https://github.com/lobehub/lobe-chat/issues/851) ([e23ec66](https://github.com/lobehub/lobe-chat/commit/e23ec66))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.117.1](https://github.com/lobehub/lobe-chat/compare/v0.117.0...v0.117.1)
 
 <sup>Released on **2023-12-27**</sup>

package/README.md

@@ -211,11 +211,11 @@ Our marketplace is not just a showcase platform but also a collaborative space.
 | Recent Submits                                                                                                                                                                                   | Description                                                                                                                                                                                          |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | [Deployment Specialist Agent](https://chat-preview.lobehub.com/market?agent=deployment-agent)<br/><sup>By **[amitalokbera](https://github.com/amitalokbera)** on **2023-12-27**</sup>            | An AI Deployment Specialist is an expert in managing the full deployment lifecycle of software applications, particularly web applications.<br/>`code` `deployment` `software`                       |
+| [Overview of Art Thesis Experts](https://chat-preview.lobehub.com/market?agent=thesis-overview)<br/><sup>By **[caoyang2002](https://github.com/caoyang2002)** on **2023-12-27**</sup>            | Specializing in brief thesis and art criticism<br/>`art` `thesis` `critique`                                                                                                                         |
 | [American English Transcreation Expert](https://chat-preview.lobehub.com/market?agent=to-local-english)<br/><sup>By **[doresu](https://github.com/doresu)** on **2023-12-27**</sup>              | Rough old editor, seasoned writer, and translator, proficient in translating English directly and transforming it into authentic American English<br/>`translation` `editing` `writing` `translator` |
 | [Academic Proofreading Expert](https://chat-preview.lobehub.com/market?agent=academic-paragraph-refiner)<br/><sup>By **[Feliks151450](https://github.com/Feliks151450)** on **2023-12-26**</sup> | Highly skilled in advanced research proofreading and language editing, specializing in multiple research fields and proficient in academic English.<br/>`proofreading` `writing` `research`          |
-| [Flutter Maestro](https://chat-preview.lobehub.com/market?agent=flutter-dev)<br/><sup>By **[kamaravichow](https://github.com/kamaravichow)** on **2023-12-25**</sup>                             | A developer expert in Flutter framework and Dart programming language.<br/>`flutter` `development` `dart` `programming` `widgets`                                                                    |
 
-> 📊 Total agents: [<kbd>**81**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+> 📊 Total agents: [<kbd>**82**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/README.zh-CN.md

@@ -184,14 +184,14 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
 
 <!-- AGENT LIST -->
 
-| 最近新增                                                                                                                                                                         | 助手说明                                                                                                 |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
-| [部署专家代理](https://chat-preview.lobehub.com/market?agent=deployment-agent)<br/><sup>By **[amitalokbera](https://github.com/amitalokbera)** on **2023-12-27**</sup>           | AI 部署专家是管理软件应用的完整部署生命周期的专家，特别是 Web 应用。<br/>`代码` `部署` `容器化`          |
-| [美式英语转译专家](https://chat-preview.lobehub.com/market?agent=to-local-english)<br/><sup>By **[doresu](https://github.com/doresu)** on **2023-12-27**</sup>                   | 粗鲁老编辑、资深作家和翻译家，擅长直译英文并转化为地道的美式英语<br/>`翻译` `编辑` `写作` `翻译家`       |
-| [学术润色专家](https://chat-preview.lobehub.com/market?agent=academic-paragraph-refiner)<br/><sup>By **[Feliks151450](https://github.com/Feliks151450)** on **2023-12-26**</sup> | 高级研究校对及语言编辑，专业于多个研究领域，精通学术英语。<br/>`校对` `写作` `研究`                      |
-| [Flutter 开发专家](https://chat-preview.lobehub.com/market?agent=flutter-dev)<br/><sup>By **[kamaravichow](https://github.com/kamaravichow)** on **2023-12-25**</sup>            | 一位精通 Flutter 框架和 Dart 编程语言的开发者<br/>`flutter` `development` `dart` `programming` `widgets` |
-
-> 📊 Total agents: [<kbd>**81**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+| 最近新增                                                                                                                                                                         | 助手说明                                                                                           |
+| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- |
+| [部署专家代理](https://chat-preview.lobehub.com/market?agent=deployment-agent)<br/><sup>By **[amitalokbera](https://github.com/amitalokbera)** on **2023-12-27**</sup>           | AI 部署专家是管理软件应用的完整部署生命周期的专家，特别是 Web 应用。<br/>`代码` `部署` `容器化`    |
+| [美术论文概述专家](https://chat-preview.lobehub.com/market?agent=thesis-overview)<br/><sup>By **[caoyang2002](https://github.com/caoyang2002)** on **2023-12-27**</sup>          | 擅长论文简述与美术评论<br/>`美术` `论文` `评论`                                                    |
+| [美式英语转译专家](https://chat-preview.lobehub.com/market?agent=to-local-english)<br/><sup>By **[doresu](https://github.com/doresu)** on **2023-12-27**</sup>                   | 粗鲁老编辑、资深作家和翻译家，擅长直译英文并转化为地道的美式英语<br/>`翻译` `编辑` `写作` `翻译家` |
+| [学术润色专家](https://chat-preview.lobehub.com/market?agent=academic-paragraph-refiner)<br/><sup>By **[Feliks151450](https://github.com/Feliks151450)** on **2023-12-26**</sup> | 高级研究校对及语言编辑，专业于多个研究领域，精通学术英语。<br/>`校对` `写作` `研究`                |
+
+> 📊 Total agents: [<kbd>**82**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/docs/Deployment/Environment-Variable.md

@@ -16,7 +16,7 @@ LobeChat provides additional configuration options during deployment, which can
   - [`AZURE_API_VERSION`](#azure_api_version)
 - [Plugin Service](#plugin-service)
   - [`PLUGINS_INDEX_URL`](#plugins_index_url)
-  - [`PLUGINS_SETTINGS`](#plugins_settings)
+  - [`PLUGIN_SETTINGS`](#plugin_settings)
 - [Agent Service](#agent-service)
   - [`AGENTS_INDEX_URL`](#agents_index_url)
 - [Data Analytics](#data-analytics)
@@ -94,7 +94,7 @@ If you need to use Azure OpenAI to provide model services, you can refer to the
 - Description: The index address of the LobeChat plugin market. If you have deployed the plugin market service yourself, you can use this variable to override the default plugin market address
 - Default: `https://chat-plugins.lobehub.com`
 
-### `PLUGINS_SETTINGS`
+### `PLUGIN_SETTINGS`
 
 - Type: Optional
 - Description: Used to set the plugin settings, the format is `plugin-identifier:key1=value1;key2=value2`, multiple settings fields are separated by semicolons `;`, multiple plugin settings are separated by commas `,`.

package/docs/Deployment/Environment-Variable.zh-CN.md

@@ -16,7 +16,7 @@ LobeChat 在部署时提供了一些额外的配置项，使用环境变量进
   - [`AZURE_API_VERSION`](#azure_api_version)
 - [插件服务](#插件服务)
   - [`PLUGINS_INDEX_URL`](#plugins_index_url)
-  - [`PLUGINS_SETTINGS`](#plugins_settings)
+  - [`PLUGIN_SETTINGS`](#plugin_settings)
 - [角色服务](#角色服务)
   - [`AGENTS_INDEX_URL`](#agents_index_url)
 - [数据统计](#数据统计)
@@ -92,7 +92,7 @@ LobeChat 在部署时提供了一些额外的配置项，使用环境变量进
 - 描述：LobeChat 插件市场的索引地址，如果你自行部署了插件市场的服务，可以使用该变量来覆盖默认的插件市场地址
 - 默认值：`https://chat-plugins.lobehub.com`
 
-### `PLUGINS_SETTINGS`
+### `PLUGIN_SETTINGS`
 
 - 类型：可选
 - 描述：用于配置插件的设置，使用 `插件名:设置字段=设置值` 的格式来配置插件的设置，多个设置字段用英文分号 `;` 隔开，多个插件设置使用英文逗号`,`隔开。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.117.1",
+  "version": "0.117.3",
   "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/market/AgentMarket.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest';
+
+import { AgentMarket } from './AgentMarket';
+
+const baseURL = 'https://chat-agents.lobehub.com';
+describe('AgentMarket', () => {
+  it('should return the default index URL when no language is provided', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentIndexUrl();
+    expect(url).toBe(baseURL);
+  });
+
+  it('should return the index URL for a supported language', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentIndexUrl('ko-KR');
+    expect(url).toBe('https://chat-agents.lobehub.com/index.ko-KR.json');
+  });
+
+  it('should return the zh-CN URL for zh locale', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentIndexUrl('zh' as any);
+    expect(url).toBe('https://chat-agents.lobehub.com/index.zh-CN.json');
+  });
+
+  it('should return the default URL for en locale', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentIndexUrl('en' as any);
+    expect(url).toBe('https://chat-agents.lobehub.com');
+  });
+
+  it('should return the base URL if the provided language is not supported', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentIndexUrl('fr' as any);
+    expect(url).toBe(baseURL);
+  });
+
+  it('should return the agent URL with default language when no language is provided', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentUrl('agent-123');
+    expect(url).toBe(`${baseURL}/agent-123.json`);
+  });
+
+  it('should return the agent URL for a supported language', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentUrl('agent-123', 'es-ES');
+    expect(url).toBe(`${baseURL}/agent-123.es-ES.json`);
+  });
+
+  it('should return the agent URL without language suffix if the provided language is not supported', () => {
+    const agentMarket = new AgentMarket();
+    const url = agentMarket.getAgentUrl('agent-123', 'fr' as any);
+    expect(url).toBe(`${baseURL}/agent-123.json`);
+  });
+});

package/src/app/api/market/AgentMarket.ts

@@ -1,8 +1,8 @@
 import urlJoin from 'url-join';
 
 import { getServerConfig } from '@/config/server';
-import { DEFAULT_LANG, checkLang } from '@/const/locale';
-import { Locales } from '@/locales/resources';
+import { DEFAULT_LANG, isLocaleNotSupport } from '@/const/locale';
+import { Locales, normalizeLocale } from '@/locales/resources';
 
 export class AgentMarket {
   private readonly baseUrl: string;
@@ -12,14 +12,14 @@ export class AgentMarket {
   }
 
   getAgentIndexUrl = (lang: Locales = DEFAULT_LANG) => {
-    if (checkLang(lang)) return this.baseUrl;
+    if (isLocaleNotSupport(lang)) return this.baseUrl;
 
-    return urlJoin(this.baseUrl, `index.${lang}.json`);
+    return urlJoin(this.baseUrl, `index.${normalizeLocale(lang)}.json`);
   };
 
   getAgentUrl = (identifier: string, lang: Locales = DEFAULT_LANG) => {
-    if (checkLang(lang)) return urlJoin(this.baseUrl, `${identifier}.json`);
+    if (isLocaleNotSupport(lang)) return urlJoin(this.baseUrl, `${identifier}.json`);
 
-    return urlJoin(this.baseUrl, `${identifier}.${lang}.json`);
+    return urlJoin(this.baseUrl, `${identifier}.${normalizeLocale(lang)}.json`);
   };
 }

package/src/app/api/plugin/store/Store.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { isLocaleNotSupport } from '@/const/locale';
+
+import { PluginStore } from './Store';
+
+const baseURL = 'https://chat-plugins.lobehub.com';
+
+describe('PluginStore', () => {
+  it('should return the default index URL when no language is provided', () => {
+    const pluginStore = new PluginStore();
+    const url = pluginStore.getPluginIndexUrl();
+    expect(url).toBe(baseURL);
+  });
+
+  it('should return the index URL for a supported language', () => {
+    const pluginStore = new PluginStore();
+    const url = pluginStore.getPluginIndexUrl('en-US');
+    expect(url).toBe(baseURL);
+  });
+
+  it('should return the base URL if the provided language is not supported', () => {
+    const pluginStore = new PluginStore();
+    const url = pluginStore.getPluginIndexUrl('fr-FR');
+    expect(url).toBe(`${baseURL}/index.fr-FR.json`);
+  });
+});

package/src/app/api/plugin/store/Store.ts

@@ -1,8 +1,8 @@
 import urlJoin from 'url-join';
 
 import { getServerConfig } from '@/config/server';
-import { DEFAULT_LANG, checkLang } from '@/const/locale';
-import { Locales } from '@/locales/resources';
+import { DEFAULT_LANG, isLocaleNotSupport } from '@/const/locale';
+import { Locales, normalizeLocale } from '@/locales/resources';
 
 export class PluginStore {
   private readonly baseUrl: string;
@@ -12,8 +12,8 @@ export class PluginStore {
   }
 
   getPluginIndexUrl = (lang: Locales = DEFAULT_LANG) => {
-    if (checkLang(lang)) return this.baseUrl;
+    if (isLocaleNotSupport(lang)) return this.baseUrl;
 
-    return urlJoin(this.baseUrl, `index.${lang}.json`);
+    return urlJoin(this.baseUrl, `index.${normalizeLocale(lang)}.json`);
   };
 }

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

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { DEFAULT_SETTINGS } from '@/const/settings';
 import AvatarWithUpload from '@/features/AvatarWithUpload';
-import { localeOptions } from '@/locales/options';
+import { localeOptions } from '@/locales/resources';
 import { useChatStore } from '@/store/chat';
 import { useFileStore } from '@/store/file';
 import { useGlobalStore } from '@/store/global';

package/src/chains/__tests__/summaryTitle.test.ts

@@ -1,6 +1,5 @@
 import { Mock, describe, expect, it, vi } from 'vitest';
 
-import { ModelTokens } from '@/const/modelTokens';
 import { chatHelpers } from '@/store/chat/helpers';
 import { globalHelpers } from '@/store/global/helpers';
 import { LanguageModel } from '@/types/llm';

package/src/const/llm.ts

@@ -14,4 +14,19 @@ export const LanguageModelWhiteList = [
 export const DEFAULT_OPENAI_MODEL_LIST: string[] = Object.values(LanguageModel);
 
 // vision model white list, these models will change the content from string to array
-export const VISION_MODEL_WHITE_LIST = ['gpt-4-vision-preview'];
+// refs: https://github.com/lobehub/lobe-chat/issues/790
+export const isVisionModel = (model?: string) => !!model && model.includes('vision');
+
+// refs: https://github.com/lobehub/lobe-chat/issues/837
+export const GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS = 2048;
+
+// refs to: https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
+export const ModelTokens: Record<LanguageModel, number> = {
+  [LanguageModel.GPT3_5]: 4096,
+  [LanguageModel.GPT3_5_1106]: 16_385,
+  [LanguageModel.GPT3_5_16K]: 16_385,
+  [LanguageModel.GPT4]: 8196,
+  [LanguageModel.GPT4_PREVIEW]: 128_000,
+  [LanguageModel.GPT4_VISION_PREVIEW]: 128_000,
+  [LanguageModel.GPT4_32K]: 32_768,
+};

package/src/const/locale.ts

@@ -1,9 +1,12 @@
-import { localeOptions } from '@/locales/options';
-import { Locales } from '@/locales/resources';
+import { Locales, normalizeLocale, supportLocales } from '@/locales/resources';
 
 export const DEFAULT_LANG = 'en-US';
 export const LOBE_LOCALE_COOKIE = 'LOBE_LOCALE';
 
-export const checkLang = (lang: Locales) => {
-  return lang === DEFAULT_LANG || !localeOptions.map((o) => o.value).includes(lang);
+/**
+ * Check if the language is supported
+ * @param locale
+ */
+export const isLocaleNotSupport = (locale: Locales) => {
+  return normalizeLocale(locale) === DEFAULT_LANG || !supportLocales.includes(locale);
 };

package/src/const/message.ts

@@ -3,4 +3,13 @@ export const LOADING_FLAT = '...';
 //  start with this，it should be a function message
 export const FUNCTION_MESSAGE_FLAG = '{"tool_calls"';
 
-export const FUNCTION_LOADING = 'FUNCTION_LOADING';
+export const isFunctionMessageAtStart = (content: string) => {
+  return content.startsWith(FUNCTION_MESSAGE_FLAG);
+};
+
+export const testFunctionMessageAtEnd = (content: string) => {
+  const regExp = /{"tool_calls":.*?}}/;
+  const match = content.match(regExp);
+
+  return { content: match ? match[0] : '', valid: match };
+};

package/src/const/settings.ts

@@ -27,8 +27,6 @@ export const DEFAUTT_AGENT_TTS_CONFIG: LobeAgentTTSConfig = {
   },
 };
 
-export const VISION_MODEL_DEFAULT_MAX_TOKENS = 1000;
-
 export const COOKIE_CACHE_DAYS = 30;
 
 export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {

package/src/features/AgentSetting/AgentPrompt/index.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { ModelTokens } from '@/const/modelTokens';
+import { ModelTokens } from '@/const/llm';
 import { useTokenCount } from '@/hooks/useTokenCount';
 import { LanguageModel } from '@/types/llm';
 

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -2,7 +2,7 @@ import { TokenTag, Tooltip } from '@lobehub/ui';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { ModelTokens } from '@/const/modelTokens';
+import { ModelTokens } from '@/const/llm';
 import { useTokenCount } from '@/hooks/useTokenCount';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';

package/src/features/Conversation/ChatList/Actions/customAction.ts

@@ -2,7 +2,7 @@ import { ActionIconGroupItems } from '@lobehub/ui/es/ActionIconGroup';
 import { LanguagesIcon, Play } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 
-import { localeOptions } from '@/locales/options';
+import { localeOptions } from '@/locales/resources';
 
 export const useCustomActions = () => {
   const { t } = useTranslation('chat');

package/src/features/Conversation/ChatList/Messages/Assistant.tsx

@@ -1,9 +1,9 @@
 import { ReactNode, memo } from 'react';
 
+import { isFunctionMessageAtStart } from '@/const/message';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { ChatMessage } from '@/types/message';
-import { isFunctionMessageAtStart } from '@/utils/message';
 
 import Inspector from '../Plugins/Inspector';
 import { DefaultMessage } from './Default';

package/src/features/PluginDevModal/UrlManifestForm.tsx

@@ -12,24 +12,27 @@ import { useToolStore } from '@/store/tool';
 import { pluginSelectors } from '@/store/tool/selectors';
 import { PluginInstallError } from '@/types/tool/plugin';
 
-const ProxyChecker = memo<{ onChange?: (value: boolean) => void; value?: boolean }>(
-  ({ value, onChange }) => {
-    const { t } = useTranslation('plugin');
+interface ProxyCheckerProps {
+  onChange?: (value: boolean) => void;
+  value?: boolean;
+}
 
-    return (
-      <Flexbox
-        gap={8}
-        horizontal
-        onClick={() => {
-          onChange?.(!value);
-        }}
-        style={{ cursor: 'pointer' }}
-      >
-        <Checkbox checked={value} /> {t('dev.customParams.useProxy.label')}
-      </Flexbox>
-    );
-  },
-);
+const ProxyChecker = memo<ProxyCheckerProps>(({ value, onChange }) => {
+  const { t } = useTranslation('plugin');
+
+  return (
+    <Flexbox
+      gap={8}
+      horizontal
+      onClick={() => {
+        onChange?.(!value);
+      }}
+      style={{ cursor: 'pointer' }}
+    >
+      <Checkbox checked={value} /> {t('dev.customParams.useProxy.label')}
+    </Flexbox>
+  );
+});
 
 const UrlManifestForm = memo<{ form: FormInstance; isEditMode: boolean }>(
   ({ form, isEditMode }) => {

package/src/locales/create.ts

@@ -6,6 +6,7 @@ import { initReactI18next } from 'react-i18next';
 import { getClientConfig } from '@/config/client';
 import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
 import { COOKIE_CACHE_DAYS } from '@/const/settings';
+import { normalizeLocale } from '@/locales/resources';
 import { isDev, isOnServerSide } from '@/utils/env';
 
 const { I18N_DEBUG, I18N_DEBUG_BROWSER, I18N_DEBUG_SERVER } = getClientConfig();
@@ -17,22 +18,9 @@ export const createI18nNext = (lang?: string) => {
     .use(LanguageDetector)
     .use(
       resourcesToBackend(async (lng: string, ns: string) => {
-        switch (lng) {
-          case 'zh-CN':
-          case 'zh': {
-            if (isDev) return import(`./default/${ns}`);
+        if (isDev && lng === 'zh-CN') return import(`./default/${ns}`);
 
-            return import(`@/../locales/zh-CN/${ns}.json`);
-          }
-
-          case 'en': {
-            return import(`@/../locales/en-US/${ns}.json`);
-          }
-
-          default: {
-            return import(`@/../locales/${lng}/${ns}.json`);
-          }
-        }
+        return import(`@/../locales/${normalizeLocale(lng)}/${ns}.json`);
       }),
     );
 

package/src/locales/resources.ts

@@ -16,3 +16,86 @@ export const locales = [
 
 export type DefaultResources = typeof resources;
 export type Locales = (typeof locales)[number];
+
+export const normalizeLocale = (locale: string) => {
+  switch (locale) {
+    case 'zh-CN':
+    case 'zh': {
+      return 'zh-CN';
+    }
+
+    case 'en': {
+      return 'en-US';
+    }
+
+    default: {
+      return locale;
+    }
+  }
+};
+
+type LocaleOptions = {
+  label: string;
+  value: Locales;
+}[];
+
+export const localeOptions: LocaleOptions = [
+  {
+    label: '简体中文',
+    value: 'zh-CN',
+  },
+  {
+    label: '繁體中文',
+    value: 'zh-TW',
+  },
+  {
+    label: 'English',
+    value: 'en-US',
+  },
+  {
+    label: '日本語',
+    value: 'ja-JP',
+  },
+  {
+    label: '한국어',
+    value: 'ko-KR',
+  },
+  {
+    label: 'Deutsch',
+    value: 'de-DE',
+  },
+  {
+    label: 'Español',
+    value: 'es-ES',
+  },
+  {
+    label: 'Français',
+    value: 'fr-FR',
+  },
+  {
+    label: 'Português',
+    value: 'pt-BR',
+  },
+  {
+    label: 'Русский',
+    value: 'ru-RU',
+  },
+  {
+    label: 'Türkçe',
+    value: 'tr-TR',
+  },
+  {
+    label: 'Polski',
+    value: 'pl-PL',
+  },
+  {
+    label: 'Nederlands',
+    value: 'nl-NL',
+  },
+  {
+    label: 'Italiano',
+    value: 'it-IT',
+  },
+] as LocaleOptions;
+
+export const supportLocales: string[] = [...locales, 'en', 'zh'];

package/src/services/__tests__/chat.test.ts

@@ -2,7 +2,6 @@ import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
 import { act } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
@@ -74,7 +73,7 @@ describe('ChatService', () => {
     it('should not use tools for models in the vision model whitelist', async () => {
       const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
       const messages = [{ content: 'Hello', role: 'user' }] as ChatMessage[];
-      const modelInWhitelist = VISION_MODEL_WHITE_LIST[0];
+      const modelInWhitelist = 'gpt-4-vision-preview';
 
       await chatService.createAssistantMessage({
         messages,

package/src/services/chat.ts

@@ -2,7 +2,7 @@ import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/
 import { produce } from 'immer';
 import { merge } from 'lodash-es';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
+import { isVisionModel } from '@/const/llm';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { filesSelectors, useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
@@ -15,8 +15,6 @@ import { fetchAIFactory, getMessageError } from '@/utils/fetch';
 import { createHeaderWithOpenAI } from './_header';
 import { OPENAI_URLS, PLUGINS_URLS } from './_url';
 
-const isVisionModel = (model?: string) => model && VISION_MODEL_WHITE_LIST.includes(model);
-
 interface FetchOptions {
   signal?: AbortSignal | undefined;
 }

package/src/store/chat/slices/enchance/action.ts

@@ -4,7 +4,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { chainLangDetect } from '@/chains/langDetect';
 import { chainTranslate } from '@/chains/translate';
-import { supportLocales } from '@/locales/options';
+import { supportLocales } from '@/locales/resources';
 import { chatService } from '@/services/chat';
 import { fileService } from '@/services/file';
 import { imageGenerationService } from '@/services/imageGeneration';

package/src/store/chat/slices/message/action.ts

@@ -5,9 +5,8 @@ import { template } from 'lodash-es';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
-import { LOADING_FLAT } from '@/const/message';
-import { VISION_MODEL_DEFAULT_MAX_TOKENS } from '@/const/settings';
+import { GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS } from '@/const/llm';
+import { LOADING_FLAT, isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/const/message';
 import { CreateMessageParams } from '@/database/models/message';
 import { DB_Message } from '@/database/schemas/message';
 import { chatService } from '@/services/chat';
@@ -19,7 +18,6 @@ import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { ChatMessage } from '@/types/message';
 import { fetchSSE } from '@/utils/fetch';
-import { isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/utils/message';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { chatSelectors } from '../../selectors';
@@ -339,11 +337,12 @@ export const chatMessage: StateCreator<
     config.params.max_tokens = config.enableMaxTokens ? config.params.max_tokens : undefined;
 
     // 5. handle config for the vision model
-    // Due to vision model's default max_tokens is very small
+    // Due to the gpt-4-vision-preview model's default max_tokens is very small
     // we need to set the max_tokens a larger one.
-    if (VISION_MODEL_WHITE_LIST.includes(config.model)) {
+    if (config.model === 'gpt-4-vision-preview') {
       /* eslint-disable unicorn/no-lonely-if */
-      if (!config.params.max_tokens) config.params.max_tokens = VISION_MODEL_DEFAULT_MAX_TOKENS;
+      if (!config.params.max_tokens)
+        config.params.max_tokens = GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS;
     }
 
     const fetcher = () =>

package/src/store/session/slices/agent/selectors.ts

@@ -1,7 +1,7 @@
 import { VoiceList } from '@lobehub/tts';
 import { t } from 'i18next';
 
-import { DEFAULT_OPENAI_MODEL_LIST, VISION_MODEL_WHITE_LIST } from '@/const/llm';
+import { DEFAULT_OPENAI_MODEL_LIST, isVisionModel } from '@/const/llm';
 import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { useGlobalStore } from '@/store/global';
@@ -109,7 +109,7 @@ const hasSystemRole = (s: SessionStore) => {
 };
 const modelHasVisionAbility = (s: SessionStore): boolean => {
   const model = currentAgentModel(s);
-  return VISION_MODEL_WHITE_LIST.includes(model);
+  return isVisionModel(model);
 };
 
 export const agentSelectors = {

package/src/const/modelTokens.ts

@@ -1,12 +0,0 @@
-import { LanguageModel } from '@/types/llm';
-
-// refs to: https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
-export const ModelTokens: Record<LanguageModel, number> = {
-  [LanguageModel.GPT3_5]: 4096,
-  [LanguageModel.GPT3_5_1106]: 16_385,
-  [LanguageModel.GPT3_5_16K]: 16_385,
-  [LanguageModel.GPT4]: 8196,
-  [LanguageModel.GPT4_PREVIEW]: 128_000,
-  [LanguageModel.GPT4_VISION_PREVIEW]: 128_000,
-  [LanguageModel.GPT4_32K]: 32_768,
-};

package/src/locales/options.ts

@@ -1,69 +0,0 @@
-import type { Locales } from '@/types/locale';
-
-import { locales } from './resources';
-
-type LocaleOptions = {
-  label: string;
-  value: Locales;
-}[];
-
-export const localeOptions: LocaleOptions = [
-  {
-    label: '简体中文',
-    value: 'zh-CN',
-  },
-  {
-    label: '繁體中文',
-    value: 'zh-TW',
-  },
-  {
-    label: 'English',
-    value: 'en-US',
-  },
-  {
-    label: '日本語',
-    value: 'ja-JP',
-  },
-  {
-    label: '한국어',
-    value: 'ko-KR',
-  },
-  {
-    label: 'Deutsch',
-    value: 'de-DE',
-  },
-  {
-    label: 'Español',
-    value: 'es-ES',
-  },
-  {
-    label: 'Français',
-    value: 'fr-FR',
-  },
-  {
-    label: 'Português',
-    value: 'pt-BR',
-  },
-  {
-    label: 'Русский',
-    value: 'ru-RU',
-  },
-  {
-    label: 'Türkçe',
-    value: 'tr-TR',
-  },
-  {
-    label: 'Polski',
-    value: 'pl-PL',
-  },
-  {
-    label: 'Nederlands',
-    value: 'nl-NL',
-  },
-  {
-    label: 'Italiano',
-    value: 'it-IT',
-  },
-] as LocaleOptions;
-
-export const supportLocales: string[] = [...locales, 'en', 'zh'];

package/src/utils/message.ts

@@ -1,28 +0,0 @@
-import { FUNCTION_MESSAGE_FLAG } from '@/const/message';
-
-export const isFunctionMessageAtStart = (content: string) => {
-  return content.startsWith(FUNCTION_MESSAGE_FLAG);
-};
-
-export const testFunctionMessageAtEnd = (content: string) => {
-  const regExp = /{"function_call":.*?}}/;
-  const match = content.match(regExp);
-
-  return { content: match ? match[0] : '', valid: match };
-};
-
-// export const createFunctionCallMessage = () => {
-//   return [
-//     {
-//       content: '',
-//       function_call: { arguments: '{\n  "city": "杭州"\n}', name: 'realtimeWeather' },
-//       role: 'assistant',
-//     },
-//     {
-//       content:
-//         '{"status":"1","count":"1","info":"OK","infocode":"10000","forecasts":[{"city":"杭州市","adcode":"300","province":"浙江","reporttime":"2023-07-28 20:32:48","casts":[{"date":"2023-07-28","week":"5","dayweather"小雨","nightweather":"小雨-中雨","daytemp":"32","nighttemp":"26","daywind":"东","nightwind":"东","daypower":"6power":"6","daytemp_float":"32.0","nighttemp_float":"26.0"},{"date":"2023-07-29","week":"6","dayweather":"小雨雨","nightweather":"小雨","daytemp":"30","nighttemp":"25","daywind":"东南","nightwind":"东南","daypower":"4","wer":"4","daytemp_float":"30.0","nighttemp_float":"25.0"},{"date":"2023-07-30","week":"7","dayweather":"小雨",ightweather":"雷阵雨","daytemp":"31","nighttemp":"25","daywind":"东南","nightwind":"东南","daypower":"4","nigh:"4","daytemp_float":"31.0","nighttemp_float":"25.0"},{"date":"2023-07-31","week":"1","dayweather":"雷阵雨","ntweather":"雷阵雨","daytemp":"33","nighttemp":"25","daywind":"东","nightwind":"东","daypower":"4","nightpower""daytemp_float":"33.0","nighttemp_float":"25.0"}]}]}',
-//       name: 'realtimeWeather',
-//       role: 'function',
-//     },
-//   ];
-// };