From 5e8692eae54cf206df1b08d1357d03c08fae9881 Mon Sep 17 00:00:00 2001 From: jialin Date: Thu, 15 May 2025 11:48:44 +0800 Subject: [PATCH] fix: theme setting miss after refreshing --- src/atoms/settings.ts | 9 +++- src/hooks/use-user-settings.ts | 4 +- src/locales/en-US/models.ts | 4 +- src/locales/ja-JP/models.ts | 6 ++- src/locales/ru-RU/models.ts | 6 ++- src/locales/zh-CN/models.ts | 4 +- .../llmodels/components/advance-config.tsx | 41 +++++++++++-------- src/pages/llmodels/config/mindie-config.ts | 3 +- 8 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/atoms/settings.ts b/src/atoms/settings.ts index 3e0e581a..f2e12890 100644 --- a/src/atoms/settings.ts +++ b/src/atoms/settings.ts @@ -9,12 +9,17 @@ type UserSettings = { isDarkTheme: boolean; }; -export const userSettingsAtom = atomWithStorage('userSettings', { +const defaultSettings: UserSettings = { theme: 'light', mode: 'auto', isDarkTheme: false, colorPrimary: colorPrimary -}); +}; + +export const userSettingsAtom = atomWithStorage( + 'userSettings', + defaultSettings +); export const userSettingsHelperAtom = atom( (get) => get(userSettingsAtom), diff --git a/src/hooks/use-user-settings.ts b/src/hooks/use-user-settings.ts index f9c6b842..ea63b875 100644 --- a/src/hooks/use-user-settings.ts +++ b/src/hooks/use-user-settings.ts @@ -47,8 +47,8 @@ export default function useUserSettings() { }; useEffect(() => { - setTheme(userSettings.mode); - }, []); + setHtmlThemeAttr(userSettings.theme); + }, [userSettings.theme]); useEffect(() => { if (userSettings.mode !== 'auto') return; diff --git a/src/locales/en-US/models.ts b/src/locales/en-US/models.ts index 669778e1..b6627fa3 100644 --- a/src/locales/en-US/models.ts +++ b/src/locales/en-US/models.ts @@ -158,5 +158,7 @@ export default { 'Following the v0.7.0 update, all previously deployed models will continue to work as expected.', 'models.ollama.deprecated.issue': 'See the related issue: #1979 on GitHub.', - 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.` + 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.`, + 'models.backend.mindie.310p': + 'Ascend 310P only supports FP16, so you need to set --dtype=float16.' }; diff --git a/src/locales/ja-JP/models.ts b/src/locales/ja-JP/models.ts index af65925c..f85fe6a6 100644 --- a/src/locales/ja-JP/models.ts +++ b/src/locales/ja-JP/models.ts @@ -158,11 +158,13 @@ export default { 'Following the v0.7.0 update, all previously deployed models will continue to work as expected.', 'models.ollama.deprecated.issue': 'See the related issue: #1979 on GitHub.', - 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.` + 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.`, + 'models.backend.mindie.310p': + 'Ascend 310P only supports FP16, so you need to set --dtype=float16.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'models.ollama.deprecated.title': 'Deprecation Notice', // 2. 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.` - +// 3. 'models.backend.mindie.310p':'Ascend 310P only supports FP16, so you need to set --dtype=float16.' // ========== End of To-Do List ========== diff --git a/src/locales/ru-RU/models.ts b/src/locales/ru-RU/models.ts index cd080e40..c658b4c1 100644 --- a/src/locales/ru-RU/models.ts +++ b/src/locales/ru-RU/models.ts @@ -159,11 +159,13 @@ export default { 'После обновления до версии (v0.7.0), все ранее развёрнутые модели продолжат работать в обычном режиме.', 'models.ollama.deprecated.issue': 'См. связанную проблему: #1979 on GitHub.', - 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.` + 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.`, + 'models.backend.mindie.310p': + 'Ascend 310P only supports FP16, so you need to set --dtype=float16.' }; // ========== To-Do: Translate Keys (Remove After Translation) ========== // 1. 'models.ollama.deprecated.title': 'Deprecation Notice', // 2. 'models.ollama.deprecated.notice': `The Ollama model source has been deprecated as of v0.6.1. For more information, see the related GitHub issue.` - +// 3. 'models.backend.mindie.310p':'Ascend 310P only supports FP16, so you need to set --dtype=float16.' // ========== End of To-Do List ========== diff --git a/src/locales/zh-CN/models.ts b/src/locales/zh-CN/models.ts index 04f6d728..a265580e 100644 --- a/src/locales/zh-CN/models.ts +++ b/src/locales/zh-CN/models.ts @@ -151,5 +151,7 @@ export default { '在 v0.7.0 更新后： 所有先前部署的模型仍将正常运行。', 'models.ollama.deprecated.issue': '参见 GitHub 上的问题 #1979。', - 'models.ollama.deprecated.notice': `Ollama 模型来源自 v0.6.1 起已被弃用。更多信息请参见相关的 GitHub 问题。` + 'models.ollama.deprecated.notice': `Ollama 模型来源自 v0.6.1 起已被弃用。更多信息请参见相关的 GitHub 问题。`, + 'models.backend.mindie.310p': + 'Ascend 310P 仅支持 FP16，需要设置 --dtype=float16。' }; diff --git a/src/pages/llmodels/components/advance-config.tsx b/src/pages/llmodels/components/advance-config.tsx index 948a8523..fdbdcde1 100644 --- a/src/pages/llmodels/components/advance-config.tsx +++ b/src/pages/llmodels/components/advance-config.tsx @@ -420,25 +420,32 @@ const AdvanceConfig: React.FC = (props) => { options={paramsConfig} description={ backendParamsTips.link && ( - - {intl.formatMessage( - { id: 'models.form.backend_parameters.vllm.tips' }, - { backend: backendParamsTips.backend || '' } - )}{' '} - + + {backend === backendOptionsMap.ascendMindie && ( - {intl.formatMessage({ id: 'common.text.here' })} + {intl.formatMessage({ id: 'models.backend.mindie.310p' })} - - + )} + + {intl.formatMessage( + { id: 'models.form.backend_parameters.vllm.tips' }, + { backend: backendParamsTips.backend || '' } + )}{' '} + + + {intl.formatMessage({ id: 'common.text.here' })} + + + + ) } diff --git a/src/pages/llmodels/config/mindie-config.ts b/src/pages/llmodels/config/mindie-config.ts index fe2c7b77..1011342b 100644 --- a/src/pages/llmodels/config/mindie-config.ts +++ b/src/pages/llmodels/config/mindie-config.ts @@ -88,7 +88,8 @@ const options = [ }, { label: '--dtype', - value: '--dtype' + value: '--dtype', + options: ['auto', 'half', 'float16', 'bfloat16', 'float', 'float32'] }, { label: '--rope-scaling',