[feat] added template setting

2023-12-24 20:02:15 +09:00
parent cee8899e36
commit a3b90e8b86
6 changed files with 142 additions and 50 deletions
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -465,5 +465,12 @@ export const languageEnglish = {
    newOAIHandle: "New OpenAI Handling",
    oaiRandomUser: "Put OAI Random User",
    inlayImage: "Inlay Image Feature",
-    nativeAutomark: "Experimental Native Automark"
+    nativeAutomark: "Experimental Native Automark",
+    assistantPrefill: "Assistant Prefill",
+    postEndInnerFormat: "Post End",
+    sendChatAsSystem: "Send Chat as System",
+    sendName: "Send Name",
+    utilOverride: "Utility Override",
+    template: "Template",
+
 }
--- a/src/lang/ko.ts
+++ b/src/lang/ko.ts
@@ -417,4 +417,5 @@ export const languageKorean = {
    nativeAutomark: "실험적 네이티브 오토마크 사용",
    additionalAssets:"추가 에셋",
    genTimes: "생성 횟수",
+    template: "템플릿",
 }
--- a/src/lib/Setting/Pages/PromptSettings.svelte
+++ b/src/lib/Setting/Pages/PromptSettings.svelte
@@ -5,6 +5,8 @@
    import { tokenizePreset, type Proompt } from "src/ts/process/proompt";
    import { templateCheck } from "src/ts/process/templates/templateCheck";
    import { DataBase } from "src/ts/storage/database";
+    import Check from "src/lib/UI/GUI/CheckInput.svelte";
+  import TextInput from "src/lib/UI/GUI/TextInput.svelte";

    let sorted = 0
    let opened = 0
@@ -13,6 +15,7 @@
    let tokens = 0
    let extokens = 0
    executeTokenize($DataBase.promptTemplate)
+    let subMenu = 0

    async function executeTokenize(prest: Proompt[]){
        tokens = await tokenizePreset(prest, true)
@@ -29,6 +32,18 @@
    </button>
    {language.promptTemplate}
 </h2>
+<div class="flex w-full rounded-md border border-selected">
+    <button on:click={() => {
+        subMenu = 0
+    }} class="p-2 flex-1" class:bg-selected={subMenu === 0}>
+        <span>{language.template}</span>
+    </button>
+    <button on:click={() => {
+        subMenu = 1
+    }} class="p-2 flex-1" class:bg-selected={subMenu === 1}>
+        <span>{language.settings}</span>
+    </button>
+</div>
 {#if warns.length > 0}
    <div class="text-red-500 flex flex-col items-start p-2 rounded-md border-red-500 border">
        <h2 class="text-xl font-bold">Warning</h2>
@@ -38,49 +53,62 @@
        {/each}
    </div>
 {/if}
-<div class="contain w-full max-w-full mt-4 flex flex-col p-3 rounded-md">
-    {#if $DataBase.promptTemplate.length === 0}
-            <div class="text-textcolor2">No Format</div>
-    {/if}
-    {#key sorted}
-        {#each $DataBase.promptTemplate as proompt, i}
-            <ProomptItem bind:proompt={proompt} onRemove={() => {
-                let templates = $DataBase.promptTemplate
-                templates.splice(i, 1)
-                $DataBase.promptTemplate = templates
-            }} moveDown={() => {
-                if(i === $DataBase.promptTemplate.length - 1){
-                    return
-                }
-                let templates = $DataBase.promptTemplate
-                let temp = templates[i]
-                templates[i] = templates[i + 1]
-                templates[i + 1] = temp
-                $DataBase.promptTemplate = templates
-            }} moveUp={() => {
-                if(i === 0){
-                    return
-                }
-                let templates = $DataBase.promptTemplate
-                let temp = templates[i]
-                templates[i] = templates[i - 1]
-                templates[i - 1] = temp
-                $DataBase.promptTemplate = templates
-            }} />
-        {/each}
-    {/key}
-</div>

-<button class="font-medium cursor-pointer hover:text-green-500" on:click={() => {
-    let value = $DataBase.promptTemplate ?? []
-    value.push({
-        type: "plain",
-        text: "",
-        role: "bot",
-        type2: 'normal'
-    })
-    $DataBase.promptTemplate = value
-}}><PlusIcon /></button>
+{#if subMenu === 0}
+    <div class="contain w-full max-w-full mt-4 flex flex-col p-3 rounded-md">
+        {#if $DataBase.promptTemplate.length === 0}
+                <div class="text-textcolor2">No Format</div>
+        {/if}
+        {#key sorted}
+            {#each $DataBase.promptTemplate as proompt, i}
+                <ProomptItem bind:proompt={proompt} onRemove={() => {
+                    let templates = $DataBase.promptTemplate
+                    templates.splice(i, 1)
+                    $DataBase.promptTemplate = templates
+                }} moveDown={() => {
+                    if(i === $DataBase.promptTemplate.length - 1){
+                        return
+                    }
+                    let templates = $DataBase.promptTemplate
+                    let temp = templates[i]
+                    templates[i] = templates[i + 1]
+                    templates[i + 1] = temp
+                    $DataBase.promptTemplate = templates
+                }} moveUp={() => {
+                    if(i === 0){
+                        return
+                    }
+                    let templates = $DataBase.promptTemplate
+                    let temp = templates[i]
+                    templates[i] = templates[i - 1]
+                    templates[i - 1] = temp
+                    $DataBase.promptTemplate = templates
+                }} />
+            {/each}
+        {/key}
+    </div>

-<span class="text-textcolor2 text-sm mt-2">{tokens} {language.fixedTokens}</span>
-<span class="text-textcolor2 mb-6 text-sm mt-2">{extokens} {language.exactTokens}</span>
+    <button class="font-medium cursor-pointer hover:text-green-500" on:click={() => {
+        let value = $DataBase.promptTemplate ?? []
+        value.push({
+            type: "plain",
+            text: "",
+            role: "system",
+            type2: 'normal'
+        })
+        $DataBase.promptTemplate = value
+    }}><PlusIcon /></button>
+
+    <span class="text-textcolor2 text-sm mt-2">{tokens} {language.fixedTokens}</span>
+    <span class="text-textcolor2 mb-6 text-sm mt-2">{extokens} {language.exactTokens}</span>
+{:else}
+
+    <!-- <span class="text-textcolor mt-4">{language.assistantPrefill}</span>
+    <TextInput bind:value={$DataBase.proomptSettings.assistantPrefill}/> -->
+    <span class="text-textcolor mt-4">{language.postEndInnerFormat}</span>
+    <TextInput bind:value={$DataBase.proomptSettings.postEndInnerFormat}/>
+
+    <Check bind:check={$DataBase.proomptSettings.sendChatAsSystem} name={language.sendChatAsSystem} className="mt-4"/>
+    <!-- <Check bind:check={$DataBase.proomptSettings.sendName} name={language.sendName} className="mt-4"/> -->
+    <Check bind:check={$DataBase.proomptSettings.utilOverride} name={language.utilOverride} className="mt-4"/>
+{/if}
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -179,12 +179,13 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
    }

    let promptTemplate = cloneDeep(db.promptTemplate)
+    const usingPromptTemplate = !!promptTemplate
    if(promptTemplate){
        promptTemplate.push({
            type: 'postEverything'
        })
    }
-    if(currentChar.utilityBot){
+    if(currentChar.utilityBot && (!(usingPromptTemplate && db.proomptSettings.utilOverride))){
        promptTemplate = [
            {
              "type": "plain",
@@ -392,6 +393,12 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
                }
                case 'postEverything':{
                    await tokenizeChatArray(unformated.postEverything)
+                    if(usingPromptTemplate && db.proomptSettings.postEndInnerFormat){
+                        await tokenizeChatArray([{
+                            role: 'system',
+                            content: db.proomptSettings.postEndInnerFormat
+                        }])
+                    }
                    break
                }
                case 'plain':
@@ -445,7 +452,11 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
                    if(start >= end){
                        break
                    }
-                    const chats = unformated.chats.slice(start, end)
+                    let chats = unformated.chats.slice(start, end)
+
+                    if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem){
+                        chats = systemizeChat(chats)
+                    }
                    await tokenizeChatArray(chats)
                    break
                }
@@ -729,6 +740,12 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
                }
                case 'postEverything':{
                    pushPrompts(unformated.postEverything)
+                    if(usingPromptTemplate && db.proomptSettings.postEndInnerFormat){
+                        pushPrompts([{
+                            role: 'system',
+                            content: db.proomptSettings.postEndInnerFormat
+                        }])
+                    }
                    break
                }
                case 'plain':
@@ -783,7 +800,10 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
                        break
                    }

-                    const chats = unformated.chats.slice(start, end)
+                    let chats = unformated.chats.slice(start, end)
+                    if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem){
+                        chats = systemizeChat(chats)
+                    }
                    pushPrompts(chats)
                    break
                }
@@ -1244,4 +1264,14 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
    }

    return true
+}
+
+function systemizeChat(chat:OpenAIChat[]){
+    for(let i=0;i<chat.length;i++){
+        if(chat[i].role === 'user' || chat[i].role === 'assistant'){
+            chat[i].content = chat[i].role + ': ' + chat[i].content
+            chat[i].role = 'system'
+        }
+    }
+    return chat
 }
--- a/src/ts/process/proompt.ts
+++ b/src/ts/process/proompt.ts
@@ -1,6 +1,14 @@
 import { tokenizeAccurate } from "../tokenizer";

 export type Proompt = ProomptPlain|ProomptTyped|ProomptChat|ProomptAuthorNote;
+export type ProomptType = Proompt['type'];
+export type ProomptSettings = {
+    assistantPrefill: string
+    postEndInnerFormat: string
+    sendChatAsSystem: boolean
+    sendName: boolean
+    utilOverride: boolean
+}

 export interface ProomptPlain {
    type: 'plain'|'jailbreak';
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -10,7 +10,7 @@ import { alertNormal, alertSelect } from '../alert';
 import type { NAISettings } from '../process/models/nai';
 import { prebuiltNAIpresets, prebuiltPresets } from '../process/templates/templates';
 import { defaultColorScheme, type ColorScheme } from '../gui/colorscheme';
-import type { Proompt } from '../process/proompt';
+import type { Proompt, ProomptSettings } from '../process/proompt';
 import type { OobaChatCompletionRequestParams } from '../model/ooba';

 export const DataBase = writable({} as any as Database)
@@ -361,6 +361,14 @@ export function setDatabase(data:Database){
    data.google.accessToken ??= ''
    data.google.projectId ??= ''
    data.genTime ??= 1
+    data.proomptSettings ??= {
+        assistantPrefill: '',
+        postEndInnerFormat: '',
+        sendChatAsSystem: false,
+        sendName: false,
+        utilOverride: false
+    }
+
    changeLanguage(data.language)
    DataBase.set(data)
 }
@@ -563,6 +571,7 @@ export interface Database{
    mistralKey?:string
    chainOfThought?:boolean
    genTime:number
+    proomptSettings: ProomptSettings
 }

 export interface customscript{
@@ -759,6 +768,7 @@ export interface botPreset{
    customProxyRequestModel?: string
    reverseProxyOobaArgs?: OobaChatCompletionRequestParams
    top_p?: number
+    proomptSettings?: ProomptSettings

 }

@@ -1010,7 +1020,8 @@ export function saveCurrentPreset(){
        autoSuggestPrompt: db.autoSuggestPrompt,
        customProxyRequestModel: db.customProxyRequestModel,
        reverseProxyOobaArgs: cloneDeep(db.reverseProxyOobaArgs) ?? null,
-        top_p: db.top_p ?? 1
+        top_p: db.top_p ?? 1,
+        proomptSettings: cloneDeep(db.proomptSettings) ?? null
    }
    db.botPresets = pres
    setDatabase(db)
@@ -1080,6 +1091,13 @@ export function setPreset(db:Database, newPres: botPreset){
        mode: 'instruct'
    }
    db.top_p = newPres.top_p ?? 1
+    db.proomptSettings = cloneDeep(newPres.proomptSettings) ?? {
+        assistantPrefill: '',
+        postEndInnerFormat: '',
+        sendChatAsSystem: false,
+        sendName: false,
+        utilOverride: false
+    }
    return db
 }