Use array.includes

a2aef5ea4a7301aae272e58afe26545bd32c2d3e

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: cc401b2c9d288229f95ecbe49d406f0fc9fd0801
2 files changed, +3 -3Showing whitespace changes
public/script.js+2 -2
@@ -3089,8 +3089,8 @@ export function isStreamingEnabled() {
3089 (main_api == 'openai' &&3089 (main_api == 'openai' &&
3090 oai_settings.stream_openai &&3090 oai_settings.stream_openai &&
3091 !noStreamSources.includes(oai_settings.chat_completion_source) &&3091 !noStreamSources.includes(oai_settings.chat_completion_source) &&
3092 !(oai_settings.chat_completion_source == chat_completion_sources.OPENAI && (oai_settings.openai_model === 'o1' || oai_settings.openai_model === 'o1-2024-12-17')) &&3092 !(oai_settings.chat_completion_source == chat_completion_sources.OPENAI && ['o1-2024-12-17', 'o1'].includes(oai_settings.openai_model))
3093 !(oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE && oai_settings.google_model.includes('bison')))3093 )
3094 || (main_api == 'kobold' && kai_settings.streaming_kobold && kai_flags.can_use_streaming)3094 || (main_api == 'kobold' && kai_settings.streaming_kobold && kai_flags.can_use_streaming)
3095 || (main_api == 'novel' && nai_settings.streaming_novel)3095 || (main_api == 'novel' && nai_settings.streaming_novel)
3096 || (main_api == 'textgenerationwebui' && textgen_settings.streaming));3096 || (main_api == 'textgenerationwebui' && textgen_settings.streaming));
public/scripts/openai.js+1 -1
@@ -1869,7 +1869,7 @@ async function sendOpenAIRequest(type, messages, signal) {
1869 const isQuiet = type === 'quiet';1869 const isQuiet = type === 'quiet';
1870 const isImpersonate = type === 'impersonate';1870 const isImpersonate = type === 'impersonate';
1871 const isContinue = type === 'continue';1871 const isContinue = type === 'continue';
1872 const stream = oai_settings.stream_openai && !isQuiet && !isScale && !(isGoogle && oai_settings.google_model.includes('bison')) && !(isOAI && (oai_settings.openai_model === 'o1' || oai_settings.openai_model === 'o1-2024-12-17'));1872 const stream = oai_settings.stream_openai && !isQuiet && !isScale && !(isOAI && ['o1-2024-12-17', 'o1'].includes(oai_settings.openai_model));
1873 const useLogprobs = !!power_user.request_token_probabilities;1873 const useLogprobs = !!power_user.request_token_probabilities;
1874 const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);1874 const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom);
18751875