@lobehub/chat 0.86.4 → 0.87.0

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 0.87.0](https://github.com/lobehub/lobe-chat/compare/v0.86.5...v0.87.0)
+
+<sup>Released on **2023-10-11**</sup>
+
+#### ✨ Features
+
+- **misc**: Support custom model name.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Support custom model name, closes [#305](https://github.com/lobehub/lobe-chat/issues/305) ([84a066a](https://github.com/lobehub/lobe-chat/commit/84a066a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.86.5](https://github.com/lobehub/lobe-chat/compare/v0.86.4...v0.86.5)
+
+<sup>Released on **2023-10-11**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix clear session error.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix clear session error, closes [#303](https://github.com/lobehub/lobe-chat/issues/303) ([09512fc](https://github.com/lobehub/lobe-chat/commit/09512fc))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.86.4](https://github.com/lobehub/lobe-chat/compare/v0.86.3...v0.86.4)
 
 <sup>Released on **2023-10-11**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.86.4",
+  "version": "0.87.0",
   "description": "An open-source, extensible (Function Calling), high-performance chatbot framework. It supports one-click free deployment of your private ChatGPT/LLM web application",
   "keywords": [
     "chatbot",

package/src/app/chat/features/ChatInputContent/ActionBar/ActionLeft.tsx

@@ -5,6 +5,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
+import { settingsSelectors, useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { LanguageModel } from '@/types/llm';
@@ -23,12 +24,14 @@ const ActionLeft = memo(() => {
     ];
   });
 
+  const modelList = useGlobalStore(settingsSelectors.modelList);
+
   return (
     <>
       <Dropdown
         menu={{
           activeKey: model,
-          items: Object.values(LanguageModel).map((i) => ({ key: i, label: i })),
+          items: modelList.map((i) => ({ key: i, label: i })),
           onClick: (e) => {
             updateAgentConfig({ model: e.key as LanguageModel });
           },

package/src/app/chat/features/ChatInputContent/ActionBar/Token.tsx

@@ -6,6 +6,7 @@ import { ModelTokens } from '@/const/modelTokens';
 import { useTokenCount } from '@/hooks/useTokenCount';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors, chatSelectors } from '@/store/session/selectors';
+import { LanguageModel } from '@/types/llm';
 
 const Token = memo<{ input: string }>(({ input }) => {
   const { t } = useTranslation('common');
@@ -15,7 +16,7 @@ const Token = memo<{ input: string }>(({ input }) => {
   const [messageString, systemRole, model] = useSessionStore((s) => [
     chatSelectors.chatsMessageString(s),
     agentSelectors.currentAgentSystemRole(s),
-    agentSelectors.currentAgentModel(s),
+    agentSelectors.currentAgentModel(s) as LanguageModel,
   ]);
 
   const systemRoleToken = useTokenCount(systemRole);

package/src/app/chat/features/ChatInputContent/index.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 
 import { CHAT_TEXTAREA_HEIGHT } from '@/const/layoutTokens';
 import { useSessionStore } from '@/store/session';
+import { agentSelectors } from '@/store/session/selectors';
 
 import ActionLeft from './ActionBar/ActionLeft';
 import ActionsRight from './ActionBar/ActionRight';
@@ -28,10 +29,11 @@ const ChatInputContent = memo<ChatContentProps>(
 
     const mobile = runtimeMobile || defaultMobile;
 
-    const [isLoading, sendMessage, stopGenerateMessage] = useSessionStore((s) => [
+    const [isLoading, sendMessage, stopGenerateMessage, showTokenTag] = useSessionStore((s) => [
       !!s.chatLoadingId,
       s.sendMessage,
       s.stopGenerateMessage,
+      agentSelectors.showTokenTag(s),
     ]);
 
     return (
@@ -39,9 +41,11 @@ const ChatInputContent = memo<ChatContentProps>(
         actions={
           <>
             <ActionLeft />
-            <Suspense>
-              <Token input={message} />
-            </Suspense>
+            {showTokenTag && (
+              <Suspense>
+                <Token input={message} />
+              </Suspense>
+            )}
           </>
         }
         actionsRight={<ActionsRight />}

package/src/app/settings/llm/LLM/index.tsx

@@ -70,11 +70,15 @@ const LLM = memo(() => {
           />
         ),
         desc: useAzure ? t('llm.AzureOpenAI.endpoint.desc') : t('llm.OpenAI.endpoint.desc'),
-
         label: useAzure ? t('llm.AzureOpenAI.endpoint.title') : t('llm.OpenAI.endpoint.title'),
-
         name: [configKey, 'openAI', 'endpoint'],
       },
+      {
+        children: <Input allowClear placeholder={t('llm.OpenAI.customModelName.placeholder')} />,
+        desc: t('llm.OpenAI.customModelName.desc'),
+        label: t('llm.OpenAI.customModelName.title'),
+        name: [configKey, 'openAI', 'customModelName'],
+      },
       {
         children: (
           <Switch />

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

@@ -8,7 +8,7 @@ import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { LanguageModel } from '@/types/llm';
+import { settingsSelectors, useGlobalStore } from '@/store/global';
 
 import { useStore } from '../store';
 
@@ -16,9 +16,11 @@ const AgentConfig = memo(() => {
   const { t } = useTranslation('setting');
   const updateConfig = useStore((s) => s.setAgentConfig);
   const [form] = AFrom.useForm();
+  const { isDarkMode } = useThemeMode();
+
   const config = useStore((s) => s.config, isEqual);
 
-  const { isDarkMode } = useThemeMode();
+  const modelList = useGlobalStore(settingsSelectors.modelList);
 
   useEffect(() => {
     form.setFieldsValue(config);
@@ -96,14 +98,7 @@ const AgentConfig = memo(() => {
   const model: ItemGroup = {
     children: [
       {
-        children: (
-          <Select
-            options={Object.values(LanguageModel).map((value) => ({
-              label: value,
-              value,
-            }))}
-          />
-        ),
+        children: <Select options={modelList.map((value) => ({ label: value, value }))} />,
         desc: t('settingModel.model.desc'),
         label: t('settingModel.model.title'),
         name: 'model',

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

@@ -9,6 +9,7 @@ import { Flexbox } from 'react-layout-kit';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { ModelTokens } from '@/const/modelTokens';
 import { useTokenCount } from '@/hooks/useTokenCount';
+import { LanguageModel } from '@/types/llm';
 
 import { useStore } from '../store';
 
@@ -29,21 +30,25 @@ const AgentPrompt = memo(() => {
   const [systemRole, model] = useStore((s) => [s.config.systemRole, s.config.model]);
   const systemTokenCount = useTokenCount(systemRole);
 
+  const showTag = model in ModelTokens;
+
   return (
     <FormGroup
       extra={
         <Flexbox align={'center'} gap={8} horizontal>
-          <TokenTag
-            displayMode={'used'}
-            maxValue={ModelTokens[model]}
-            shape={'square'}
-            text={{
-              overload: t('tokenTag.overload', { ns: 'common' }),
-              remained: t('tokenTag.remained', { ns: 'common' }),
-              used: t('tokenTag.used', { ns: 'common' }),
-            }}
-            value={systemTokenCount}
-          />
+          {showTag && (
+            <TokenTag
+              displayMode={'used'}
+              maxValue={ModelTokens[model as LanguageModel]}
+              shape={'square'}
+              text={{
+                overload: t('tokenTag.overload', { ns: 'common' }),
+                remained: t('tokenTag.remained', { ns: 'common' }),
+                used: t('tokenTag.used', { ns: 'common' }),
+              }}
+              value={systemTokenCount}
+            />
+          )}
         </Flexbox>
       }
       icon={Bot}

package/src/locales/default/setting.ts

@@ -50,6 +50,11 @@ export default {
         pass: '检查通过',
         title: '连通性检查',
       },
+      customModelName: {
+        desc: '增加自定义模型，多个模型使用逗号（,） 隔开',
+        placeholder: 'model1,model2,model3',
+        title: '自定义模型名称',
+      },
       endpoint: {
         desc: '除默认地址外，必须包含 http(s)://',
         placeholder: 'https://api.openai.com/v1',

package/src/store/global/selectors/settings.ts

@@ -1,3 +1,4 @@
+import { DEFAULT_OPENAI_MODEL_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import { DEFAULT_AGENT, DEFAULT_AGENT_CONFIG, DEFAULT_SETTINGS } from '@/const/settings';
 import { Locales } from '@/locales/resources';
@@ -19,6 +20,11 @@ const openAIAPIKeySelectors = (s: GlobalStore) =>
 
 const openAIProxyUrlSelectors = (s: GlobalStore) => s.settings.languageModel.openAI.endpoint;
 
+const modelListSelectors = (s: GlobalStore) => [
+  ...DEFAULT_OPENAI_MODEL_LIST,
+  ...(s.settings.languageModel.openAI.customModelName || '').split(',').filter(Boolean),
+];
+
 export const exportSettings = (s: GlobalStore) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { OPENAI_API_KEY: _, password: __, ...settings } = s.settings;
@@ -42,6 +48,7 @@ export const settingsSelectors = {
   defaultAgentConfig,
   defaultAgentMeta,
   exportSettings,
+  modelList: modelListSelectors,
   openAIAPI: openAIAPIKeySelectors,
   openAIProxyUrl: openAIProxyUrlSelectors,
 };

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

@@ -1,5 +1,6 @@
 import { t } from 'i18next';
 
+import { DEFAULT_OPENAI_MODEL_LIST } from '@/const/llm';
 import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR } from '@/const/meta';
 import { SessionStore } from '@/store/session';
 import { LanguageModel } from '@/types/llm';
@@ -42,7 +43,7 @@ const currentAgentAvatar = (s: SessionStore) => {
   return session.meta.avatar || DEFAULT_AVATAR;
 };
 
-const currentAgentModel = (s: SessionStore): LanguageModel => {
+const currentAgentModel = (s: SessionStore): LanguageModel | string => {
   const config = currentAgentConfig(s);
 
   return config?.model || LanguageModel.GPT3_5;
@@ -66,6 +67,12 @@ const getTitle = (s: MetaData) => s.title || t('defaultSession', { ns: 'common'
 export const getDescription = (s: MetaData) =>
   s.description || t('noDescription', { ns: 'common' });
 
+const showTokenTag = (s: SessionStore) => {
+  const model = currentAgentModel(s);
+
+  return DEFAULT_OPENAI_MODEL_LIST.includes(model);
+};
+
 export const agentSelectors = {
   currentAgentAvatar,
   currentAgentBackgroundColor,
@@ -80,4 +87,5 @@ export const agentSelectors = {
   getDescription,
   getTitle,
   hasSystemRole,
+  showTokenTag,
 };

package/src/store/session/slices/session/action.ts

@@ -11,7 +11,7 @@ import { LobeAgentSession, LobeAgentSettings, LobeSessions } from '@/types/sessi
 import { setNamespace } from '@/utils/storeDebug';
 import { uuid } from '@/utils/uuid';
 
-import { initLobeSession } from './initialState';
+import { initInbox, initLobeSession } from './initialState';
 import { SessionDispatch, sessionsReducer } from './reducers/session';
 
 const t = setNamespace('session');
@@ -76,7 +76,7 @@ export const createSessionSlice: StateCreator<
   },
 
   clearSessions: () => {
-    set({ sessions: {} }, false, t('clearSessions'));
+    set({ inbox: initInbox, sessions: {} }, false, t('clearSessions'));
   },
 
   createSession: async (agent) => {

package/src/types/session.ts

@@ -58,7 +58,7 @@ export interface LobeAgentConfig {
    * 角色所使用的语言模型
    * @default gpt-3.5-turbo
    */
-  model: LanguageModel;
+  model: LanguageModel | string;
   /**
    * 语言模型参数
    */

package/src/types/settings.ts

@@ -48,6 +48,10 @@ export type GlobalDefaultAgent = Pick<LobeAgentSession, 'config' | 'meta'>;
 export interface OpenAIConfig {
   OPENAI_API_KEY: string;
   azureApiVersion?: string;
+  /**
+   * custom mode name for fine-tuning or openai like model
+   */
+  customModelName?: string;
   endpoint?: string;
   models?: string[];
   useAzure?: boolean;