diff --git a/client/src/components/Endpoints/OpenAI/Settings.jsx b/client/src/components/Endpoints/OpenAI/Settings.jsx index a6df2e92a1..e011ab749e 100644 --- a/client/src/components/Endpoints/OpenAI/Settings.jsx +++ b/client/src/components/Endpoints/OpenAI/Settings.jsx @@ -20,7 +20,7 @@ import store from '~/store'; function Settings(props) { const { readonly, model, chatGptLabel, promptPrefix, temperature, topP, freqP, presP, setOption } = props; - console.log(props); + const endpointsConfig = useRecoilValue(store.endpointsConfig); const setModel = setOption('model'); @@ -295,7 +295,7 @@ function Settings(props) { id="pres-penalty-int" disabled={readonly} value={presP} - onChange={e => setPresP(e.target.value)} + onChange={value => setPresP(value)} max={2} min={-2} step={0.01} diff --git a/client/src/utils/cleanupPreset.js b/client/src/utils/cleanupPreset.js index bb63c6180c..726068ea35 100644 --- a/client/src/utils/cleanupPreset.js +++ b/client/src/utils/cleanupPreset.js @@ -5,45 +5,45 @@ const cleanupPreset = _preset => { if (endpoint === 'azureOpenAI' || endpoint === 'openAI') { preset = { endpoint, - presetId: _preset?.presetId || null, - model: _preset?.model || 'gpt-3.5-turbo', - chatGptLabel: _preset?.chatGptLabel || null, - promptPrefix: _preset?.promptPrefix || null, - temperature: _preset?.temperature || 1, - top_p: _preset?.top_p || 1, - presence_penalty: _preset?.presence_penalty || 0, - frequency_penalty: _preset?.frequency_penalty || 0, - title: _preset?.title || 'New Preset' + presetId: _preset?.presetId ?? null, + model: _preset?.model ?? 'gpt-3.5-turbo', + chatGptLabel: _preset?.chatGptLabel ?? null, + promptPrefix: _preset?.promptPrefix ?? null, + temperature: _preset?.temperature ?? 1, + top_p: _preset?.top_p ?? 1, + presence_penalty: _preset?.presence_penalty ?? 0, + frequency_penalty: _preset?.frequency_penalty ?? 0, + title: _preset?.title ?? 'New Preset' }; } else if (endpoint === 'bingAI') { preset = { endpoint, - presetId: _preset?.presetId || null, - jailbreak: _preset?.jailbreak || false, - context: _preset?.context || null, - systemMessage: _preset?.systemMessage || null, - toneStyle: _preset?.toneStyle || 'fast', - title: _preset?.title || 'New Preset' + presetId: _preset?.presetId ?? null, + jailbreak: _preset?.jailbreak ?? false, + context: _preset?.context ?? null, + systemMessage: _preset?.systemMessage ?? null, + toneStyle: _preset?.toneStyle ?? 'fast', + title: _preset?.title ?? 'New Preset' }; } else if (endpoint === 'chatGPTBrowser') { preset = { endpoint, - presetId: _preset?.presetId || null, - model: _preset?.model || 'Default (GPT-3.5)', - title: _preset?.title || 'New Preset' + presetId: _preset?.presetId ?? null, + model: _preset?.model ?? 'Default (GPT-3.5)', + title: _preset?.title ?? 'New Preset' }; } else if (endpoint === null) { preset = { endpoint, presetId: _preset?.presetId || null, - title: _preset?.title || 'New Preset' + title: _preset?.title ?? 'New Preset' }; } else { console.error(`Unknown endpoint ${endpoint}`); preset = { endpoint: null, - presetId: _preset?.presetId || null, - title: _preset?.title || 'New Preset' + presetId: _preset?.presetId ?? null, + title: _preset?.title ?? 'New Preset' }; } diff --git a/client/src/utils/getDefaultConversation.js b/client/src/utils/getDefaultConversation.js index 6774eeaa3a..cb6f4a04ee 100644 --- a/client/src/utils/getDefaultConversation.js +++ b/client/src/utils/getDefaultConversation.js @@ -3,23 +3,23 @@ const buildDefaultConversation = ({ conversation, endpoint, lastConversationSetu conversation = { ...conversation, endpoint, - model: lastConversationSetup?.model || 'gpt-3.5-turbo', - chatGptLabel: lastConversationSetup?.chatGptLabel || null, - promptPrefix: lastConversationSetup?.promptPrefix || null, - temperature: lastConversationSetup?.temperature || 1, - top_p: lastConversationSetup?.top_p || 1, - presence_penalty: lastConversationSetup?.presence_penalty || 0, - frequency_penalty: lastConversationSetup?.frequency_penalty || 0 + model: lastConversationSetup?.model ?? 'gpt-3.5-turbo', + chatGptLabel: lastConversationSetup?.chatGptLabel ?? null, + promptPrefix: lastConversationSetup?.promptPrefix ?? null, + temperature: lastConversationSetup?.temperature ?? 1, + top_p: lastConversationSetup?.top_p ?? 1, + presence_penalty: lastConversationSetup?.presence_penalty ?? 0, + frequency_penalty: lastConversationSetup?.frequency_penalty ?? 0 }; } else if (endpoint === 'bingAI') { conversation = { ...conversation, endpoint, - jailbreak: lastConversationSetup?.jailbreak || false, - context: lastConversationSetup?.context || null, - systemMessage: lastConversationSetup?.systemMessage || null, - toneStyle: lastConversationSetup?.toneStyle || 'fast', - jailbreakConversationId: lastConversationSetup?.jailbreakConversationId || null, + jailbreak: lastConversationSetup?.jailbreak ?? false, + context: lastConversationSetup?.context ?? null, + systemMessage: lastConversationSetup?.systemMessage ?? null, + toneStyle: lastConversationSetup?.toneStyle ?? 'fast', + jailbreakConversationId: lastConversationSetup?.jailbreakConversationId ?? null, conversationSignature: null, clientId: null, invocationId: 1 @@ -28,7 +28,7 @@ const buildDefaultConversation = ({ conversation, endpoint, lastConversationSetu conversation = { ...conversation, endpoint, - model: lastConversationSetup?.model || 'Default (GPT-3.5)' + model: lastConversationSetup?.model ?? 'Default (GPT-3.5)' }; } else if (endpoint === null) { conversation = { diff --git a/client/src/utils/handleSubmit.js b/client/src/utils/handleSubmit.js index b598dddf92..f7ac799a74 100644 --- a/client/src/utils/handleSubmit.js +++ b/client/src/utils/handleSubmit.js @@ -27,32 +27,32 @@ const useMessageHandler = () => { if (endpoint === 'azureOpenAI' || endpoint === 'openAI') { endpointOption = { endpoint, - model: currentConversation?.model || 'gpt-3.5-turbo', - chatGptLabel: currentConversation?.chatGptLabel || null, - promptPrefix: currentConversation?.promptPrefix || null, - temperature: currentConversation?.temperature || 1, - top_p: currentConversation?.top_p || 1, - presence_penalty: currentConversation?.presence_penalty || 0, - frequency_penalty: currentConversation?.frequency_penalty || 0 + model: currentConversation?.model ?? 'gpt-3.5-turbo', + chatGptLabel: currentConversation?.chatGptLabel ?? null, + promptPrefix: currentConversation?.promptPrefix ?? null, + temperature: currentConversation?.temperature ?? 1, + top_p: currentConversation?.top_p ?? 1, + presence_penalty: currentConversation?.presence_penalty ?? 0, + frequency_penalty: currentConversation?.frequency_penalty ?? 0 }; - responseSender = endpointOption.chatGptLabel || 'ChatGPT'; + responseSender = endpointOption.chatGptLabel ?? 'ChatGPT'; } else if (endpoint === 'bingAI') { endpointOption = { endpoint, - jailbreak: currentConversation?.jailbreak || false, - systemMessage: currentConversation?.systemMessage || null, - context: currentConversation?.context || null, - toneStyle: currentConversation?.toneStyle || 'fast', - jailbreakConversationId: currentConversation?.jailbreakConversationId || null, - conversationSignature: currentConversation?.conversationSignature || null, - clientId: currentConversation?.clientId || null, - invocationId: currentConversation?.invocationId || 1 + jailbreak: currentConversation?.jailbreak ?? false, + systemMessage: currentConversation?.systemMessage ?? null, + context: currentConversation?.context ?? null, + toneStyle: currentConversation?.toneStyle ?? 'fast', + jailbreakConversationId: currentConversation?.jailbreakConversationId ?? null, + conversationSignature: currentConversation?.conversationSignature ?? null, + clientId: currentConversation?.clientId ?? null, + invocationId: currentConversation?.invocationId ?? 1 }; responseSender = endpointOption.jailbreak ? 'Sydney' : 'BingAI'; } else if (endpoint === 'chatGPTBrowser') { endpointOption = { endpoint, - model: currentConversation?.model || 'Default (GPT-3.5)' + model: currentConversation?.model ?? 'Default (GPT-3.5)' }; responseSender = 'ChatGPT'; } else if (endpoint === null) {