From 94642b5c66f187ab8093c32858f2f7463fc2ae2d Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sat, 2 Dec 2023 23:30:52 +0900 Subject: [PATCH] [feat] add modify request chat --- src/ts/plugins/embedscript.ts | 11 ++++++----- src/ts/process/index.ts | 7 +++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ts/plugins/embedscript.ts b/src/ts/plugins/embedscript.ts index 742f2b92..1e831f68 100644 --- a/src/ts/plugins/embedscript.ts +++ b/src/ts/plugins/embedscript.ts @@ -224,9 +224,9 @@ let compCode:{[key:string]:string[]} = {} export async function runCharacterJS(arg:{ code: string|null, - mode: ScriptMode|'onButtonClick' - data: string -}):Promise{ + mode: ScriptMode|'onButtonClick'|'modifyRequestChat' + data: any +}):Promise{ try { if(arg.code === null){ const db = get(DataBase) @@ -238,7 +238,8 @@ export async function runCharacterJS(arg:{ "editoutput": 'editOutput', "editprocess": 'editProcess', "editdisplay": 'editDisplay', - 'onButtonClick': "onButtonClick" + 'onButtonClick': "onButtonClick", + 'modifyRequestChat': 'modifyRequestChat' } as const let runCodes = [...additionalCharaJS, arg.code] @@ -278,7 +279,7 @@ export async function runCharacterJS(arg:{ continue } - r = result.toString() + r = result if(runCode === 'onButtonClick'){ return r diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts index f23ba439..dc46f36d 100644 --- a/src/ts/process/index.ts +++ b/src/ts/process/index.ts @@ -23,6 +23,7 @@ import { getInlayImage, supportsInlayImage } from "../image"; import { getGenerationModelString } from "./models/modelString"; import { sendPeerChar } from "../sync/multiuser"; import { runInlayScreen } from "./inlayScreen"; +import { runCharacterJS } from "../plugins/embedscript"; export interface OpenAIChat{ role: 'system'|'user'|'assistant'|'function' @@ -841,6 +842,12 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n }) } + formated = await runCharacterJS({ + code: null, + mode: 'modifyRequestChat', + data: formated + }) + { //token rechecking let tokens = 0