mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/kwaroran/RisuAI

Browse Source
This commit is contained in:
kwaroran
2024-05-14 21:45:29 +09:00
parent b4d264688a 8af6ac0399
commit 33ba9f0fe1
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/Setting/Pages/BotSettings.svelte
View File

@@ -172,6 +172,7 @@
<OptionInput value="gpt35">GPT 3.5</OptionInput> <OptionInput value="gpt35">GPT 3.5</OptionInput>
<OptionInput value="gpt35_16k">GPT 3.5 16k</OptionInput> <OptionInput value="gpt35_16k">GPT 3.5 16k</OptionInput>
<OptionInput value="gpt4">GPT-4</OptionInput> <OptionInput value="gpt4">GPT-4</OptionInput>
<OptionInput value="gpt4o">GPT-4o</OptionInput>
<OptionInput value="gpt4_32k">GPT-4 32k</OptionInput> <OptionInput value="gpt4_32k">GPT-4 32k</OptionInput>
<OptionInput value="gpt4_1106">GPT-4 Turbo 1106</OptionInput> <OptionInput value="gpt4_1106">GPT-4 Turbo 1106</OptionInput>
<OptionInput value="gptvi4_1106">GPT-4 Turbo 1106 Vision</OptionInput> <OptionInput value="gptvi4_1106">GPT-4 Turbo 1106 Vision</OptionInput>

8
src/ts/process/request.ts
View File

@@ -495,12 +495,12 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
if(supportsInlayImage()){ if(supportsInlayImage()){
// inlay models doesn't support logit_bias // inlay models doesn't support logit_bias
// gpt-4-turbo supports both logit_bias and inlay image // OpenAI's gpt based llm model supports both logit_bias and inlay image
if(!( if(!(
aiModel.startsWith('gpt4_turbo') || aiModel.startsWith('gpt') ||
(aiModel == 'reverse_proxy' && ( (aiModel == 'reverse_proxy' && (
db.proxyRequestModel?.startsWith('gpt4_turbo') || db.proxyRequestModel?.startsWith('gpt') ||
(db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt-4-turbo')) (db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt'))
)))){ )))){
// @ts-ignore // @ts-ignore
delete body.logit_bias delete body.logit_bias

5
src/ts/tokenizer.ts
View File

@@ -35,6 +35,11 @@ export async function encode(data:string):Promise<(number[]|Uint32Array|Int32Arr
case 'llama3': case 'llama3':
return await tokenizeWebTokenizers(data, 'llama') return await tokenizeWebTokenizers(data, 'llama')
default: default:
// Add exception for gpt-4o tokenizers on reverse_proxy
if(db.proxyRequestModel?.startsWith('gpt4o') ||
(db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt-4o'))) {
return await tikJS(data, 'o200k_base')
}
return await tikJS(data) return await tikJS(data)
} }
} }