调整为默认不传参数的模式
This commit is contained in:
@@ -194,26 +194,13 @@ class StreamingGeneration {
|
||||
return Number.isFinite(n) ? n : undefined;
|
||||
};
|
||||
const isUnset = (k) => baseOptions?.[k] === '__unset__';
|
||||
const tUser = num(baseOptions?.temperature);
|
||||
const ppUser = num(baseOptions?.presence_penalty);
|
||||
const fpUser = num(baseOptions?.frequency_penalty);
|
||||
const tpUser = num(baseOptions?.top_p);
|
||||
const tkUser = num(baseOptions?.top_k);
|
||||
const mtUser = num(baseOptions?.max_tokens);
|
||||
const tUI = num(oai_settings?.temp_openai);
|
||||
const ppUI = num(oai_settings?.pres_pen_openai);
|
||||
const fpUI = num(oai_settings?.freq_pen_openai);
|
||||
const tpUI_OpenAI = num(oai_settings?.top_p_openai ?? oai_settings?.top_p);
|
||||
const mtUI_OpenAI = num(oai_settings?.openai_max_tokens ?? oai_settings?.max_tokens);
|
||||
const tpUI_Gemini = num(oai_settings?.makersuite_top_p ?? oai_settings?.top_p);
|
||||
const tkUI_Gemini = num(oai_settings?.makersuite_top_k ?? oai_settings?.top_k);
|
||||
const mtUI_Gemini = num(oai_settings?.makersuite_max_tokens ?? oai_settings?.max_output_tokens ?? oai_settings?.openai_max_tokens ?? oai_settings?.max_tokens);
|
||||
const effectiveTemperature = isUnset('temperature') ? undefined : (tUser ?? tUI);
|
||||
const effectivePresence = isUnset('presence_penalty') ? undefined : (ppUser ?? ppUI);
|
||||
const effectiveFrequency = isUnset('frequency_penalty') ? undefined : (fpUser ?? fpUI);
|
||||
const effectiveTopP = isUnset('top_p') ? undefined : (tpUser ?? (source === chat_completion_sources.MAKERSUITE ? tpUI_Gemini : tpUI_OpenAI));
|
||||
const effectiveTopK = isUnset('top_k') ? undefined : (tkUser ?? (source === chat_completion_sources.MAKERSUITE ? tkUI_Gemini : undefined));
|
||||
const effectiveMaxT = isUnset('max_tokens') ? undefined : (mtUser ?? (source === chat_completion_sources.MAKERSUITE ? (mtUI_Gemini ?? mtUI_OpenAI) : mtUI_OpenAI) ?? 4000);
|
||||
// 只使用命令参数,不从 UI 设置读取
|
||||
const effectiveTemperature = isUnset('temperature') ? undefined : num(baseOptions?.temperature);
|
||||
const effectivePresence = isUnset('presence_penalty') ? undefined : num(baseOptions?.presence_penalty);
|
||||
const effectiveFrequency = isUnset('frequency_penalty') ? undefined : num(baseOptions?.frequency_penalty);
|
||||
const effectiveTopP = isUnset('top_p') ? undefined : num(baseOptions?.top_p);
|
||||
const effectiveTopK = isUnset('top_k') ? undefined : num(baseOptions?.top_k);
|
||||
const effectiveMaxT = isUnset('max_tokens') ? undefined : num(baseOptions?.max_tokens);
|
||||
|
||||
const body = {
|
||||
messages, model, stream,
|
||||
|
||||
Reference in New Issue
Block a user