diff --git a/src/lang/en.ts b/src/lang/en.ts index 1aa89456..35aef29e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -326,4 +326,6 @@ export const languageEnglish = { loadDataFromAccount: "Load Data from Account", saveCurrentDataToAccount: "Save Current Data to Account", chatAssumed: "Approximately {} Chats Played", + proxyAPIKey: "Proxy Key/Password", + proxyRequestModel: "Rroxy Request Model" } \ No newline at end of file diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte index af656373..b5ff5c98 100644 --- a/src/lib/Others/AlertComp.svelte +++ b/src/lib/Others/AlertComp.svelte @@ -6,7 +6,7 @@ import { ParseMarkdown } from '../../ts/parser'; import BarIcon from '../SideBars/BarIcon.svelte'; import { User } from 'lucide-svelte'; - import { hubURL } from 'src/ts/characterCards'; + import { hubURL } from 'src/ts/characterCards'; let btn let input = '' diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 5b3ddb6a..455e58ad 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -103,13 +103,32 @@ Claude {language.apiKey} {/if} -{#if $DataBase.aiModel.startsWith('gpt')} +{#if $DataBase.aiModel === 'reverse_proxy' || $DataBase.subModel === 'reverse_proxy'} + {language.forceReplaceUrl} URL + + {language.proxyAPIKey} + + {language.proxyRequestModel} + +{/if} +{#if $DataBase.aiModel.startsWith('gpt') || $DataBase.subModel.startsWith('gpt')} OpenAI {language.apiKey} +{/if} +{#if $DataBase.aiModel.startsWith('gpt') || $DataBase.aiModel === 'reverse_proxy'}
- +
{/if} + {#if $DataBase.aiModel === 'custom'} {language.plugin} {($DataBase.PresensePenalty / 100).toFixed(2)} -{language.forceReplaceUrl} - -{language.submodel} {language.forceReplaceUrl} - {language.autoSuggest} {tokens.autoSuggest} {language.tokens} diff --git a/src/lib/UI/ModelList.svelte b/src/lib/UI/ModelList.svelte index 39daa0c4..6a8aea73 100644 --- a/src/lib/UI/ModelList.svelte +++ b/src/lib/UI/ModelList.svelte @@ -46,6 +46,8 @@ return "NovelList SuperTrin" case "novellist damsel": return "NovelList Damsel" + case 'reverse_proxy': + return "Reverse Proxy" default: if(name.startsWith("horde:::")){ return name.replace(":::", " ") @@ -100,6 +102,7 @@ {/if} + diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index e07e2adf..feeed1f2 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -87,9 +87,8 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' let temperature = arg.temperature ?? (db.temperature / 100) let bias = arg.bias let currentChar = arg.currentChar - const replacer = model === 'model' ? db.forceReplaceUrl : db.forceReplaceUrl2 const aiModel = model === 'model' ? db.aiModel : db.subModel - + const replacer = aiModel === 'reverse_proxy' ? model === 'model' ? db.forceReplaceUrl : db.forceReplaceUrl2 : '' switch(aiModel){ case 'gpt35': case 'gpt35_0613': @@ -100,8 +99,8 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' case 'gpt4_0613': case 'gpt4_32k_0613': case 'gpt35_0301': - case 'gpt4_0301':{ - + case 'gpt4_0301': + case 'reverse_proxy':{ for(let i=0;i