From 48d4d55ecc47a7c9d336ac77a10f86138dbf93c9 Mon Sep 17 00:00:00 2001 From: KVOJJJin Date: Mon, 8 Apr 2024 23:53:59 +0800 Subject: [PATCH] Fix: features of agent-chat (#3178) --- web/app/components/app/configuration/config/index.tsx | 5 +++-- .../app/configuration/hooks/use-advanced-prompt-config.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/app/components/app/configuration/config/index.tsx b/web/app/components/app/configuration/config/index.tsx index 40a3980613..b8bedba20b 100644 --- a/web/app/components/app/configuration/config/index.tsx +++ b/web/app/components/app/configuration/config/index.tsx @@ -20,7 +20,8 @@ import ConfigContext from '@/context/debug-configuration' import ConfigPrompt from '@/app/components/app/configuration/config-prompt' import ConfigVar from '@/app/components/app/configuration/config-var' import { type CitationConfig, type ModelConfig, type ModerationConfig, type MoreLikeThisConfig, type PromptVariable, type SpeechToTextConfig, type SuggestedQuestionsAfterAnswerConfig, type TextToSpeechConfig } from '@/models/debug' -import { AppType, ModelModeType } from '@/types/app' +import type { AppType } from '@/types/app' +import { ModelModeType } from '@/types/app' import { useModalContext } from '@/context/modal-context' import ConfigParamModal from '@/app/components/app/configuration/toolbox/annotation/config-param-modal' import AnnotationFullModal from '@/app/components/billing/annotation-full/modal' @@ -60,7 +61,7 @@ const Config: FC = () => { moderationConfig, setModerationConfig, } = useContext(ConfigContext) - const isChatApp = mode === AppType.chat + const isChatApp = ['advanced-chat', 'agent-chat', 'chat'].includes(mode) const { data: speech2textDefaultModel } = useDefaultModel(ModelTypeEnum.speech2text) const { data: text2speechDefaultModel } = useDefaultModel(ModelTypeEnum.tts) const { setShowModerationSettingModal } = useModalContext() 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 a35963dddf..193ac87dd0 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 @@ -3,7 +3,7 @@ import { clone } from 'lodash-es' import produce from 'immer' import type { ChatPromptConfig, CompletionPromptConfig, ConversationHistoriesRole, PromptItem } from '@/models/debug' import { PromptMode } from '@/models/debug' -import { AppType, ModelModeType } from '@/types/app' +import { ModelModeType } from '@/types/app' import { DEFAULT_CHAT_PROMPT_CONFIG, DEFAULT_COMPLETION_PROMPT_CONFIG } from '@/config' import { PRE_PROMPT_PLACEHOLDER_TEXT, checkHasContextBlock, checkHasHistoryBlock, checkHasQueryBlock } from '@/app/components/base/prompt-editor/constants' import { fetchPromptTemplate } from '@/service/debug' @@ -152,7 +152,7 @@ const useAdvancedPromptConfig = ({ else 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) + if (['advanced-chat', 'agent-chat', 'chat'].includes(appMode) && completionPromptConfig.conversation_histories_role.assistant_prefix && completionPromptConfig.conversation_histories_role.user_prefix) draft.conversation_histories_role = completionPromptConfig.conversation_histories_role }) setCompletionPromptConfig(newPromptConfig)