From ee10e0e43e13825d4f251a75679923e0d78435b5 Mon Sep 17 00:00:00 2001 From: Wentao Lyu <35-wentao.lyu@users.noreply.git.stereye.tech> Date: Wed, 5 Apr 2023 03:49:54 +0800 Subject: [PATCH] feat: use default preset to create new conversation. --- .../components/Input/BingAIOptions/index.jsx | 22 +++++----- .../components/Input/ChatGPTOptions/index.jsx | 8 ++-- .../components/Input/OpenAIOptions/index.jsx | 44 +++++++++---------- client/src/utils/getDefaultConversation.js | 28 ++++++------ 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/client/src/components/Input/BingAIOptions/index.jsx b/client/src/components/Input/BingAIOptions/index.jsx index 9c4efcc18b..330085e3e2 100644 --- a/client/src/components/Input/BingAIOptions/index.jsx +++ b/client/src/components/Input/BingAIOptions/index.jsx @@ -18,13 +18,13 @@ function BingAIOptions() { const { endpoint, conversationId } = conversation; const { toneStyle, context, systemMessage, jailbreak } = conversation; - useEffect(() => { - if (endpoint !== 'bingAI') return; + // useEffect(() => { + // if (endpoint !== 'bingAI') return; - const mustInAdvancedMode = context !== null || systemMessage !== null; + // const mustInAdvancedMode = context !== null || systemMessage !== null; - if (mustInAdvancedMode && !advancedMode) setAdvancedMode(true); - }, [conversation, advancedMode]); + // if (mustInAdvancedMode && !advancedMode) setAdvancedMode(true); + // }, [conversation, advancedMode]); if (endpoint !== 'bingAI') return null; if (conversationId !== 'new') return null; @@ -32,11 +32,11 @@ function BingAIOptions() { const triggerAdvancedMode = () => setAdvancedMode(prev => !prev); const switchToSimpleMode = () => { - setConversation(prevState => ({ - ...prevState, - context: null, - systemMessage: null - })); + // setConversation(prevState => ({ + // ...prevState, + // context: null, + // systemMessage: null + // })); setAdvancedMode(false); }; @@ -64,7 +64,7 @@ function BingAIOptions() { <>
diff --git a/client/src/components/Input/ChatGPTOptions/index.jsx b/client/src/components/Input/ChatGPTOptions/index.jsx index 2206c60d95..150a039b74 100644 --- a/client/src/components/Input/ChatGPTOptions/index.jsx +++ b/client/src/components/Input/ChatGPTOptions/index.jsx @@ -12,9 +12,9 @@ function ChatGPTOptions() { const endpointsConfig = useRecoilValue(store.endpointsConfig); - useEffect(() => { - if (endpoint !== 'chatGPTBrowser') return; - }, [conversation]); + // useEffect(() => { + // if (endpoint !== 'chatGPTBrowser') return; + // }, [conversation]); if (endpoint !== 'chatGPTBrowser') return null; if (conversationId !== 'new') return null; @@ -34,7 +34,7 @@ function ChatGPTOptions() { 'transition-colors shadow-md rounded-md min-w-[75px] font-normal bg-white border-black/10 hover:border-black/10 focus:border-black/10 dark:border-black/10 dark:hover:border-black/10 dark:focus:border-black/10 border dark:bg-gray-700 text-black dark:text-white'; return ( -
+
{ - if (endpoint !== 'openAI') return; + // useEffect(() => { + // if (endpoint !== 'openAI') return; - const mustInAdvancedMode = - chatGptLabel !== null || - promptPrefix !== null || - temperature !== 1 || - top_p !== 1 || - presence_penalty !== 0 || - frequency_penalty !== 0; + // const mustInAdvancedMode = + // chatGptLabel !== null || + // promptPrefix !== null || + // temperature !== 1 || + // top_p !== 1 || + // presence_penalty !== 0 || + // frequency_penalty !== 0; - if (mustInAdvancedMode && !advancedMode) setAdvancedMode(true); - }, [conversation, advancedMode]); + // if (mustInAdvancedMode && !advancedMode) setAdvancedMode(true); + // }, [conversation, advancedMode]); if (endpoint !== 'openAI') return null; if (conversationId !== 'new') return null; @@ -43,15 +43,15 @@ function OpenAIOptions() { const triggerAdvancedMode = () => setAdvancedMode(prev => !prev); const switchToSimpleMode = () => { - setConversation(prevState => ({ - ...prevState, - chatGptLabel: null, - promptPrefix: null, - temperature: 1, - top_p: 1, - presence_penalty: 0, - frequency_penalty: 0 - })); + // setConversation(prevState => ({ + // ...prevState, + // chatGptLabel: null, + // promptPrefix: null, + // temperature: 1, + // top_p: 1, + // presence_penalty: 0, + // frequency_penalty: 0 + // })); setAdvancedMode(false); }; @@ -75,7 +75,7 @@ function OpenAIOptions() { <>
diff --git a/client/src/utils/getDefaultConversation.js b/client/src/utils/getDefaultConversation.js index 9434853a2a..6774eeaa3a 100644 --- a/client/src/utils/getDefaultConversation.js +++ b/client/src/utils/getDefaultConversation.js @@ -50,7 +50,7 @@ const getDefaultConversation = ({ conversation, prevConversation, endpointsFilte const { endpoint: targetEndpoint } = preset || {}; if (targetEndpoint) { - // try to use current model + // try to use preset const endpoint = targetEndpoint; if (endpointsFilter?.[endpoint]) { conversation = buildDefaultConversation({ @@ -65,18 +65,18 @@ const getDefaultConversation = ({ conversation, prevConversation, endpointsFilte } } - try { - // try to use current model - const { endpoint = null } = prevConversation || {}; - if (endpointsFilter?.[endpoint]) { - conversation = buildDefaultConversation({ - conversation, - endpoint, - lastConversationSetup: prevConversation - }); - return conversation; - } - } catch (error) {} + // try { + // // try to use current model + // const { endpoint = null } = prevConversation || {}; + // if (endpointsFilter?.[endpoint]) { + // conversation = buildDefaultConversation({ + // conversation, + // endpoint, + // lastConversationSetup: prevConversation + // }); + // return conversation; + // } + // } catch (error) {} try { // try to read latest selected model from local storage @@ -84,7 +84,7 @@ const getDefaultConversation = ({ conversation, prevConversation, endpointsFilte const { endpoint = null } = lastConversationSetup; if (endpointsFilter?.[endpoint]) { - conversation = buildDefaultConversation({ conversation, endpoint, lastConversationSetup }); + conversation = buildDefaultConversation({ conversation, endpoint }); return conversation; } } catch (error) {}