mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat] added simple settings

Browse Source
This commit is contained in:
kwaroran
2023-05-29 05:51:00 +09:00
parent c1c767cd05
commit 3102e09cd5
5 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/en.ts
View File

@@ -282,5 +282,7 @@ export const languageEnglish = {
sendWithEnter: "Send with Enter Key", sendWithEnter: "Send with Enter Key",
clickToEdit: "Click Text to Edit", clickToEdit: "Click Text to Edit",
setNodePassword: "Set your password to security", setNodePassword: "Set your password to security",
inputNodePassword: "Input your password. if you can't remember, remove save/__password.txt in your server files and restart the server." inputNodePassword: "Input your password. if you can't remember, remove save/__password.txt in your server files and restart the server.",
simple:"Simple",
advanced: "Advanced"
} }

81
src/lib/Setting/Pages/BotSettings.svelte
View File

@@ -9,6 +9,7 @@
import ModelList from "src/lib/UI/ModelList.svelte"; import ModelList from "src/lib/UI/ModelList.svelte";
import DropList from "src/lib/SideBars/DropList.svelte"; import DropList from "src/lib/SideBars/DropList.svelte";
import { PlusIcon, TrashIcon } from "lucide-svelte"; import { PlusIcon, TrashIcon } from "lucide-svelte";
import { onDestroy } from "svelte";
let tokens = { let tokens = {
mainPrompt: 0, mainPrompt: 0,
jailbreak: 0, jailbreak: 0,
@@ -32,15 +33,59 @@
tokens.globalNote = await tokenize($DataBase.globalNote) tokens.globalNote = await tokenize($DataBase.globalNote)
} }
let advancedBotSettings = false
const unsub = DataBase.subscribe(db => {
if(db.advancedBotSettings !== advancedBotSettings){
advancedBotSettings = db.advancedBotSettings
}
})
onDestroy(() => {
unsub()
})
$: loadTokenize() $: loadTokenize()
</script> </script>
<h2 class="mb-2 text-2xl font-bold mt-2">{language.chatBot}</h2> <h2 class="mb-2 text-2xl font-bold mt-2">{language.chatBot}</h2>
<span class="text-neutral-200 mt-4">{language.model} <Help key="model"/></span> <div class="flex w-full mb-4">
<ModelList bind:value={$DataBase.aiModel}/> <button on:click={() => {
<span class="text-neutral-200 mt-2">{language.submodel} <Help key="submodel"/></span> $DataBase.advancedBotSettings = false
<ModelList bind:value={$DataBase.subModel}/> }} class="flex-1 border-solid p-2 flex justify-center cursor-pointer rounded-l-lg bg-darkbg" class:bg-selected={!$DataBase.advancedBotSettings}>
<span>{language.simple}</span>
</button>
<button on:click={() => {
$DataBase.advancedBotSettings = true
}} class="flex-1 border-solid border-l-transparent p-2 flex justify-center cursor-pointer rounded-r-lg bg-darkbg" class:bg-selected={$DataBase.advancedBotSettings}>
<span>{language.advanced}</span>
</button>
</div>
{#if advancedBotSettings}
<span class="text-neutral-200 mt-4">{language.model} <Help key="model"/></span>
<ModelList bind:value={$DataBase.aiModel}/>
<span class="text-neutral-200 mt-2">{language.submodel} <Help key="submodel"/></span>
<ModelList bind:value={$DataBase.subModel}/>
{:else}
<span class="text-neutral-200 mt-4">{language.model} <Help key="model"/></span>
<ModelList bind:value={$DataBase.aiModel} onChange={(v) => {
$DataBase.subModel = v
if(v.startsWith('gpt') || v.startsWith('palm2')){
$DataBase.maxContext = 4000
$DataBase.maxResponse = 500
}
else{
$DataBase.maxContext = 1500
$DataBase.maxResponse = 200
if(v.startsWith('horde')){
$DataBase.maxResponse = 100
}
}
}}/>
{/if}
{#if $DataBase.aiModel === 'palm2' || $DataBase.subModel === 'palm2'} {#if $DataBase.aiModel === 'palm2' || $DataBase.subModel === 'palm2'}
<span class="text-neutral-200">Palm2 {language.apiKey}</span> <span class="text-neutral-200">Palm2 {language.apiKey}</span>
@@ -89,18 +134,18 @@
<span class="text-draculared text-xs mb-2">You are using web version. you must use ngrok or other tunnels to use your local webui.</span> <span class="text-draculared text-xs mb-2">You are using web version. you must use ngrok or other tunnels to use your local webui.</span>
{/if} {/if}
{/if} {/if}
<span class="text-neutral-200">{language.mainPrompt} <Help key="mainprompt"/></span> {#if advancedBotSettings}
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.mainPrompt}></textarea> <span class="text-neutral-200">{language.mainPrompt} <Help key="mainprompt"/></span>
<span class="text-gray-400 mb-6 text-sm">{tokens.mainPrompt} {language.tokens}</span> <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.mainPrompt}></textarea>
<span class="text-neutral-200">{language.jailbreakPrompt} <Help key="jailbreak"/></span> <span class="text-gray-400 mb-6 text-sm">{tokens.mainPrompt} {language.tokens}</span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.jailbreak}></textarea> <span class="text-neutral-200">{language.jailbreakPrompt} <Help key="jailbreak"/></span>
<span class="text-gray-400 mb-6 text-sm">{tokens.jailbreak} {language.tokens}</span> <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.jailbreak}></textarea>
<span class="text-neutral-200">{language.globalNote} <Help key="globalNote"/></span> <span class="text-gray-400 mb-6 text-sm">{tokens.jailbreak} {language.tokens}</span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.globalNote}></textarea> <span class="text-neutral-200">{language.globalNote} <Help key="globalNote"/></span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.globalNote}></textarea>
<span class="text-gray-400 mb-6 text-sm">{tokens.globalNote} {language.tokens}</span>
<span class="text-neutral-200">{language.maxContextSize}</span>
<span class="text-gray-400 mb-6 text-sm">{tokens.globalNote} {language.tokens}</span>
<span class="text-neutral-200">{language.maxContextSize}</span>
{#if $DataBase.aiModel === 'gpt35'} {#if $DataBase.aiModel === 'gpt35'}
<input class="text-neutral-200 mb-4 text-sm p-2 bg-transparent input-text focus:bg-selected" type="number" min={0} max="4000" bind:value={$DataBase.maxContext}> <input class="text-neutral-200 mb-4 text-sm p-2 bg-transparent input-text focus:bg-selected" type="number" min={0} max="4000" bind:value={$DataBase.maxContext}>
{:else if $DataBase.aiModel === 'gpt4' || $DataBase.aiModel === 'textgen_webui'} {:else if $DataBase.aiModel === 'gpt4' || $DataBase.aiModel === 'textgen_webui'}
@@ -126,11 +171,11 @@
<input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl} placeholder="Leave blank to not replace url"> <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl} placeholder="Leave blank to not replace url">
<span class="text-neutral-200 mt-2">{language.submodel} {language.forceReplaceUrl} <Help key="forceUrl"/></span> <span class="text-neutral-200 mt-2">{language.submodel} {language.forceReplaceUrl} <Help key="forceUrl"/></span>
<input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl2} placeholder="Leave blank to not replace url"> <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl2} placeholder="Leave blank to not replace url">
{/if}
<details class="mt-4"> {#if advancedBotSettings}
<summary class="mb-2">{language.advancedSettings}</summary>
<span class="text-neutral-200 mb-2 mt-4">{language.formatingOrder} <Help key="formatOrder"/></span> <span class="text-neutral-200 mb-2 mt-4">{language.formatingOrder} <Help key="formatOrder"/></span>
<DropList bind:list={$DataBase.formatingOrder} /> <DropList bind:list={$DataBase.formatingOrder} />
<span class="text-neutral-200 mt-2">Bias <Help key="bias"/></span> <span class="text-neutral-200 mt-2">Bias <Help key="bias"/></span>
@@ -170,7 +215,7 @@
<Check bind:check={$DataBase.promptPreprocess}/> <Check bind:check={$DataBase.promptPreprocess}/>
<span>{language.promptPreprocess}</span> <span>{language.promptPreprocess}</span>
</div> </div>
</details>
<button on:click={() => {openPresetList = true}} class="mt-4 drop-shadow-lg p-3 border-borderc border-solid flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected">{language.presets}</button> <button on:click={() => {openPresetList = true}} class="mt-4 drop-shadow-lg p-3 border-borderc border-solid flex justify-center items-center ml-2 mr-2 border-1 hover:bg-selected">{language.presets}</button>
{/if}

6
src/lib/UI/ModelList.svelte
View File

@@ -1,10 +1,11 @@
<script lang="ts"> <script lang="ts">
import { DataBase } from "src/ts/storage/database"; import { DataBase } from "src/ts/storage/database";
import { getHordeModels } from "src/ts/horde/getModels"; import { getHordeModels } from "src/ts/horde/getModels";
import Arcodion from "./Arcodion.svelte"; import Arcodion from "./Arcodion.svelte";
import { language } from "src/lang"; import { language } from "src/lang";
export let value = "" export let value = ""
export let onChange: (v:string) => void = (v) => {}
let openOptions = false let openOptions = false
function getModelName(name:string){ function getModelName(name:string){
@@ -34,6 +35,7 @@
function changeModel(name:string){ function changeModel(name:string){
value = name value = name
openOptions = false openOptions = false
onChange(name)
} }
</script> </script>

7
src/ts/process/request.ts
View File

@@ -238,7 +238,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
if(isNewAPI){ if(isNewAPI){
bodyTemplate = { bodyTemplate = {
'max_new_tokens': 80, 'max_new_tokens': db.maxResponse,
'do_sample': true, 'do_sample': true,
'temperature': (db.temperature / 100), 'temperature': (db.temperature / 100),
'top_p': 0.9, 'top_p': 0.9,
@@ -458,6 +458,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
const realModel = aiModel.split(":::")[1] const realModel = aiModel.split(":::")[1]
console.log(realModel)
const argument = { const argument = {
"prompt": proompt, "prompt": proompt,
"params": { "params": {
@@ -472,7 +473,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
"rep_pen_range": 0, "rep_pen_range": 0,
"rep_pen_slope": 10, "rep_pen_slope": 10,
"singleline": false, "singleline": false,
"temperature": db.temperature / 25, "temperature": db.temperature / 100,
"tfs": 1, "tfs": 1,
"top_a": 1, "top_a": 1,
"top_k": 100, "top_k": 100,
@@ -486,7 +487,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
"slow_workers": true, "slow_workers": true,
"worker_blacklist": false, "worker_blacklist": false,
"dry_run": false, "dry_run": false,
"models": [realModel] "models": [realModel, realModel.trim(), ' ' + realModel, realModel + ' ']
} }
const da = await fetch("https://stablehorde.net/api/v2/generate/text/async", { const da = await fetch("https://stablehorde.net/api/v2/generate/text/async", {

2
src/ts/storage/database.ts
View File

@@ -488,7 +488,7 @@ export interface Database{
sendWithEnter:boolean sendWithEnter:boolean
clickToEdit: boolean clickToEdit: boolean
koboldURL:string koboldURL:string
advancedBotSettings:boolean
} }
interface hordeConfig{ interface hordeConfig{