@lobehub/chat 1.22.26 → 1.23.0

package/locales/zh-CN/setting.json

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

package/locales/zh-TW/error.json

@@ -51,10 +51,10 @@
     "431": "很抱歉，您的請求頭字段太大，伺服器無法處理",
     "451": "很抱歉，由於法律原因，伺服器拒絕提供此資源",
     "500": "抱歉，伺服器似乎遇到一些困難，暫時無法完成您的請求。請稍後再試。",
+    "501": "很抱歉，伺服器尚未知道如何處理此請求，請確認您的操作是否正確",
     "502": "抱歉，伺服器似乎迷失了方向，暫時無法提供服務。請稍後再試。",
     "503": "抱歉，伺服器目前無法處理您的請求，可能是因為過載或正在進行維護。請稍後再試。",
     "504": "抱歉，伺服器沒有收到上游伺服器的回應。請稍後再試。",
-    "501": "很抱歉，伺服器尚未知道如何處理此請求，請確認您的操作是否正確",
     "505": "很抱歉，伺服器不支援您使用的HTTP版本，請更新後再試",
     "506": "很抱歉，伺服器配置出現問題，請聯繫管理員解決",
     "507": "很抱歉，伺服器儲存空間不足，無法處理您的請求，請稍後再試",

package/locales/zh-TW/setting.json

@@ -372,10 +372,16 @@
       "modelDesc": "指定用於生成助理名稱、描述、頭像、標籤的模型",
       "title": "自動生成助理資訊"
     },
+    "customPrompt": {
+      "addPrompt": "新增自訂提示",
+      "desc": "填寫後，系統助理將在生成內容時使用自訂提示",
+      "placeholder": "請輸入自訂提示詞",
+      "title": "自訂提示詞"
+    },
     "queryRewrite": {
       "label": "提問重寫模型",
       "modelDesc": "指定用於優化用戶提問的模型",
-      "title": "知識庫"
+      "title": "知識庫提問重寫"
     },
     "title": "系統助手",
     "topic": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.22.26",
+  "version": "1.23.0",
   "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",
@@ -143,7 +143,7 @@
     "ahooks": "^3.8.1",
     "ai": "^3.4.16",
     "antd": "^5.21.4",
-    "antd-style": "^3.7.0",
+    "antd-style": "^3.7.1",
     "brotli-wasm": "^3.0.1",
     "chroma-js": "^2.6.0",
     "dayjs": "^1.11.13",

package/src/app/(main)/settings/system-agent/features/createForm.tsx

@@ -1,11 +1,14 @@
 'use client';
 
-import { Form, type ItemGroup } from '@lobehub/ui';
-import { Form as AntForm } from 'antd';
+import { Form, Icon, type ItemGroup } from '@lobehub/ui';
+import type { FormItemProps } from '@lobehub/ui/es/Form/components/FormItem';
+import { Form as AntForm, Button, Switch } from 'antd';
 import isEqual from 'fast-deep-equal';
+import { PencilIcon } from 'lucide-react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import TextArea from '@/components/TextArea';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import ModelSelect from '@/features/ModelSelect';
 import { useUserStore } from '@/store/user';
@@ -16,44 +19,90 @@ import { useSyncSystemAgent } from './useSync';
 
 type SettingItemGroup = ItemGroup;
 
-const SystemAgentForm = memo(({ systemAgentKey }: { systemAgentKey: UserSystemAgentConfigKey }) => {
-  const { t } = useTranslation('setting');
-
-  const settings = useUserStore(settingsSelectors.currentSystemAgent, isEqual);
-  const [updateSystemAgent] = useUserStore((s) => [s.updateSystemAgent]);
-
-  const [form] = AntForm.useForm();
-
-  const systemAgentSettings: SettingItemGroup = {
-    children: [
-      {
-        children: (
-          <ModelSelect
-            onChange={(props) => {
-              updateSystemAgent(systemAgentKey, props);
-            }}
-            showAbility={false}
-          />
-        ),
-        desc: t(`systemAgent.${systemAgentKey}.modelDesc`),
-        label: t(`systemAgent.${systemAgentKey}.label`),
-        name: [systemAgentKey, 'model'],
-      },
-    ],
-    title: t(`systemAgent.${systemAgentKey}.title`),
-  };
-
-  useSyncSystemAgent(form, settings);
-
-  return (
-    <Form
-      form={form}
-      initialValues={settings}
-      items={[systemAgentSettings]}
-      variant={'pure'}
-      {...FORM_STYLE}
-    />
-  );
-});
+interface SystemAgentFormProps {
+  allowCustomPrompt?: boolean;
+  allowDisable?: boolean;
+  defaultPrompt?: string;
+  systemAgentKey: UserSystemAgentConfigKey;
+}
+
+const SystemAgentForm = memo(
+  ({ systemAgentKey, allowDisable, allowCustomPrompt, defaultPrompt }: SystemAgentFormProps) => {
+    const { t } = useTranslation('setting');
+
+    const settings = useUserStore(settingsSelectors.currentSystemAgent, isEqual);
+    const [updateSystemAgent] = useUserStore((s) => [s.updateSystemAgent]);
+
+    const [form] = AntForm.useForm();
+    const value = settings[systemAgentKey];
+
+    const systemAgentSettings: SettingItemGroup = {
+      children: [
+        {
+          children: (
+            <ModelSelect
+              onChange={(props) => {
+                updateSystemAgent(systemAgentKey, props);
+              }}
+              showAbility={false}
+              // value={value}
+            />
+          ),
+          desc: t(`systemAgent.${systemAgentKey}.modelDesc`),
+          label: t(`systemAgent.${systemAgentKey}.label`),
+          name: systemAgentKey,
+        },
+        (!!allowCustomPrompt && {
+          children: !!value.customPrompt ? (
+            <TextArea
+              onChange={(e) => {
+                updateSystemAgent(systemAgentKey, { customPrompt: e });
+              }}
+              placeholder={t('systemAgent.customPrompt.placeholder')}
+              style={{ minHeight: 160 }}
+              value={value.customPrompt}
+            />
+          ) : (
+            <Button
+              block
+              icon={<Icon icon={PencilIcon} />}
+              onClick={async () => {
+                await updateSystemAgent(systemAgentKey, { customPrompt: defaultPrompt });
+              }}
+            >
+              {t('systemAgent.customPrompt.addPrompt')}
+            </Button>
+          ),
+          desc: t('systemAgent.customPrompt.desc'),
+          label: t('systemAgent.customPrompt.title'),
+          name: [systemAgentKey, 'customPrompt'],
+        }) as FormItemProps,
+      ].filter(Boolean),
+      extra: allowDisable && (
+        <Switch
+          onChange={(enabled) => {
+            updateSystemAgent(systemAgentKey, { enabled });
+          }}
+          value={value.enabled}
+        />
+      ),
+      title: (
+        <span
+          style={{
+            opacity: typeof value.enabled === 'boolean' && !value.enabled ? 0.45 : 1,
+          }}
+        >
+          {t(`systemAgent.${systemAgentKey}.title`)}
+        </span>
+      ),
+    };
+
+    useSyncSystemAgent(form, settings);
+
+    return (
+      <Form form={form} initialValues={settings} items={[systemAgentSettings]} {...FORM_STYLE} />
+    );
+  },
+);
 
 export default SystemAgentForm;

package/src/app/(main)/settings/system-agent/index.tsx

@@ -1,11 +1,26 @@
+'use client';
+
+import { DEFAULT_REWRITE_QUERY } from '@/const/settings';
+import { isServerMode } from '@/const/version';
+import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
+
 import SystemAgentForm from './features/createForm';
 
 const Page = () => {
+  const { enableKnowledgeBase } = useServerConfigStore(featureFlagsSelectors);
   return (
     <>
       <SystemAgentForm systemAgentKey="topic" />
       <SystemAgentForm systemAgentKey="translation" />
       <SystemAgentForm systemAgentKey="agentMeta" />
+      {isServerMode && enableKnowledgeBase && (
+        <SystemAgentForm
+          allowCustomPrompt
+          allowDisable
+          defaultPrompt={DEFAULT_REWRITE_QUERY}
+          systemAgentKey="queryRewrite"
+        />
+      )}
     </>
   );
 };

package/src/chains/rewriteQuery.ts

@@ -1,13 +1,14 @@
+import { DEFAULT_REWRITE_QUERY } from '@/const/settings';
 import { ChatStreamPayload } from '@/types/openai/chat';
 
 export const chainRewriteQuery = (
   query: string,
   context: string[],
+  instruction: string = DEFAULT_REWRITE_QUERY,
 ): Partial<ChatStreamPayload> => ({
   messages: [
     {
-      content: `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.
-
+      content: `${instruction}
 <chatHistory>
 ${context.join('\n')}
 </chatHistory>

package/src/components/TextArea/index.tsx

@@ -0,0 +1,42 @@
+import { Input } from 'antd';
+import { TextAreaProps as Props, TextAreaRef } from 'antd/es/input/TextArea';
+import { memo, useRef, useState } from 'react';
+
+interface TextAreaProps extends Omit<Props, 'onChange'> {
+  onChange?: (value: string) => void;
+}
+
+const TextArea = memo<TextAreaProps>(({ onChange, value: defaultValue, ...props }) => {
+  const ref = useRef<TextAreaRef>(null);
+  const isChineseInput = useRef(false);
+
+  const [value, setValue] = useState(defaultValue as string);
+
+  return (
+    <Input.TextArea
+      onBlur={() => {
+        onChange?.(value);
+      }}
+      onChange={(e) => {
+        setValue(e.target.value);
+      }}
+      onCompositionEnd={() => {
+        isChineseInput.current = false;
+      }}
+      onCompositionStart={() => {
+        isChineseInput.current = true;
+      }}
+      onPressEnter={() => {
+        if (isChineseInput.current) return;
+        onChange?.(value);
+      }}
+      ref={ref}
+      {...props}
+      value={value}
+    />
+  );
+});
+
+TextArea.displayName = 'TextArea';
+
+export default TextArea;

package/src/config/modelProviders/bedrock.ts

@@ -32,6 +32,20 @@ const Bedrock: ModelProviderCard = {
       displayName: 'Claude 3.5 Sonnet',
       enabled: true,
       functionCall: true,
+      id: 'anthropic.claude-3-5-sonnet-20241022-v2:0',
+      pricing: {
+        input: 3,
+        output: 15,
+      },
+      tokens: 200_000,
+      vision: true,
+    },
+    {
+      description:
+        'Claude 3.5 Sonnet 提升了行业标准，性能超过竞争对手模型和 Claude 3 Opus，在广泛的评估中表现出色，同时具有我们中等层级模型的速度和成本。',
+      displayName: 'Claude 3.5 Sonnet 0620',
+      enabled: true,
+      functionCall: true,
       id: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
       pricing: {
         input: 3,

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/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;
 }