From dc65a386f279bd471d0963c0c95ec230afafc2ca Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 23 Sep 2023 16:24:57 +0900 Subject: [PATCH] [feat] custom proxy requst model --- src/lib/Setting/Pages/BotSettings.svelte | 8 +++++++- src/ts/process/request.ts | 6 +++++- src/ts/storage/database.ts | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 7d73fdb3..eabe2e37 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -135,7 +135,7 @@ {language.proxyAPIKey} {language.proxyRequestModel} - + None GPT 3.5 GPT 3.5 16k @@ -151,7 +151,13 @@ claude-v1.2 claude-instant-v1.1 claude-instant-v1.1-100k + Custom + {#if $DataBase.proxyRequestModel === 'custom'} + + {:else} +
+ {/if} {/if} {#if $DataBase.aiModel === 'openrouter' || $DataBase.subModel === 'openrouter'} Openrouter Key diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index 5414e0a1..7fd933bd 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -168,7 +168,11 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' const oaiFunctionCall = oaiFunctions ? (arg.useEmotion ? {"name": "set_emotion"} : "auto") : undefined - const requestModel = (aiModel === 'reverse_proxy' || aiModel === 'openrouter') ? db.proxyRequestModel : aiModel + let requestModel = (aiModel === 'reverse_proxy' || aiModel === 'openrouter') ? db.proxyRequestModel : aiModel + + if(aiModel === 'reverse_proxy' && db.proxyRequestModel === 'custom'){ + requestModel = db.customProxyRequestModel + } const body = ({ model: aiModel === 'openrouter' ? db.openrouterRequestModel : requestModel === 'gpt35' ? 'gpt-3.5-turbo' diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 6a51637d..d08d1f04 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -316,6 +316,7 @@ export function setDatabase(data:Database){ data.NAIsettings.mirostat_tau ??= 0 data.NAIsettings.mirostat_lr ??= 1 data.autofillRequestUrl ??= true + data.customProxyRequestModel ??= '' changeLanguage(data.language) DataBase.set(data) }