From 73fda3bb937844f3ac246072cc50d5473e7f67f9 Mon Sep 17 00:00:00 2001 From: IHaBiS02 Date: Tue, 14 May 2024 05:48:14 +0900 Subject: [PATCH 1/4] Make exception on gpt based models from removing logit_bias --- src/ts/process/request.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index 63261528..da951040 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -497,10 +497,10 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' // inlay models doesn't support logit_bias // gpt-4-turbo supports both logit_bias and inlay image if(!( - aiModel.startsWith('gpt4_turbo') || + aiModel.startsWith('gpt4') || (aiModel == 'reverse_proxy' && ( - db.proxyRequestModel?.startsWith('gpt4_turbo') || - (db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt-4-turbo')) + db.proxyRequestModel?.startsWith('gpt') || + (db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt')) )))){ // @ts-ignore delete body.logit_bias From 2d71037e9b351d19253a18c86e2dc888c9172dce Mon Sep 17 00:00:00 2001 From: IHaBiS02 Date: Tue, 14 May 2024 05:48:35 +0900 Subject: [PATCH 2/4] Fix some detail --- src/ts/process/request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index da951040..b3ca16b2 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -497,7 +497,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' // inlay models doesn't support logit_bias // gpt-4-turbo supports both logit_bias and inlay image if(!( - aiModel.startsWith('gpt4') || + aiModel.startsWith('gpt') || (aiModel == 'reverse_proxy' && ( db.proxyRequestModel?.startsWith('gpt') || (db.proxyRequestModel === 'custom' && db.customProxyRequestModel.startsWith('gpt')) From 4595a36adfc43302d0c63df2add35a605096c00c Mon Sep 17 00:00:00 2001 From: IHaBiS02 Date: Tue, 14 May 2024 05:49:35 +0900 Subject: [PATCH 3/4] Fix comments --- src/ts/process/request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index b3ca16b2..2ca0198b 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -495,7 +495,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' if(supportsInlayImage()){ // 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(!( aiModel.startsWith('gpt') || (aiModel == 'reverse_proxy' && ( From 1aade242ec9904764f009e83bd3f19e27ab95735 Mon Sep 17 00:00:00 2001 From: IHaBiS02 Date: Tue, 14 May 2024 06:30:36 +0900 Subject: [PATCH 4/4] Add supports of gpt-4o tokenizer for reverse_proxy --- src/ts/tokenizer.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ts/tokenizer.ts b/src/ts/tokenizer.ts index f2d26313..ca38b90d 100644 --- a/src/ts/tokenizer.ts +++ b/src/ts/tokenizer.ts @@ -35,6 +35,11 @@ export async function encode(data:string):Promise<(number[]|Uint32Array|Int32Arr case 'llama3': return await tokenizeWebTokenizers(data, 'llama') 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) } }