From 6e56803fd2f4c0092095b3c2c80aed5e0b33e45b Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 24 Dec 2023 22:12:41 +0900 Subject: [PATCH] [feat] send as original role --- src/lang/en.ts | 2 +- src/lib/UI/ProomptItem.svelte | 4 ++++ src/ts/process/index.ts | 4 ++-- src/ts/process/proompt.ts | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index 5f986203..b69d5030 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -472,5 +472,5 @@ export const languageEnglish = { sendName: "Send Name on Non-group Chat", utilOverride: "Utility Override", template: "Template", - + chatAsOriginalOnSystem: "Send as original role" } \ No newline at end of file diff --git a/src/lib/UI/ProomptItem.svelte b/src/lib/UI/ProomptItem.svelte index 624c8205..9c086107 100644 --- a/src/lib/UI/ProomptItem.svelte +++ b/src/lib/UI/ProomptItem.svelte @@ -8,6 +8,7 @@ import CheckInput from "./GUI/CheckInput.svelte"; import { ArrowDown, ArrowUp, XIcon } from "lucide-svelte"; import TextInput from "./GUI/TextInput.svelte"; + import { DataBase } from "src/ts/storage/database"; export let proompt:Proompt export let onRemove:() => void = () => {} export let moveUp:() => void = () => {} @@ -78,6 +79,9 @@ } }} /> {/if} + {#if $DataBase.proomptSettings.sendChatAsSystem} + + {/if} {/if} {#if proompt.type === 'authornote'} {language.defaultPrompt} diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts index af31d05f..7d68702f 100644 --- a/src/ts/process/index.ts +++ b/src/ts/process/index.ts @@ -455,7 +455,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n } let chats = unformated.chats.slice(start, end) - if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem){ + if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem && (!card.chatAsOriginalOnSystem)){ chats = systemizeChat(chats) } await tokenizeChatArray(chats) @@ -809,7 +809,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n } let chats = unformated.chats.slice(start, end) - if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem){ + if(usingPromptTemplate && db.proomptSettings.sendChatAsSystem && (!card.chatAsOriginalOnSystem)){ chats = systemizeChat(chats) } pushPrompts(chats) diff --git a/src/ts/process/proompt.ts b/src/ts/process/proompt.ts index 08eeb667..17d379ce 100644 --- a/src/ts/process/proompt.ts +++ b/src/ts/process/proompt.ts @@ -33,6 +33,7 @@ export interface ProomptChat { type: 'chat'; rangeStart: number; rangeEnd: number|'end'; + chatAsOriginalOnSystem?: boolean; } export async function tokenizePreset(proompts:Proompt[], consti:boolean = false){