diff --git a/src/lang/en.ts b/src/lang/en.ts index 567157ba..07fdeb39 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -333,5 +333,6 @@ export const languageEnglish = { officialDiscord: "Official Discord", officialDiscordDesc: "Official Discord to talk about RisuAI", confirmRecommendedPreset: "There is a recommended settings for this model. do you want to change the settings to that? (you can turn off asking in the accessiblity settings)", - toggleConfirmRecommendedPreset: "Ask for recommended setting when model change" + toggleConfirmRecommendedPreset: "Ask for recommended setting when model change", + recommendedPreset: "Set to Recommended Settings" } \ No newline at end of file diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 1732fc7e..67b7f583 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -10,7 +10,7 @@ import DropList from "src/lib/SideBars/DropList.svelte"; import { PlusIcon, TrashIcon } from "lucide-svelte"; import { onDestroy } from "svelte"; - import { setRecommended } from "src/ts/process/templates/getRecomended"; + import { recommendedPresetExist, setRecommended } from "src/ts/process/templates/getRecomended"; let tokens = { mainPrompt: 0, jailbreak: 0, @@ -61,9 +61,7 @@ {#if advancedBotSettings} {language.model} - { - setRecommended(v, 'ask') - }}/> + {language.submodel} @@ -94,6 +92,11 @@ {/if} +{#if advancedBotSettings && recommendedPresetExist($DataBase.aiModel)} +
+ +
+{/if} {#if $DataBase.aiModel === 'palm2' || $DataBase.subModel === 'palm2'} Palm2 {language.apiKey} diff --git a/src/ts/process/templates/getRecomended.ts b/src/ts/process/templates/getRecomended.ts index 749e788d..99b469ed 100644 --- a/src/ts/process/templates/getRecomended.ts +++ b/src/ts/process/templates/getRecomended.ts @@ -6,7 +6,7 @@ import { language } from "src/lang"; export async function setRecommended(model: string, ask:'ask'|'force') { const db = get(DataBase) - if(!(model.startsWith('gpt') || model === 'openrouter' || model === 'reverse_proxy' || model === 'textgen_webui')){ + if(!(recommendedPresetExist(model))){ return } if(ask === 'ask' && db.toggleConfirmRecommendedPreset){ @@ -28,28 +28,37 @@ export async function setRecommended(model: string, ask:'ask'|'force') { pr.mainPrompt = "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}." pr.ooba.formating.userPrefix = "### Instruction: " pr.ooba.formating.assistantPrefix = "### Response: " + break } case 1:{ //Koala pr.mainPrompt = "BEGINNING OF CONVERSATION: Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}." pr.ooba.formating.userPrefix = "USER: " pr.ooba.formating.assistantPrefix = "GPT: " + break } case 2:{ //Vicuna pr.mainPrompt = "BEGINNING OF CONVERSATION: A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}." pr.ooba.formating.userPrefix = "USER: " pr.ooba.formating.assistantPrefix = "ASSISTANT: " pr.ooba.formating.seperator = '' + break } case 3:{ //WizardLM pr.mainPrompt = "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next detailed reply in a fictional roleplay chat between {{user}} and {{char}}." pr.ooba.formating.userPrefix = "USER: " pr.ooba.formating.assistantPrefix = "ASSISTANT: " + break } default:{ pr.mainPrompt = "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}." + break } } setDatabase(setPreset(db, pr)) } +} + +export function recommendedPresetExist(model:string){ + return model.startsWith('gpt') || model === 'openrouter' || model === 'reverse_proxy' || model === 'textgen_webui' } \ No newline at end of file