diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 5b8540e0..16ed3a84 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -23,6 +23,7 @@ import { alertConfirm } from "src/ts/alert"; import OobaSettings from "./OobaSettings.svelte"; import Arcodion from "src/lib/UI/Arcodion.svelte"; + import { startsWith } from "lodash"; let tokens = { mainPrompt: 0, @@ -198,6 +199,10 @@ {/if} +{#if $DataBase.aiModel.startsWith('risullm')} + Risu {language.apiKey} + +{/if} {#if $DataBase.aiModel === 'openrouter' || $DataBase.subModel === 'openrouter'} Openrouter Key diff --git a/src/lib/UI/ModelList.svelte b/src/lib/UI/ModelList.svelte index 1955cc17..55f52e18 100644 --- a/src/lib/UI/ModelList.svelte +++ b/src/lib/UI/ModelList.svelte @@ -129,13 +129,13 @@ {/each} {/await} - {#if showUnrec} + {/if} {#if $DataBase.plugins.length > 0} diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index b270b218..4784b8b2 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -1439,6 +1439,48 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' 'result': result } } + case 'risullm-proto':{ + const res = await globalFetch('https://sv.risuai.xyz/risullm', { + body: { + messages: formated.map((v) => { + if(v.role === 'system'){ + return { + role: "user", + content: "System: " + v.content + } + } + if(v.role === 'function'){ + return { + role: "user", + content: "Function: " + v.content + + } + } + return { + role: v.role, + content: v.content + } + }) + }, + headers: { + "X-Api-Key": db.proxyKey + } + }) + + const resp:string = res?.data?.response + + if(!resp){ + return { + type: 'fail', + result: JSON.stringify(res.data) + } + } + + return { + type: 'success', + result: resp.replace(/\\n/g, '\n') + } + } default:{ if(raiModel.startsWith('claude-3')){ let replacerURL = (aiModel === 'reverse_proxy') ? (db.forceReplaceUrl) : ('https://api.anthropic.com/v1/messages')