From 5df66579a8af3e3326c1b4f7f2656364aa9c58f9 Mon Sep 17 00:00:00 2001 From: JzoNg Date: Tue, 2 Apr 2024 20:11:49 +0800 Subject: [PATCH] fix crash of advanced prompt app --- .../app/configuration/hooks/use-advanced-prompt-config.ts | 6 +++--- web/app/components/app/configuration/index.tsx | 6 +++--- .../app/configuration/prompt-value-panel/index.tsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/app/components/app/configuration/hooks/use-advanced-prompt-config.ts b/web/app/components/app/configuration/hooks/use-advanced-prompt-config.ts index c9106c7776..a35963dddf 100644 --- a/web/app/components/app/configuration/hooks/use-advanced-prompt-config.ts +++ b/web/app/components/app/configuration/hooks/use-advanced-prompt-config.ts @@ -88,7 +88,7 @@ const useAdvancedPromptConfig = ({ } } else { - const prompt = completionPromptConfig.prompt.text + const prompt = completionPromptConfig.prompt?.text return { context: checkHasContextBlock(prompt), history: checkHasHistoryBlock(prompt), @@ -146,11 +146,11 @@ const useAdvancedPromptConfig = ({ if (toModelModeType === ModelModeType.completion) { const newPromptConfig = produce(completion_prompt_config, (draft) => { - if (!completionPromptConfig.prompt.text) + if (!completionPromptConfig.prompt?.text) draft.prompt.text = draft.prompt.text.replace(PRE_PROMPT_PLACEHOLDER_TEXT, toReplacePrePrompt) else - draft.prompt.text = completionPromptConfig.prompt.text.replace(PRE_PROMPT_PLACEHOLDER_TEXT, toReplacePrePrompt) + draft.prompt.text = completionPromptConfig.prompt?.text.replace(PRE_PROMPT_PLACEHOLDER_TEXT, toReplacePrePrompt) if (appMode === AppType.chat && completionPromptConfig.conversation_histories_role.assistant_prefix && completionPromptConfig.conversation_histories_role.user_prefix) draft.conversation_histories_role = completionPromptConfig.conversation_histories_role diff --git a/web/app/components/app/configuration/index.tsx b/web/app/components/app/configuration/index.tsx index 964457a2b1..07c4882fd2 100644 --- a/web/app/components/app/configuration/index.tsx +++ b/web/app/components/app/configuration/index.tsx @@ -347,11 +347,11 @@ const Configuration: FC = () => { if (modeMode === ModelModeType.completion) { if (appMode !== AppType.completion) { - if (!completionPromptConfig.prompt.text || !completionPromptConfig.conversation_histories_role.assistant_prefix || !completionPromptConfig.conversation_histories_role.user_prefix) + if (!completionPromptConfig.prompt?.text || !completionPromptConfig.conversation_histories_role.assistant_prefix || !completionPromptConfig.conversation_histories_role.user_prefix) await migrateToDefaultPrompt(true, ModelModeType.completion) } else { - if (!completionPromptConfig.prompt.text) + if (!completionPromptConfig.prompt?.text) await migrateToDefaultPrompt(true, ModelModeType.completion) } } @@ -519,7 +519,7 @@ const Configuration: FC = () => { return chatPromptConfig.prompt.every(({ text }: any) => !text) else - return !completionPromptConfig.prompt.text + return !completionPromptConfig.prompt?.text } else { return !modelConfig.configs.prompt_template } diff --git a/web/app/components/app/configuration/prompt-value-panel/index.tsx b/web/app/components/app/configuration/prompt-value-panel/index.tsx index be063d7419..6ec36ebb04 100644 --- a/web/app/components/app/configuration/prompt-value-panel/index.tsx +++ b/web/app/components/app/configuration/prompt-value-panel/index.tsx @@ -54,7 +54,7 @@ const PromptValuePanel: FC = ({ if (isAdvancedMode) { if (modelModeType === ModelModeType.chat) return chatPromptConfig.prompt.every(({ text }) => !text) - return !completionPromptConfig.prompt.text + return !completionPromptConfig.prompt?.text } else { return !modelConfig.configs.prompt_template }