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

Add request related triggers

Browse Source
This commit is contained in:
Kwaroran
2025-02-16 02:55:27 +09:00
parent ed142bc06a
commit 1b1d43cf1b
5 changed files with 287 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
import type { MultiModal, OpenAIChat, OpenAIChatFull } from "./index.svelte";
import { getCurrentCharacter, getDatabase, setDatabase, type character } from "../storage/database.svelte";
import { getCurrentCharacter, getCurrentChat, getDatabase, setDatabase, type character } from "../storage/database.svelte";
import { pluginProcess, pluginV2 } from "../plugins/plugins";
import { language } from "../../lang";
import { stringlizeAINChat, getStopStrings, unstringlizeAIN, unstringlizeChat } from "./stringlize";
@@ -21,6 +21,7 @@ import { applyChatTemplate } from "./templates/chatTemplate";
import { OobaParams } from "./prompt";
import { extractJSON, getGeneralJSONSchema, getOpenAIJSONSchema } from "./templates/jsonSchema";
import { getModelInfo, LLMFlags, LLMFormat, type LLMModel } from "../model/modellist";
import { runTrigger } from "./triggers";
@@ -243,6 +244,29 @@ export async function requestChatData(arg:requestDataArgument, model:ModelModeEx
arg.formated = await replacer(arg.formated, model)
}
}
try{
const currentChar = getCurrentCharacter()
if(currentChar.type !== 'group'){
const perf = performance.now()
const d = await runTrigger(currentChar, 'request', {
chat: getCurrentChat(),
displayMode: true,
displayData: JSON.stringify(arg.formated)
})
const got = JSON.parse(d.displayData)
if(!got || !Array.isArray(got)){
throw new Error('Invalid return')
}
arg.formated = got
console.log('Trigger time', performance.now() - perf)
}
}
catch(e){
console.error(e)
}
const da = await requestChatDataMain(arg, model, abortSignal)

126
src/ts/process/triggers.ts
View File

@@ -9,7 +9,7 @@ import { parseKeyValue, sleep } from "../util";
import { alertError, alertInput, alertNormal, alertSelect } from "../alert";
import type { OpenAIChat } from "./index.svelte";
import { HypaProcesser } from "./memory/hypamemory";
import { requestChatData } from "./request";
import { requestChatData, type OpenAIChatExtra } from "./request";
import { generateAIImage } from "./stableDiff";
import { writeInlayImage } from "./files/inlays";
import { runLua } from "./lua";
@@ -17,7 +17,7 @@ import { runLua } from "./lua";
export interface triggerscript{
comment: string;
type: 'start'|'manual'|'output'|'input'|'display'
type: 'start'|'manual'|'output'|'input'|'display'|'request'
conditions: triggerCondition[]
effect:triggerEffect[]
lowLevelAccess?: boolean
@@ -37,7 +37,8 @@ export type triggerEffectV2 = triggerV2Header|triggerV2IfVar|triggerV2Else|tri
triggerV2SetCharacterDesc|triggerV2MakeArrayVar|triggerV2GetArrayVarLength|triggerV2GetArrayVar|triggerV2SetArrayVar|
triggerV2PushArrayVar|triggerV2PopArrayVar|triggerV2ShiftArrayVar|triggerV2UnshiftArrayVar|triggerV2SpliceArrayVar|triggerV2GetFirstMessage|
triggerV2SliceArrayVar|triggerV2GetIndexOfValueInArrayVar|triggerV2RemoveIndexFromArrayVar|triggerV2ConcatString|triggerV2GetLastUserMessage|
triggerV2GetLastCharMessage|triggerV2GetAlertInput|triggerV2GetDisplayState|triggerV2SetDisplayState|triggerV2UpdateGUI|triggerV2Wait
triggerV2GetLastCharMessage|triggerV2GetAlertInput|triggerV2GetDisplayState|triggerV2SetDisplayState|triggerV2UpdateGUI|triggerV2Wait|
triggerV2GetRequestState|triggerV2SetRequestState|triggerV2GetRequestStateRole|triggerV2SetRequestStateRole|triggerV2GetReuqestStateLength
export type triggerConditionsVar = {
type:'var'|'value'
@@ -95,7 +96,7 @@ export interface triggerEffectImpersonate{
value:string
}
type triggerMode = 'start'|'manual'|'output'|'input'|'display'
type triggerMode = 'start'|'manual'|'output'|'input'|'display'|'request'
export interface triggerEffectCommand{
type: 'command',
@@ -625,6 +626,46 @@ export type triggerV2SetDisplayState = {
indent: number
}
export type triggerV2GetRequestState = {
type: 'v2GetRequestState',
outputVar: string,
index: string,
indexType: 'var'|'value',
indent: number
}
export type triggerV2GetRequestStateRole = {
type: 'v2GetRequestStateRole',
outputVar: string,
index: string,
indexType: 'var'|'value',
indent: number
}
export type triggerV2SetRequestState = {
type: 'v2SetRequestState',
value: string,
valueType: 'var'|'value',
index: string,
indexType: 'var'|'value',
indent: number
}
export type triggerV2SetRequestStateRole = {
type: 'v2SetRequestStateRole',
value: string,
valueType: 'var'|'value',
index: string,
indexType: 'var'|'value',
indent: number
}
export type triggerV2GetReuqestStateLength = {
type: 'v2GetRequestStateLength',
outputVar: string,
indent: number
}
export type triggerV2UpdateGUI = {
type: 'v2UpdateGUI',
indent: number
@@ -637,9 +678,7 @@ export type triggerV2Wait = {
indent: number
}
export const displayAllowList = [
'v2GetDisplayState',
'v2SetDisplayState',
const safeSubset = [
'v2SetVar',
'v2If',
'v2Else',
@@ -671,6 +710,21 @@ export const displayAllowList = [
'v2RemoveIndexFromArrayVar'
]
export const displayAllowList = [
'v2GetDisplayState',
'v2SetDisplayState',
...safeSubset
]
export const requestAllowList = [
'v2GetRequestState',
'v2SetRequestState',
'v2GetRequestStateRole',
'v2SetRequestStateRole',
'v2GetRequestStateLength',
...safeSubset
]
export async function runTrigger(char:character,mode:triggerMode, arg:{
chat: Chat,
recursiveCount?: number
@@ -838,7 +892,10 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
for(let index = 0; index < trigger.effect.length; index++){
const effect = trigger.effect[index]
if(arg.displayMode && !displayAllowList.includes(effect.type)){
if(mode === 'display' && !displayAllowList.includes(effect.type)){
continue
}
if(mode === 'request' && !requestAllowList.includes(effect.type)){
continue
}
switch(effect.type){
@@ -1704,6 +1761,59 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
await sleep(value * 1000)
break
}
case 'v2GetRequestState':{
if(!arg.displayMode){
return
}
const json = JSON.parse(arg.displayData) as OpenAIChat[]
const index = effect.indexType === 'value' ? Number(risuChatParser(effect.index,{chara:char})) : Number(getVar(risuChatParser(effect.index,{chara:char})))
const content = json?.[index]?.content ?? 'null'
setVar(effect.outputVar, content)
break
}
case 'v2SetRequestState':{
if(!arg.displayMode){
return
}
const json = JSON.parse(arg.displayData) as OpenAIChat[]
const index = effect.indexType === 'value' ? Number(risuChatParser(effect.index,{chara:char})) : Number(getVar(risuChatParser(effect.index,{chara:char})))
const value = effect.valueType === 'value' ? risuChatParser(effect.value,{chara:char}) : getVar(risuChatParser(effect.value,{chara:char}))
json[index].content = value
arg.displayData = JSON.stringify(json)
break
}
case 'v2GetRequestStateRole':{
if(!arg.displayMode){
return
}
const json = JSON.parse(arg.displayData) as OpenAIChat[]
const index = effect.indexType === 'value' ? Number(risuChatParser(effect.index,{chara:char})) : Number(getVar(risuChatParser(effect.index,{chara:char})))
const content = json?.[index]?.role ?? 'null'
setVar(effect.outputVar, content)
break
}
case 'v2SetRequestStateRole':{
if(!arg.displayMode){
return
}
const json = JSON.parse(arg.displayData) as OpenAIChat[]
const index = effect.indexType === 'value' ? Number(risuChatParser(effect.index,{chara:char})) : Number(getVar(risuChatParser(effect.index,{chara:char})))
const value = effect.valueType === 'value' ? risuChatParser(effect.value,{chara:char}) : getVar(risuChatParser(effect.value,{chara:char}))
if(value === 'user' || value === 'assistant' || value === 'system'){
json[index].role = value
}
arg.displayData = JSON.stringify(json)
break
}
case 'v2GetRequestStateLength':{
if(!arg.displayMode){
return
}
const json = JSON.parse(arg.displayData) as OpenAIChat[]
setVar(effect.outputVar, json.length.toString())
break
}
}
}
}