From dcdb00eee70f2ff1dd852ea021a72f62ba85112b Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Wed, 12 Feb 2025 16:58:33 +0800 Subject: [PATCH] feat: remove auto reset model feature #1435 close #1435 --- src/renderer/src/i18n/locales/en-us.json | 2 -- src/renderer/src/i18n/locales/ja-jp.json | 2 -- src/renderer/src/i18n/locales/ru-ru.json | 2 -- src/renderer/src/i18n/locales/zh-cn.json | 2 -- src/renderer/src/i18n/locales/zh-tw.json | 2 -- .../src/pages/home/Inputbar/Inputbar.tsx | 4 +-- .../src/pages/home/Tabs/SettingsTab.tsx | 1 - .../AssistantModelSettings.tsx | 30 ++++++++----------- src/renderer/src/services/AssistantService.ts | 1 - src/renderer/src/store/agents.ts | 3 +- src/renderer/src/store/assistants.ts | 3 +- src/renderer/src/types/index.ts | 1 - 12 files changed, 15 insertions(+), 38 deletions(-) diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 9cdee7853b..f9ba6653a5 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -42,8 +42,6 @@ "save.success": "Saved successfully", "save.title": "Save to agent", "search": "Search assistants...", - "settings.auto_reset_model": "Auto Reset Model", - "settings.auto_reset_model.tip": "Automatically reset the model when a new topic is created.", "settings.default_model": "Default Model", "settings.knowledge_base": "Knowledge Base Settings", "settings.model": "Model Settings", diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json index 9b9e78fa7a..f9ccb458cd 100644 --- a/src/renderer/src/i18n/locales/ja-jp.json +++ b/src/renderer/src/i18n/locales/ja-jp.json @@ -42,8 +42,6 @@ "save.success": "保存に成功しました", "save.title": "エージェントに保存", "search": "アシスタントを検索...", - "settings.auto_reset_model": "自動リセットモデル", - "settings.auto_reset_model.tip": "新しいトピックを作成する際にモデルを自動的にリセットします", "settings.default_model": "デフォルトモデル", "settings.knowledge_base": "ナレッジベース設定", "settings.model": "モデル設定", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index cd9e70d28b..0a6a88151b 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -42,8 +42,6 @@ "save.success": "Успешно сохранено", "save.title": "Сохранить в агента", "search": "Поиск ассистентов...", - "settings.auto_reset_model": "Автосброс модели", - "settings.auto_reset_model.tip": "Автоматически сбрасывать модель при создании нового топика.", "settings.default_model": "Модель по умолчанию", "settings.knowledge_base": "Настройки базы знаний", "settings.model": "Настройки модели", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 81c00bd661..5297518d7f 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -42,8 +42,6 @@ "save.success": "保存成功", "save.title": "保存到智能体", "search": "搜索助手", - "settings.auto_reset_model": "自动重置模型", - "settings.auto_reset_model.tip": "创建新话题时自动重置模型", "settings.default_model": "默认模型", "settings.knowledge_base": "知识库设置", "settings.model": "模型设置", diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index a23451dc01..a5fb56e67e 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -42,8 +42,6 @@ "save.success": "儲存成功", "save.title": "儲存到智能體", "search": "搜尋助手...", - "settings.auto_reset_model": "自動重置模型", - "settings.auto_reset_model.tip": "每次新的話題時自動重置模型", "settings.default_model": "預設模型", "settings.knowledge_base": "知識庫設定", "settings.model": "模型設定", diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx index 9b44159646..811c3ec31b 100644 --- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx +++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx @@ -254,9 +254,7 @@ const Inputbar: FC = ({ assistant: _assistant, setActiveTopic }) => { await addAssistantMessagesToTopic({ assistant, topic }) // Reset to assistant default model - if (assistant.settings?.autoResetModel) { - assistant.defaultModel && setModel(assistant.defaultModel) - } + assistant.defaultModel && setModel(assistant.defaultModel) addTopic(topic) setActiveTopic(topic) diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx index 9706070f81..146799b479 100644 --- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx +++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx @@ -106,7 +106,6 @@ const SettingsTab: FC = (props) => { maxTokens: DEFAULT_MAX_TOKENS, streamOutput: true, hideMessages: false, - autoResetModel: false, customParameters: [] } }) diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx index 998c7eaa68..0dcde97370 100644 --- a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx +++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx @@ -22,7 +22,6 @@ const AssistantModelSettings: FC = ({ assistant, updateAssistant, updateA const [contextCount, setContextCount] = useState(assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT) const [enableMaxTokens, setEnableMaxTokens] = useState(assistant?.settings?.enableMaxTokens ?? false) const [maxTokens, setMaxTokens] = useState(assistant?.settings?.maxTokens ?? 0) - const [autoResetModel, setAutoResetModel] = useState(assistant?.settings?.autoResetModel ?? false) const [reasoningEffort, setReasoningEffort] = useState(assistant?.settings?.reasoning_effort ?? 'medium') const [streamOutput, setStreamOutput] = useState(assistant?.settings?.streamOutput ?? true) const [defaultModel, setDefaultModel] = useState(assistant?.defaultModel) @@ -192,32 +191,27 @@ const AssistantModelSettings: FC = ({ assistant, updateAssistant, updateA - + + {defaultModel && ( +