@lobehub/chat 1.22.27 → 1.23.1

package/src/const/settings/systemAgent.ts

@@ -1,15 +1,28 @@
-import { SystemAgentItem, UserSystemAgentConfig } from '@/types/user/settings';
+import {
+  QueryRewriteSystemAgent,
+  SystemAgentItem,
+  UserSystemAgentConfig,
+} from '@/types/user/settings';
 
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from './llm';
 
+export const DEFAULT_REWRITE_QUERY =
+  'Given the following conversation and a follow-up question, rephrase the follow up question to be a standalone question, in its original language. Keep as much details as possible from previous messages. Keep entity names and all.';
+
 export const DEFAULT_SYSTEM_AGENT_ITEM: SystemAgentItem = {
   model: DEFAULT_MODEL,
   provider: DEFAULT_PROVIDER,
 };
 
+export const DEFAULT_QUERY_REWRITE_SYSTEM_AGENT_ITEM: QueryRewriteSystemAgent = {
+  enabled: true,
+  model: DEFAULT_MODEL,
+  provider: DEFAULT_PROVIDER,
+};
+
 export const DEFAULT_SYSTEM_AGENT_CONFIG: UserSystemAgentConfig = {
   agentMeta: DEFAULT_SYSTEM_AGENT_ITEM,
-  queryRewrite: DEFAULT_SYSTEM_AGENT_ITEM,
+  queryRewrite: DEFAULT_QUERY_REWRITE_SYSTEM_AGENT_ITEM,
   topic: DEFAULT_SYSTEM_AGENT_ITEM,
   translation: DEFAULT_SYSTEM_AGENT_ITEM,
 };

package/src/features/AgentSetting/AgentModal/ModelSelect.tsx

@@ -5,14 +5,18 @@ import Select from '@/features/ModelSelect';
 import { useStore } from '../store';
 
 const ModelSelect = memo(() => {
-  const [model, updateConfig] = useStore((s) => [s.config.model, s.setAgentConfig]);
+  const [model, provider, updateConfig] = useStore((s) => [
+    s.config.model,
+    s.config.provider,
+    s.setAgentConfig,
+  ]);
 
   return (
     <Select
       onChange={(props) => {
         updateConfig(props);
       }}
-      value={model}
+      value={{ model, provider }}
     />
   );
 });

package/src/features/ModelSelect/index.tsx

@@ -25,7 +25,7 @@ interface ModelOption {
 interface ModelSelectProps {
   onChange?: (props: { model: string; provider: string }) => void;
   showAbility?: boolean;
-  value?: string;
+  value?: { model: string; provider?: string };
 }
 
 const ModelSelect = memo<ModelSelectProps>(({ value, onChange, showAbility = true }) => {
@@ -38,7 +38,7 @@ const ModelSelect = memo<ModelSelectProps>(({ value, onChange, showAbility = tru
       provider.chatModels.map((model) => ({
         label: <ModelItemRender {...model} showInfoTag={showAbility} />,
         provider: provider.id,
-        value: model.id,
+        value: `${provider.id}/${model.id}`,
       }));
 
     if (enabledList.length === 1) {
@@ -55,13 +55,14 @@ const ModelSelect = memo<ModelSelectProps>(({ value, onChange, showAbility = tru
 
   return (
     <Select
-      onChange={(model, option) => {
+      onChange={(value, option) => {
+        const model = value.split('/').slice(1).join('/');
         onChange?.({ model, provider: (option as unknown as ModelOption).provider });
       }}
       options={options}
       popupClassName={styles.select}
       popupMatchSelectWidth={false}
-      value={value}
+      value={`${value?.provider}/${value?.model}`}
     />
   );
 });

package/src/features/User/UserPanel/useMenu.tsx

@@ -92,20 +92,20 @@ export const useMenu = () => {
 
   const settings: MenuProps['items'] = [
     {
+      extra: (
+        <ActionIcon
+          icon={Maximize}
+          onClick={() => router.push(urlJoin('/settings', SettingsTabs.Common))}
+          size={'small'}
+          title={t('fullscreen')}
+        />
+      ),
       icon: <Icon icon={Settings2} />,
       key: 'setting',
       label: (
-        <Flexbox align={'center'} gap={8} horizontal>
-          <NewVersionBadge onClick={openSettings} showBadge={hasNewVersion}>
-            {t('userPanel.setting')}
-          </NewVersionBadge>
-          <ActionIcon
-            icon={Maximize}
-            onClick={() => router.push(urlJoin('/settings', SettingsTabs.Common))}
-            size={'small'}
-            title={t('fullscreen')}
-          />
-        </Flexbox>
+        <NewVersionBadge onClick={openSettings} showBadge={hasNewVersion}>
+          {t('userPanel.setting')}
+        </NewVersionBadge>
       ),
     },
     {

package/src/locales/default/setting.ts

@@ -374,10 +374,16 @@ export default {
       modelDesc: '指定用于生成助理名称、描述、头像、标签的模型',
       title: '自动生成助理信息',
     },
+    customPrompt: {
+      addPrompt: '添加自定义提示',
+      desc: '填写后，系统助理将在生成内容时使用自定义提示',
+      placeholder: '请输入自定义提示词',
+      title: '自定义提示词',
+    },
     queryRewrite: {
       label: '提问重写模型',
       modelDesc: '指定用于优化用户提问的模型',
-      title: '知识库',
+      title: '知识库提问重写',
     },
     title: '系统助手',
     topic: {

package/src/server/globalConfig/index.ts

@@ -4,20 +4,34 @@ import { fileEnv } from '@/config/file';
 import { langfuseEnv } from '@/config/langfuse';
 import { getLLMConfig } from '@/config/llm';
 import {
+  Ai21ProviderCard,
+  Ai360ProviderCard,
+  AnthropicProviderCard,
+  BaichuanProviderCard,
   BedrockProviderCard,
+  DeepSeekProviderCard,
   FireworksAIProviderCard,
   GithubProviderCard,
   GoogleProviderCard,
   GroqProviderCard,
   HuggingFaceProviderCard,
   HunyuanProviderCard,
+  MinimaxProviderCard,
+  MistralProviderCard,
+  MoonshotProviderCard,
   NovitaProviderCard,
   OllamaProviderCard,
   OpenAIProviderCard,
   OpenRouterProviderCard,
+  PerplexityProviderCard,
   QwenProviderCard,
   SiliconCloudProviderCard,
+  SparkProviderCard,
+  StepfunProviderCard,
+  TaichuProviderCard,
   TogetherAIProviderCard,
+  UpstageProviderCard,
+  WenxinProviderCard,
   ZeroOneProviderCard,
   ZhiPuProviderCard,
 } from '@/config/modelProviders';
@@ -36,6 +50,8 @@ export const getServerGlobalConfig = () => {
     OPENAI_MODEL_LIST,
 
     ENABLED_MOONSHOT,
+    MOONSHOT_MODEL_LIST,
+
     ENABLED_ZHIPU,
     ZHIPU_MODEL_LIST,
 
@@ -55,10 +71,19 @@ export const getServerGlobalConfig = () => {
     HUNYUAN_MODEL_LIST,
 
     ENABLED_DEEPSEEK,
+    DEEPSEEK_MODEL_LIST,
+
     ENABLED_PERPLEXITY,
+    PERPLEXITY_MODEL_LIST,
+
     ENABLED_ANTHROPIC,
+    ANTHROPIC_MODEL_LIST,
+
     ENABLED_MINIMAX,
+    MINIMAX_MODEL_LIST,
+
     ENABLED_MISTRAL,
+    MISTRAL_MODEL_LIST,
 
     ENABLED_NOVITA,
     NOVITA_MODEL_LIST,
@@ -67,17 +92,28 @@ export const getServerGlobalConfig = () => {
     QWEN_MODEL_LIST,
 
     ENABLED_STEPFUN,
+    STEPFUN_MODEL_LIST,
+
     ENABLED_BAICHUAN,
+    BAICHUAN_MODEL_LIST,
+
     ENABLED_TAICHU,
+    TAICHU_MODEL_LIST,
+
     ENABLED_AI21,
+    AI21_MODEL_LIST,
+    
     ENABLED_AI360,
+    AI360_MODEL_LIST,
 
     ENABLED_SILICONCLOUD,
     SILICONCLOUD_MODEL_LIST,
 
     ENABLED_UPSTAGE,
+    UPSTAGE_MODEL_LIST,
 
     ENABLED_SPARK,
+    SPARK_MODEL_LIST,
 
     ENABLED_AZURE_OPENAI,
     AZURE_MODEL_LIST,
@@ -99,6 +135,7 @@ export const getServerGlobalConfig = () => {
     FIREWORKSAI_MODEL_LIST,
 
     ENABLED_WENXIN,
+    WENXIN_MODEL_LIST,
 
     ENABLED_HUGGINGFACE,
     HUGGINGFACE_MODEL_LIST,
@@ -112,10 +149,29 @@ export const getServerGlobalConfig = () => {
     enabledAccessCode: ACCESS_CODES?.length > 0,
     enabledOAuthSSO: enableNextAuth,
     languageModel: {
-      ai21: { enabled: ENABLED_AI21 },
-      ai360: { enabled: ENABLED_AI360 },
+      ai21: {
+        enabled: ENABLED_AI21,
+        enabledModels: extractEnabledModels(AI21_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: Ai21ProviderCard.chatModels,
+          modelString: AI21_MODEL_LIST,
+        }),
+      },
+      ai360: {
+        enabled: ENABLED_AI360,
+        enabledModels: extractEnabledModels(AI360_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: Ai360ProviderCard.chatModels,
+          modelString: AI360_MODEL_LIST,
+        }),
+      },
       anthropic: {
         enabled: ENABLED_ANTHROPIC,
+        enabledModels: extractEnabledModels(ANTHROPIC_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: AnthropicProviderCard.chatModels,
+          modelString: ANTHROPIC_MODEL_LIST,
+        }),
       },
       azure: {
         enabled: ENABLED_AZURE_OPENAI,
@@ -126,7 +182,14 @@ export const getServerGlobalConfig = () => {
           withDeploymentName: true,
         }),
       },
-      baichuan: { enabled: ENABLED_BAICHUAN },
+      baichuan: {
+        enabled: ENABLED_BAICHUAN,
+        enabledModels: extractEnabledModels(BAICHUAN_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: BaichuanProviderCard.chatModels,
+          modelString: BAICHUAN_MODEL_LIST,
+        }),
+      },
       bedrock: {
         enabled: ENABLED_AWS_BEDROCK,
         enabledModels: extractEnabledModels(AWS_BEDROCK_MODEL_LIST),
@@ -135,8 +198,14 @@ export const getServerGlobalConfig = () => {
           modelString: AWS_BEDROCK_MODEL_LIST,
         }),
       },
-      deepseek: { enabled: ENABLED_DEEPSEEK },
-
+      deepseek: {
+        enabled: ENABLED_DEEPSEEK,
+        enabledModels: extractEnabledModels(DEEPSEEK_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: DeepSeekProviderCard.chatModels,
+          modelString: DEEPSEEK_MODEL_LIST,
+        }),
+      },
       fireworksai: {
         enabled: ENABLED_FIREWORKSAI,
         enabledModels: extractEnabledModels(FIREWORKSAI_MODEL_LIST),
@@ -145,7 +214,6 @@ export const getServerGlobalConfig = () => {
           modelString: FIREWORKSAI_MODEL_LIST,
         }),
       },
-
       github: {
         enabled: ENABLED_GITHUB,
         enabledModels: extractEnabledModels(GITHUB_MODEL_LIST),
@@ -186,9 +254,30 @@ export const getServerGlobalConfig = () => {
           modelString: HUNYUAN_MODEL_LIST,
         }),
       },
-      minimax: { enabled: ENABLED_MINIMAX },
-      mistral: { enabled: ENABLED_MISTRAL },
-      moonshot: { enabled: ENABLED_MOONSHOT },
+      minimax: {
+        enabled: ENABLED_MINIMAX,
+        enabledModels: extractEnabledModels(MINIMAX_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: MinimaxProviderCard.chatModels,
+          modelString: MINIMAX_MODEL_LIST,
+        }),
+      },
+      mistral: {
+        enabled: ENABLED_MISTRAL,
+        enabledModels: extractEnabledModels(MISTRAL_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: MistralProviderCard.chatModels,
+          modelString: MISTRAL_MODEL_LIST,
+        }),
+      },
+      moonshot: {
+        enabled: ENABLED_MOONSHOT,
+        enabledModels: extractEnabledModels(MOONSHOT_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: MoonshotProviderCard.chatModels,
+          modelString: MOONSHOT_MODEL_LIST,
+        }),
+      },
       novita: {
         enabled: ENABLED_NOVITA,
         enabledModels: extractEnabledModels(NOVITA_MODEL_LIST),
@@ -222,7 +311,14 @@ export const getServerGlobalConfig = () => {
           modelString: OPENROUTER_MODEL_LIST,
         }),
       },
-      perplexity: { enabled: ENABLED_PERPLEXITY },
+      perplexity: {
+        enabled: ENABLED_PERPLEXITY,
+        enabledModels: extractEnabledModels(PERPLEXITY_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: PerplexityProviderCard.chatModels,
+          modelString: PERPLEXITY_MODEL_LIST,
+        }),
+      },
       qwen: {
         enabled: ENABLED_QWEN,
         enabledModels: extractEnabledModels(QWEN_MODEL_LIST),
@@ -239,10 +335,30 @@ export const getServerGlobalConfig = () => {
           modelString: SILICONCLOUD_MODEL_LIST,
         }),
       },
-      spark: { enabled: ENABLED_SPARK },
-      stepfun: { enabled: ENABLED_STEPFUN },
-
-      taichu: { enabled: ENABLED_TAICHU },
+      spark: {
+        enabled: ENABLED_SPARK,
+        enabledModels: extractEnabledModels(SPARK_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: SparkProviderCard.chatModels,
+          modelString: SPARK_MODEL_LIST,
+        }),
+      },
+      stepfun: {
+        enabled: ENABLED_STEPFUN,
+        enabledModels: extractEnabledModels(STEPFUN_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: StepfunProviderCard.chatModels,
+          modelString: STEPFUN_MODEL_LIST,
+        }),
+      },
+      taichu: {
+        enabled: ENABLED_TAICHU,
+        enabledModels: extractEnabledModels(TAICHU_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: TaichuProviderCard.chatModels,
+          modelString: TAICHU_MODEL_LIST,
+        }),
+      },
       togetherai: {
         enabled: ENABLED_TOGETHERAI,
         enabledModels: extractEnabledModels(TOGETHERAI_MODEL_LIST),
@@ -251,8 +367,22 @@ export const getServerGlobalConfig = () => {
           modelString: TOGETHERAI_MODEL_LIST,
         }),
       },
-      upstage: { enabled: ENABLED_UPSTAGE },
-      wenxin: { enabled: ENABLED_WENXIN },
+      upstage: {
+        enabled: ENABLED_UPSTAGE,
+        enabledModels: extractEnabledModels(UPSTAGE_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: UpstageProviderCard.chatModels,
+          modelString: UPSTAGE_MODEL_LIST,
+        }),
+      },
+      wenxin: {
+        enabled: ENABLED_WENXIN,
+        enabledModels: extractEnabledModels(WENXIN_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: WenxinProviderCard.chatModels,
+          modelString: WENXIN_MODEL_LIST,
+        }),
+      },
       zeroone: {
         enabled: ENABLED_ZEROONE,
         enabledModels: extractEnabledModels(ZEROONE_MODEL_LIST),

package/src/server/globalConfig/parseSystemAgent.ts

@@ -26,9 +26,10 @@ export const parseSystemAgent = (envString: string = ''): Partial<UserSystemAgen
 
       if (protectedKeys.includes(key)) {
         config[key as keyof UserSystemAgentConfig] = {
+          enabled: key === 'queryRewrite' ? true : undefined,
           model: model.trim(),
           provider: provider.trim(),
-        };
+        } as any;
       }
     } else {
       throw new Error('Invalid environment variable format');

package/src/server/services/chunk/index.ts

@@ -53,7 +53,7 @@ export class ChunkService {
       await this.asyncTaskModel.update(asyncTaskId, {
         error: new AsyncTaskError(
           AsyncTaskErrorType.TaskTriggerError,
-          'trigger chunk embedding async task error. Please check your app is public available or check your proxy settings is set correctly.',
+          'trigger chunk embedding async task error. Please make sure the APP_URL is available from your server. You can check the proxy config or WAF blocking',
         ),
         status: AsyncTaskStatus.Error,
       });
@@ -92,7 +92,7 @@ export class ChunkService {
         await this.asyncTaskModel.update(asyncTaskId, {
           error: new AsyncTaskError(
             AsyncTaskErrorType.TaskTriggerError,
-            'trigger file parse async task error. Please check your app is public available or check your proxy settings is set correctly.',
+            'trigger chunk embedding async task error. Please make sure the APP_URL is available from your server. You can check the proxy config or WAF blocking',
           ),
           status: AsyncTaskStatus.Error,
         });

package/src/store/chat/slices/aiChat/actions/rag.ts

@@ -11,7 +11,6 @@ import { toggleBooleanList } from '@/store/chat/utils';
 import { useUserStore } from '@/store/user';
 import { systemAgentSelectors } from '@/store/user/selectors';
 import { ChatSemanticSearchChunk } from '@/types/chunk';
-import { merge } from '@/utils/merge';
 
 export interface ChatRAGAction {
   deleteUserMessageRagQuery: (id: string) => Promise<void>;
@@ -67,10 +66,10 @@ export const chatRag: StateCreator<ChatStore, [['zustand/devtools', never]], [],
     // 1. get the rewrite query
     let rewriteQuery = message?.ragQuery || userQuery;
 
-    // only rewrite query length is less than 10 characters, refs: https://github.com/lobehub/lobe-chat/pull/4288
+    // only rewrite query length is less than 15 characters, refs: https://github.com/lobehub/lobe-chat/pull/4288
     // if there is no ragQuery and there is a chat history
     // we need to rewrite the user message to get better results
-    if (rewriteQuery.length < 10 && !message?.ragQuery && messages.length > 0) {
+    if (rewriteQuery.length < 15 && !message?.ragQuery && messages.length > 0) {
       rewriteQuery = await get().internal_rewriteQuery(id, userQuery, messages);
     }
 
@@ -92,7 +91,17 @@ export const chatRag: StateCreator<ChatStore, [['zustand/devtools', never]], [],
     let rewriteQuery = content;
 
     const queryRewriteConfig = systemAgentSelectors.queryRewrite(useUserStore.getState());
-    const rewriteQueryParams = merge(queryRewriteConfig, chainRewriteQuery(content, messages));
+    if (!queryRewriteConfig.enabled) return content;
+
+    const rewriteQueryParams = {
+      model: queryRewriteConfig.model,
+      provider: queryRewriteConfig.provider,
+      ...chainRewriteQuery(
+        content,
+        messages,
+        !!queryRewriteConfig.customPrompt ? queryRewriteConfig.customPrompt : undefined,
+      ),
+    };
 
     let ragQuery = '';
     await chatService.fetchPresetTaskResult({

package/src/store/user/slices/settings/action.ts

@@ -32,7 +32,10 @@ export interface UserSettingsAction {
   updateGeneralConfig: (settings: Partial<UserGeneralConfig>) => Promise<void>;
   updateKeyVaults: (settings: Partial<UserKeyVaults>) => Promise<void>;
 
-  updateSystemAgent: (key: UserSystemAgentConfigKey, value: SystemAgentItem) => Promise<void>;
+  updateSystemAgent: (
+    key: UserSystemAgentConfigKey,
+    value: Partial<SystemAgentItem>,
+  ) => Promise<void>;
 }
 
 export const createSettingsSlice: StateCreator<
@@ -109,9 +112,9 @@ export const createSettingsSlice: StateCreator<
   updateKeyVaults: async (keyVaults) => {
     await get().setSettings({ keyVaults });
   },
-  updateSystemAgent: async (key, { provider, model }) => {
+  updateSystemAgent: async (key, value) => {
     await get().setSettings({
-      systemAgent: { [key]: { model, provider } },
+      systemAgent: { [key]: { ...value } },
     });
   },
 });

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

@@ -1,11 +1,17 @@
 export interface SystemAgentItem {
+  customPrompt?: string;
+  enabled?: boolean;
   model: string;
   provider: string;
 }
 
+export interface QueryRewriteSystemAgent extends Omit<SystemAgentItem, 'enabled'> {
+  enabled: boolean;
+}
+
 export interface UserSystemAgentConfig {
   agentMeta: SystemAgentItem;
-  queryRewrite: SystemAgentItem;
+  queryRewrite: QueryRewriteSystemAgent;
   topic: SystemAgentItem;
   translation: SystemAgentItem;
 }