mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 18:00:15 +01:00
fix: force reset to default if 0 or false
This commit is contained in:
parent
4b373ebc0e
commit
a5202f84cc
4 changed files with 53 additions and 53 deletions
|
|
@ -20,7 +20,7 @@ import store from '~/store';
|
||||||
|
|
||||||
function Settings(props) {
|
function Settings(props) {
|
||||||
const { readonly, model, chatGptLabel, promptPrefix, temperature, topP, freqP, presP, setOption } = props;
|
const { readonly, model, chatGptLabel, promptPrefix, temperature, topP, freqP, presP, setOption } = props;
|
||||||
console.log(props);
|
|
||||||
const endpointsConfig = useRecoilValue(store.endpointsConfig);
|
const endpointsConfig = useRecoilValue(store.endpointsConfig);
|
||||||
|
|
||||||
const setModel = setOption('model');
|
const setModel = setOption('model');
|
||||||
|
|
@ -295,7 +295,7 @@ function Settings(props) {
|
||||||
id="pres-penalty-int"
|
id="pres-penalty-int"
|
||||||
disabled={readonly}
|
disabled={readonly}
|
||||||
value={presP}
|
value={presP}
|
||||||
onChange={e => setPresP(e.target.value)}
|
onChange={value => setPresP(value)}
|
||||||
max={2}
|
max={2}
|
||||||
min={-2}
|
min={-2}
|
||||||
step={0.01}
|
step={0.01}
|
||||||
|
|
|
||||||
|
|
@ -5,45 +5,45 @@ const cleanupPreset = _preset => {
|
||||||
if (endpoint === 'azureOpenAI' || endpoint === 'openAI') {
|
if (endpoint === 'azureOpenAI' || endpoint === 'openAI') {
|
||||||
preset = {
|
preset = {
|
||||||
endpoint,
|
endpoint,
|
||||||
presetId: _preset?.presetId || null,
|
presetId: _preset?.presetId ?? null,
|
||||||
model: _preset?.model || 'gpt-3.5-turbo',
|
model: _preset?.model ?? 'gpt-3.5-turbo',
|
||||||
chatGptLabel: _preset?.chatGptLabel || null,
|
chatGptLabel: _preset?.chatGptLabel ?? null,
|
||||||
promptPrefix: _preset?.promptPrefix || null,
|
promptPrefix: _preset?.promptPrefix ?? null,
|
||||||
temperature: _preset?.temperature || 1,
|
temperature: _preset?.temperature ?? 1,
|
||||||
top_p: _preset?.top_p || 1,
|
top_p: _preset?.top_p ?? 1,
|
||||||
presence_penalty: _preset?.presence_penalty || 0,
|
presence_penalty: _preset?.presence_penalty ?? 0,
|
||||||
frequency_penalty: _preset?.frequency_penalty || 0,
|
frequency_penalty: _preset?.frequency_penalty ?? 0,
|
||||||
title: _preset?.title || 'New Preset'
|
title: _preset?.title ?? 'New Preset'
|
||||||
};
|
};
|
||||||
} else if (endpoint === 'bingAI') {
|
} else if (endpoint === 'bingAI') {
|
||||||
preset = {
|
preset = {
|
||||||
endpoint,
|
endpoint,
|
||||||
presetId: _preset?.presetId || null,
|
presetId: _preset?.presetId ?? null,
|
||||||
jailbreak: _preset?.jailbreak || false,
|
jailbreak: _preset?.jailbreak ?? false,
|
||||||
context: _preset?.context || null,
|
context: _preset?.context ?? null,
|
||||||
systemMessage: _preset?.systemMessage || null,
|
systemMessage: _preset?.systemMessage ?? null,
|
||||||
toneStyle: _preset?.toneStyle || 'fast',
|
toneStyle: _preset?.toneStyle ?? 'fast',
|
||||||
title: _preset?.title || 'New Preset'
|
title: _preset?.title ?? 'New Preset'
|
||||||
};
|
};
|
||||||
} else if (endpoint === 'chatGPTBrowser') {
|
} else if (endpoint === 'chatGPTBrowser') {
|
||||||
preset = {
|
preset = {
|
||||||
endpoint,
|
endpoint,
|
||||||
presetId: _preset?.presetId || null,
|
presetId: _preset?.presetId ?? null,
|
||||||
model: _preset?.model || 'Default (GPT-3.5)',
|
model: _preset?.model ?? 'Default (GPT-3.5)',
|
||||||
title: _preset?.title || 'New Preset'
|
title: _preset?.title ?? 'New Preset'
|
||||||
};
|
};
|
||||||
} else if (endpoint === null) {
|
} else if (endpoint === null) {
|
||||||
preset = {
|
preset = {
|
||||||
endpoint,
|
endpoint,
|
||||||
presetId: _preset?.presetId || null,
|
presetId: _preset?.presetId || null,
|
||||||
title: _preset?.title || 'New Preset'
|
title: _preset?.title ?? 'New Preset'
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
console.error(`Unknown endpoint ${endpoint}`);
|
console.error(`Unknown endpoint ${endpoint}`);
|
||||||
preset = {
|
preset = {
|
||||||
endpoint: null,
|
endpoint: null,
|
||||||
presetId: _preset?.presetId || null,
|
presetId: _preset?.presetId ?? null,
|
||||||
title: _preset?.title || 'New Preset'
|
title: _preset?.title ?? 'New Preset'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,23 +3,23 @@ const buildDefaultConversation = ({ conversation, endpoint, lastConversationSetu
|
||||||
conversation = {
|
conversation = {
|
||||||
...conversation,
|
...conversation,
|
||||||
endpoint,
|
endpoint,
|
||||||
model: lastConversationSetup?.model || 'gpt-3.5-turbo',
|
model: lastConversationSetup?.model ?? 'gpt-3.5-turbo',
|
||||||
chatGptLabel: lastConversationSetup?.chatGptLabel || null,
|
chatGptLabel: lastConversationSetup?.chatGptLabel ?? null,
|
||||||
promptPrefix: lastConversationSetup?.promptPrefix || null,
|
promptPrefix: lastConversationSetup?.promptPrefix ?? null,
|
||||||
temperature: lastConversationSetup?.temperature || 1,
|
temperature: lastConversationSetup?.temperature ?? 1,
|
||||||
top_p: lastConversationSetup?.top_p || 1,
|
top_p: lastConversationSetup?.top_p ?? 1,
|
||||||
presence_penalty: lastConversationSetup?.presence_penalty || 0,
|
presence_penalty: lastConversationSetup?.presence_penalty ?? 0,
|
||||||
frequency_penalty: lastConversationSetup?.frequency_penalty || 0
|
frequency_penalty: lastConversationSetup?.frequency_penalty ?? 0
|
||||||
};
|
};
|
||||||
} else if (endpoint === 'bingAI') {
|
} else if (endpoint === 'bingAI') {
|
||||||
conversation = {
|
conversation = {
|
||||||
...conversation,
|
...conversation,
|
||||||
endpoint,
|
endpoint,
|
||||||
jailbreak: lastConversationSetup?.jailbreak || false,
|
jailbreak: lastConversationSetup?.jailbreak ?? false,
|
||||||
context: lastConversationSetup?.context || null,
|
context: lastConversationSetup?.context ?? null,
|
||||||
systemMessage: lastConversationSetup?.systemMessage || null,
|
systemMessage: lastConversationSetup?.systemMessage ?? null,
|
||||||
toneStyle: lastConversationSetup?.toneStyle || 'fast',
|
toneStyle: lastConversationSetup?.toneStyle ?? 'fast',
|
||||||
jailbreakConversationId: lastConversationSetup?.jailbreakConversationId || null,
|
jailbreakConversationId: lastConversationSetup?.jailbreakConversationId ?? null,
|
||||||
conversationSignature: null,
|
conversationSignature: null,
|
||||||
clientId: null,
|
clientId: null,
|
||||||
invocationId: 1
|
invocationId: 1
|
||||||
|
|
@ -28,7 +28,7 @@ const buildDefaultConversation = ({ conversation, endpoint, lastConversationSetu
|
||||||
conversation = {
|
conversation = {
|
||||||
...conversation,
|
...conversation,
|
||||||
endpoint,
|
endpoint,
|
||||||
model: lastConversationSetup?.model || 'Default (GPT-3.5)'
|
model: lastConversationSetup?.model ?? 'Default (GPT-3.5)'
|
||||||
};
|
};
|
||||||
} else if (endpoint === null) {
|
} else if (endpoint === null) {
|
||||||
conversation = {
|
conversation = {
|
||||||
|
|
|
||||||
|
|
@ -27,32 +27,32 @@ const useMessageHandler = () => {
|
||||||
if (endpoint === 'azureOpenAI' || endpoint === 'openAI') {
|
if (endpoint === 'azureOpenAI' || endpoint === 'openAI') {
|
||||||
endpointOption = {
|
endpointOption = {
|
||||||
endpoint,
|
endpoint,
|
||||||
model: currentConversation?.model || 'gpt-3.5-turbo',
|
model: currentConversation?.model ?? 'gpt-3.5-turbo',
|
||||||
chatGptLabel: currentConversation?.chatGptLabel || null,
|
chatGptLabel: currentConversation?.chatGptLabel ?? null,
|
||||||
promptPrefix: currentConversation?.promptPrefix || null,
|
promptPrefix: currentConversation?.promptPrefix ?? null,
|
||||||
temperature: currentConversation?.temperature || 1,
|
temperature: currentConversation?.temperature ?? 1,
|
||||||
top_p: currentConversation?.top_p || 1,
|
top_p: currentConversation?.top_p ?? 1,
|
||||||
presence_penalty: currentConversation?.presence_penalty || 0,
|
presence_penalty: currentConversation?.presence_penalty ?? 0,
|
||||||
frequency_penalty: currentConversation?.frequency_penalty || 0
|
frequency_penalty: currentConversation?.frequency_penalty ?? 0
|
||||||
};
|
};
|
||||||
responseSender = endpointOption.chatGptLabel || 'ChatGPT';
|
responseSender = endpointOption.chatGptLabel ?? 'ChatGPT';
|
||||||
} else if (endpoint === 'bingAI') {
|
} else if (endpoint === 'bingAI') {
|
||||||
endpointOption = {
|
endpointOption = {
|
||||||
endpoint,
|
endpoint,
|
||||||
jailbreak: currentConversation?.jailbreak || false,
|
jailbreak: currentConversation?.jailbreak ?? false,
|
||||||
systemMessage: currentConversation?.systemMessage || null,
|
systemMessage: currentConversation?.systemMessage ?? null,
|
||||||
context: currentConversation?.context || null,
|
context: currentConversation?.context ?? null,
|
||||||
toneStyle: currentConversation?.toneStyle || 'fast',
|
toneStyle: currentConversation?.toneStyle ?? 'fast',
|
||||||
jailbreakConversationId: currentConversation?.jailbreakConversationId || null,
|
jailbreakConversationId: currentConversation?.jailbreakConversationId ?? null,
|
||||||
conversationSignature: currentConversation?.conversationSignature || null,
|
conversationSignature: currentConversation?.conversationSignature ?? null,
|
||||||
clientId: currentConversation?.clientId || null,
|
clientId: currentConversation?.clientId ?? null,
|
||||||
invocationId: currentConversation?.invocationId || 1
|
invocationId: currentConversation?.invocationId ?? 1
|
||||||
};
|
};
|
||||||
responseSender = endpointOption.jailbreak ? 'Sydney' : 'BingAI';
|
responseSender = endpointOption.jailbreak ? 'Sydney' : 'BingAI';
|
||||||
} else if (endpoint === 'chatGPTBrowser') {
|
} else if (endpoint === 'chatGPTBrowser') {
|
||||||
endpointOption = {
|
endpointOption = {
|
||||||
endpoint,
|
endpoint,
|
||||||
model: currentConversation?.model || 'Default (GPT-3.5)'
|
model: currentConversation?.model ?? 'Default (GPT-3.5)'
|
||||||
};
|
};
|
||||||
responseSender = 'ChatGPT';
|
responseSender = 'ChatGPT';
|
||||||
} else if (endpoint === null) {
|
} else if (endpoint === null) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue