From 8f6bf11320ba24af3ebd924480968d776621e5c0 Mon Sep 17 00:00:00 2001
From: Neal_Tan <425088158@qq.com>
Date: Sun, 30 Mar 2025 00:51:48 +0000
Subject: [PATCH 1/2] =?UTF-8?q?feat(Assistant):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=8D=E5=8F=98=E9=87=8F=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在编辑助手处添加了变量
- 保存智能体时可以保存变量
Fixed #4049
---
 src/renderer/src/components/VariableList.tsx  | 103 ++++++++++++++++
 src/renderer/src/config/models.ts             |  18 ++-
 .../src/pages/home/Tabs/AssistantItem.tsx     |   3 +
 .../AssistantPromptSettings.tsx               | 116 ++++++++++++++++--
 src/renderer/src/services/ApiService.ts       |   9 ++
 src/renderer/src/types/index.ts               |   7 ++
 src/renderer/src/utils/index.ts               |  19 +++
 7 files changed, 266 insertions(+), 9 deletions(-)
 create mode 100644 src/renderer/src/components/VariableList.tsx

diff --git a/src/renderer/src/components/VariableList.tsx b/src/renderer/src/components/VariableList.tsx
new file mode 100644
index 0000000000..324cf301a6
--- /dev/null
+++ b/src/renderer/src/components/VariableList.tsx
@@ -0,0 +1,103 @@
+import { DeleteOutlined, ImportOutlined } from '@ant-design/icons'
+import { VStack } from '@renderer/components/Layout'
+import { Variable } from '@renderer/types'
+import { Button, Input, Tooltip } from 'antd'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+interface VariableListProps {
+  variables: Variable[]
+  setVariables: (variables: Variable[]) => void
+  onUpdate?: (variables: Variable[]) => void
+  onInsertVariable?: (name: string) => void
+}
+
+const VariableList: React.FC<VariableListProps> = ({ variables, setVariables, onUpdate, onInsertVariable }) => {
+  const { t } = useTranslation()
+
+  const deleteVariable = (id: string) => {
+    const updatedVariables = variables.filter((v) => v.id !== id)
+    setVariables(updatedVariables)
+
+    if (onUpdate) {
+      onUpdate(updatedVariables)
+    }
+  }
+
+  const updateVariable = (id: string, field: 'name' | 'value', value: string) => {
+    // Only update the local state when typing, don't call the parent's onUpdate
+    const updatedVariables = variables.map((v) => (v.id === id ? { ...v, [field]: value } : v))
+    setVariables(updatedVariables)
+  }
+
+  // This function will be called when input loses focus
+  const handleInputBlur = () => {
+    if (onUpdate) {
+      onUpdate(variables)
+    }
+  }
+
+  return (
+    <VariablesContainer>
+      {variables.length === 0 ? (
+        <EmptyText>{t('common.no_variables_added')}</EmptyText>
+      ) : (
+        <VStack gap={8} width="100%">
+          {variables.map((variable) => (
+            <VariableItem key={variable.id}>
+              <Input
+                placeholder={t('common.variable_name')}
+                value={variable.name}
+                onChange={(e) => updateVariable(variable.id, 'name', e.target.value)}
+                onBlur={handleInputBlur}
+                style={{ width: '30%' }}
+              />
+              <Input
+                placeholder={t('common.value')}
+                value={variable.value}
+                onChange={(e) => updateVariable(variable.id, 'value', e.target.value)}
+                onBlur={handleInputBlur}
+                style={{ flex: 1 }}
+              />
+              {onInsertVariable && (
+                <Tooltip title="Insert into prompt">
+                  <Button type="text" onClick={() => onInsertVariable(variable.name)}>
+                    <ImportOutlined />
+                  </Button>
+                </Tooltip>
+              )}
+              <Button type="text" danger icon={<DeleteOutlined />} onClick={() => deleteVariable(variable.id)} />
+            </VariableItem>
+          ))}
+        </VStack>
+      )}
+    </VariablesContainer>
+  )
+}
+
+const VariablesContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  overflow-y: auto;
+  max-height: 200px;
+  border: 1px solid var(--color-border);
+  border-radius: 6px;
+  padding: 12px;
+`
+
+const VariableItem = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+`
+
+const EmptyText = styled.div`
+  color: var(--color-text-2);
+  opacity: 0.6;
+  font-style: italic;
+`
+
+export default VariableList
diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 6f473aa960..ca614580b2 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -165,7 +165,15 @@ const visionAllowedModels = [
   'gemma-3(?:-[\\w-]+)'
 ]
 
-const visionExcludedModels = ['gpt-4-\\d+-preview', 'gpt-4-turbo-preview', 'gpt-4-32k', 'gpt-4-\\d+', 'o1-mini', 'o1-preview', 'AIDC-AI/Marco-o1']
+const visionExcludedModels = [
+  'gpt-4-\\d+-preview',
+  'gpt-4-turbo-preview',
+  'gpt-4-32k',
+  'gpt-4-\\d+',
+  'o1-mini',
+  'o1-preview',
+  'AIDC-AI/Marco-o1'
+]
 export const VISION_REGEX = new RegExp(
   `\\b(?!(?:${visionExcludedModels.join('|')})\\b)(${visionAllowedModels.join('|')})\\b`,
   'i'
@@ -203,7 +211,13 @@ export const FUNCTION_CALLING_MODELS = [
   'gemini(?:-[\\w-]+)?' // 提前排除了gemini的嵌入模型
 ]
 
-const FUNCTION_CALLING_EXCLUDED_MODELS = ['aqa(?:-[\\w-]+)?', 'imagen(?:-[\\w-]+)?', 'o1-mini', 'o1-preview', 'AIDC-AI/Marco-o1']
+const FUNCTION_CALLING_EXCLUDED_MODELS = [
+  'aqa(?:-[\\w-]+)?',
+  'imagen(?:-[\\w-]+)?',
+  'o1-mini',
+  'o1-preview',
+  'AIDC-AI/Marco-o1'
+]
 
 export const FUNCTION_CALLING_REGEX = new RegExp(
   `\\b(?!(?:${FUNCTION_CALLING_EXCLUDED_MODELS.join('|')})\\b)(?:${FUNCTION_CALLING_MODELS.join('|')})\\b`,
diff --git a/src/renderer/src/pages/home/Tabs/AssistantItem.tsx b/src/renderer/src/pages/home/Tabs/AssistantItem.tsx
index c85a13eb28..6c3169e821 100644
--- a/src/renderer/src/pages/home/Tabs/AssistantItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantItem.tsx
@@ -84,6 +84,9 @@ const AssistantItem: FC<AssistantItemProps> = ({ assistant, isActive, onSwitch,
           const agent = omit(assistant, ['model', 'emoji'])
           agent.id = uuid()
           agent.type = 'agent'
+          if (assistant.promptVariables) {
+            agent.promptVariables = [...assistant.promptVariables]
+          }
           addAgent(agent)
           window.message.success({
             content: t('assistants.save.success'),
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
index 64fd2d991f..28866ea7db 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
@@ -1,16 +1,18 @@
 import 'emoji-picker-element'
 
-import { CloseCircleFilled } from '@ant-design/icons'
+import { CloseCircleFilled, PlusOutlined } from '@ant-design/icons'
 import EmojiPicker from '@renderer/components/EmojiPicker'
 import { Box, HStack } from '@renderer/components/Layout'
+import VariableList from '@renderer/components/VariableList'
 import { estimateTextTokens } from '@renderer/services/TokenService'
-import { Assistant, AssistantSettings } from '@renderer/types'
+import { Assistant, AssistantSettings, Variable } from '@renderer/types'
 import { getLeadingEmoji } from '@renderer/utils'
-import { Button, Input, Popover } from 'antd'
+import { Button, Input, Popover, Tooltip, Typography } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
+import { v4 as uuidv4 } from 'uuid'
 
 interface Props {
   assistant: Assistant
@@ -24,6 +26,9 @@ const AssistantPromptSettings: React.FC<Props> = ({ assistant, updateAssistant,
   const [name, setName] = useState(assistant.name.replace(getLeadingEmoji(assistant.name) || '', '').trim())
   const [prompt, setPrompt] = useState(assistant.prompt)
   const [tokenCount, setTokenCount] = useState(0)
+  const [variables, setVariables] = useState<Variable[]>(assistant.promptVariables || [])
+  const [variableName, setVariableName] = useState('')
+  const [variableValue, setVariableValue] = useState('')
   const { t } = useTranslation()
 
   useEffect(() => {
@@ -35,19 +40,77 @@ const AssistantPromptSettings: React.FC<Props> = ({ assistant, updateAssistant,
   }, [prompt])
 
   const onUpdate = () => {
-    const _assistant = { ...assistant, name: name.trim(), emoji, prompt }
+    const _assistant = {
+      ...assistant,
+      name: name.trim(),
+      emoji,
+      prompt,
+      promptVariables: variables
+    }
     updateAssistant(_assistant)
   }
 
   const handleEmojiSelect = (selectedEmoji: string) => {
     setEmoji(selectedEmoji)
-    const _assistant = { ...assistant, name: name.trim(), emoji: selectedEmoji, prompt }
+    const _assistant = {
+      ...assistant,
+      name: name.trim(),
+      emoji: selectedEmoji,
+      prompt,
+      promptVariables: variables
+    }
     updateAssistant(_assistant)
   }
 
   const handleEmojiDelete = () => {
     setEmoji('')
-    const _assistant = { ...assistant, name: name.trim(), prompt, emoji: '' }
+    const _assistant = {
+      ...assistant,
+      name: name.trim(),
+      prompt,
+      emoji: '',
+      promptVariables: variables
+    }
+    updateAssistant(_assistant)
+  }
+
+  const handleUpdateVariables = (updatedVariables: Variable[]) => {
+    const _assistant = {
+      ...assistant,
+      name: name.trim(),
+      emoji,
+      prompt,
+      promptVariables: updatedVariables
+    }
+    updateAssistant(_assistant)
+  }
+
+  const handleInsertVariable = (varName: string) => {
+    const insertText = `{{${varName}}}`
+    setPrompt((prev) => prev + insertText)
+  }
+
+  const addVariable = () => {
+    if (!variableName.trim()) return
+
+    const newVar: Variable = {
+      id: uuidv4(),
+      name: variableName.trim(),
+      value: variableValue.trim()
+    }
+
+    const updatedVariables = [...variables, newVar]
+    setVariables(updatedVariables)
+    setVariableName('')
+    setVariableValue('')
+
+    const _assistant = {
+      ...assistant,
+      name: name.trim(),
+      emoji,
+      prompt,
+      promptVariables: updatedVariables
+    }
     updateAssistant(_assistant)
   }
 
@@ -99,10 +162,49 @@ const AssistantPromptSettings: React.FC<Props> = ({ assistant, updateAssistant,
           onChange={(e) => setPrompt(e.target.value)}
           onBlur={onUpdate}
           spellCheck={false}
-          style={{ minHeight: 'calc(80vh - 200px)', maxHeight: 'calc(80vh - 150px)' }}
+          style={{ minHeight: 'calc(80vh - 320px)', maxHeight: 'calc(80vh - 270px)' }}
         />
         <TokenCount>Tokens: {tokenCount}</TokenCount>
       </TextAreaContainer>
+
+      <Box mt={12} mb={8}>
+        <HStack justifyContent="space-between" alignItems="center">
+          <Typography.Title level={5} style={{ margin: 0 }}>
+            {t('common.variables')}
+          </Typography.Title>
+          <Tooltip title={t('common.variables_help')}>
+            <Typography.Text type="secondary" style={{ fontSize: '12px', cursor: 'help' }}>
+              ?
+            </Typography.Text>
+          </Tooltip>
+        </HStack>
+      </Box>
+
+      <VariableList
+        variables={variables}
+        setVariables={setVariables}
+        onUpdate={handleUpdateVariables}
+        onInsertVariable={handleInsertVariable}
+      />
+
+      <HStack gap={8} width="100%" mt={8} mb={8}>
+        <Input
+          placeholder={t('common.variable_name')}
+          value={variableName}
+          onChange={(e) => setVariableName(e.target.value)}
+          style={{ width: '30%' }}
+        />
+        <Input
+          placeholder={t('common.value')}
+          value={variableValue}
+          onChange={(e) => setVariableValue(e.target.value)}
+          style={{ flex: 1 }}
+        />
+        <Button type="primary" icon={<PlusOutlined />} onClick={addVariable}>
+          {t('common.add')}
+        </Button>
+      </HStack>
+
       <HStack width="100%" justifyContent="flex-end" mt="10px">
         <Button type="primary" onClick={onOk}>
           {t('common.close')}
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index e70e5cbaa8..53c625af0b 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -4,6 +4,7 @@ import i18n from '@renderer/i18n'
 import store from '@renderer/store'
 import { setGenerating } from '@renderer/store/runtime'
 import { Assistant, MCPTool, Message, Model, Provider, Suggestion } from '@renderer/types'
+import { processPromptVariables } from '@renderer/utils'
 import { formatMessageError, isAbortError } from '@renderer/utils/error'
 import { withGenerateImage } from '@renderer/utils/formats'
 import { cloneDeep, findLast, isEmpty } from 'lodash'
@@ -42,6 +43,14 @@ export async function fetchChatCompletion({
     let isFirstChunk = true
     let query = ''
 
+    // Process variables in the prompt if they exist
+    if (assistant.promptVariables && assistant.promptVariables.length > 0) {
+      assistant = {
+        ...assistant,
+        prompt: processPromptVariables(assistant.prompt, assistant.promptVariables)
+      }
+    }
+
     // Search web
     if (WebSearchService.isWebSearchEnabled() && assistant.enableWebSearch && assistant.model) {
       const webSearchParams = getOpenAIWebSearchParams(assistant, assistant.model)
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 6903c183f5..a9b653404b 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -17,6 +17,7 @@ export type Assistant = {
   messages?: AssistantMessage[]
   enableWebSearch?: boolean
   enableGenerateImage?: boolean
+  promptVariables?: Variable[]
 }
 
 export type AssistantMessage = {
@@ -43,6 +44,12 @@ export type AssistantSettings = {
   reasoning_effort?: 'low' | 'medium' | 'high'
 }
 
+export type Variable = {
+  id: string
+  name: string
+  value: string
+}
+
 export type Agent = Omit<Assistant, 'model'>
 
 export type Message = {
diff --git a/src/renderer/src/utils/index.ts b/src/renderer/src/utils/index.ts
index 10679d9294..e1704f5d52 100644
--- a/src/renderer/src/utils/index.ts
+++ b/src/renderer/src/utils/index.ts
@@ -500,4 +500,23 @@ export function hasObjectKey(obj: any, key: string) {
   return Object.keys(obj).includes(key)
 }
 
+/**
+ * Process variables in a prompt string
+ * @param prompt The prompt string containing variables in {{var_name}} format
+ * @param variables Array of variables with name and value
+ * @returns The prompt with variables replaced
+ */
+export function processPromptVariables(prompt: string, variables: Array<{ name: string; value: string }> = []) {
+  if (!prompt || !variables || variables.length === 0) {
+    return prompt
+  }
+  let processedPrompt = prompt
+  variables.forEach((variable) => {
+    const pattern = new RegExp(`{{${variable.name}}}`, 'g')
+    processedPrompt = processedPrompt.replace(pattern, variable.value)
+  })
+
+  return processedPrompt
+}
+
 export { classNames }

From 83d0eb07aa8d71e93296915723ff14313547854a Mon Sep 17 00:00:00 2001
From: Neal_Tan <425088158@qq.com>
Date: Sun, 30 Mar 2025 02:10:50 +0100
Subject: [PATCH 2/2] fix(i18n): update locales json file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联提交 8f6bf113
---
 src/renderer/src/components/VariableList.tsx | 2 +-
 src/renderer/src/i18n/locales/en-us.json     | 8 +++++++-
 src/renderer/src/i18n/locales/ja-jp.json     | 8 +++++++-
 src/renderer/src/i18n/locales/ru-ru.json     | 8 +++++++-
 src/renderer/src/i18n/locales/zh-cn.json     | 8 +++++++-
 src/renderer/src/i18n/locales/zh-tw.json     | 8 +++++++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/components/VariableList.tsx b/src/renderer/src/components/VariableList.tsx
index 324cf301a6..b4975f479c 100644
--- a/src/renderer/src/components/VariableList.tsx
+++ b/src/renderer/src/components/VariableList.tsx
@@ -60,7 +60,7 @@ const VariableList: React.FC<VariableListProps> = ({ variables, setVariables, on
                 style={{ flex: 1 }}
               />
               {onInsertVariable && (
-                <Tooltip title="Insert into prompt">
+                <Tooltip title={t('common.insert_variable_into_prompt')}>
                   <Button type="text" onClick={() => onInsertVariable(variable.name)}>
                     <ImportOutlined />
                   </Button>
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index fcb5d9a4fc..2573a6e55f 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -275,7 +275,13 @@
       "select": "Select",
       "topics": "Topics",
       "warning": "Warning",
-      "you": "You"
+      "you": "You",
+      "variable_name": "Variable Name",
+      "value": "Value",
+      "no_variables_added": "No variables added",
+      "insert_variable_into_prompt": "Insert variable into prompt",
+      "variables": "Variables",
+      "variables_help": "Add variables that need to be replaced in the text, triggered by {{variable_name}} in the replacement document"
     },
     "docs": {
       "title": "Docs"
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 6d752f08a5..281382d64d 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -275,7 +275,13 @@
       "select": "選択",
       "topics": "トピック",
       "warning": "警告",
-      "you": "あなた"
+      "you": "あなた",
+      "variable_name": "変数名",
+      "value": "値",
+      "no_variables_added": "変数がありません",
+      "insert_variable_into_prompt": "プロンプトに変数を挿入",
+      "variables": "変数",
+      "variables_help": "テキスト内で置換が必要な変数を追加し、置換ドキュメント内で{{variable_name}}の形式でトリガーします"
     },
     "docs": {
       "title": "ドキュメント"
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index de6d5d8200..252d5c4834 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -275,7 +275,13 @@
       "select": "Выбрать",
       "topics": "Топики",
       "warning": "Предупреждение",
-      "you": "Вы"
+      "you": "Вы",
+      "variable_name": "Имя переменной",
+      "value": "Значение",
+      "no_variables_added": "Нет переменных",
+      "insert_variable_into_prompt": "Вставить переменную в промпт",
+      "variables": "Переменные",
+      "variables_help": "Добавьте переменные, которые нужно заменить в тексте, замена срабатывает в формате {{variable_name}} в документе замены"
     },
     "docs": {
       "title": "Документация"
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index cd7d681523..62296d3f73 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -275,7 +275,13 @@
       "select": "选择",
       "topics": "话题",
       "warning": "警告",
-      "you": "用户"
+      "you": "用户",
+      "variable_name": "变量名称",
+      "value": "值",
+      "no_variables_added": "没有添加变量",
+      "insert_variable_into_prompt": "插入变量到提示词",
+      "variables": "变量",
+      "variables_help": "添加需要替换的变量名字和值即可"
     },
     "docs": {
       "title": "帮助文档"
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 54b4f5464f..8a42ef4f37 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -275,7 +275,13 @@
       "select": "選擇",
       "topics": "話題",
       "warning": "警告",
-      "you": "您"
+      "you": "您",
+      "variable_name": "變量名稱",
+      "value": "值",
+      "no_variables_added": "沒有添加變量",
+      "insert_variable_into_prompt": "插入變量到提示詞",
+      "variables": "變量",
+      "variables_help": "添加需要替換的變量名字和值即可"
     },
     "docs": {
       "title": "說明文件"