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

Merge branch 'kwaroran:main' into main

Browse Source
This commit is contained in:
bangonicdd2
2024-02-08 00:29:24 +09:00
committed by GitHub
parent 6965b92b44 1e900d44ac
commit f6ba77fcb3
13 changed files with 165 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ts/parser.ts
View File

@@ -12,6 +12,7 @@ import { calcString } from './process/infunctions';
import { findCharacterbyId } from './util';
import { getInlayImage } from './image';
import { autoMarkNew } from './plugins/automark';
import { getModuleLorebooks } from './process/modules';
const mconverted = new Marked({
gfm: true,
@@ -490,8 +491,7 @@ const matcher = (p1:string,matcherArg:matcherArg) => {
const chat = selchar.chats[selchar.chatPage]
const characterLore = (achara.type === 'group') ? [] : (achara.globalLore ?? [])
const chatLore = chat.localLore ?? []
const globalLore = db.loreBook[db.loreBookPage]?.data ?? []
const fullLore = characterLore.concat(chatLore.concat(globalLore))
const fullLore = characterLore.concat(chatLore.concat(getModuleLorebooks()))
return fullLore.map((f) => {
return JSON.stringify(f)
}).join("§\n")

107
src/ts/process/lorebook.ts
View File

@@ -12,19 +12,7 @@ import { getModuleLorebooks } from "./modules";
export function addLorebook(type:number) {
let selectedID = get(selectedCharID)
let db = get(DataBase)
if(type === -1){
db.loreBook[db.loreBookPage].data.push({
key: '',
comment: `New Lore ${db.loreBook[db.loreBookPage].data.length + 1}`,
content: '',
mode: 'normal',
insertorder: 100,
alwaysActive: false,
secondkey: "",
selective: false
})
}
else if(type === 0){
if(type === 0){
db.characters[selectedID].globalLore.push({
key: '',
comment: `New Lore ${db.characters[selectedID].globalLore.length + 1}`,
@@ -71,9 +59,8 @@ export async function loadLoreBookPrompt(){
const page = char.chatPage
const characterLore = char.globalLore ?? []
const chatLore = char.chats[page].localLore ?? []
const globalLore = db.loreBook[db.loreBookPage]?.data ?? []
const moduleLorebook = getModuleLorebooks()
const fullLore = characterLore.concat(chatLore).concat(moduleLorebook).concat(globalLore)
const fullLore = characterLore.concat(chatLore).concat(moduleLorebook)
const currentChat = char.chats[page].message
const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth
const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken
@@ -224,8 +211,7 @@ export async function loadLoreBookPlusPrompt(){
const page = char.chatPage
const characterLore = char.globalLore ?? []
const chatLore = char.chats[page].localLore ?? []
const globalLore = db.loreBook[db.loreBookPage]?.data ?? []
const fullLore = characterLore.concat(chatLore.concat(globalLore)).filter((v) => { return v.content })
const fullLore = characterLore.concat(chatLore).concat(getModuleLorebooks()).filter((v) => { return v.content })
const currentChat = char.chats[page].message
const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth
const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken
@@ -317,7 +303,6 @@ export async function importLoreBook(mode:'global'|'local'|'sglobal'){
const page = mode === 'sglobal' ? -1 : db.characters[selectedID].chatPage
let lore =
mode === 'global' ? db.characters[selectedID].globalLore :
mode === 'sglobal' ? db.loreBook[db.loreBookPage].data :
db.characters[selectedID].chats[page].localLore
const lorebook = (await selectSingleFile(['json', 'lorebook'])).data
if(!lorebook){
@@ -335,50 +320,12 @@ export async function importLoreBook(mode:'global'|'local'|'sglobal'){
}
}
else if(importedlore.entries){
const entries:{[key:string]:{
key:string[]
comment:string
content:string
order:number
constant:boolean,
name:string,
keywords:string[],
priority:number
entry:string
secondary_keys:string[]
selective:boolean
forceActivation:boolean
keys:string[]
displayName:string
text:string
contextConfig?: {
budgetPriority:number
prefix:string
suffix:string
}
}} = importedlore.entries
for(const key in entries){
const currentLore = entries[key]
lore.push({
key: currentLore.key ? currentLore.key.join(', ') :
currentLore.keys ? currentLore.keys.join(', ') :
currentLore.keywords ? currentLore.keywords.join(', ') : '',
insertorder: currentLore.order ?? currentLore.priority ?? currentLore?.contextConfig?.budgetPriority ?? 0,
comment: currentLore.comment || currentLore.name || currentLore.displayName || '',
content: currentLore.content || currentLore.entry || currentLore.text || '',
mode: "normal",
alwaysActive: currentLore.constant ?? currentLore.forceActivation ?? false,
secondkey: currentLore.secondary_keys ? currentLore.secondary_keys.join(', ') : "",
selective: currentLore.selective ?? false
})
}
const entries:{[key:string]:CCLorebook} = importedlore.entries
lore.push(...convertExternalLorebook(entries))
}
if(mode === 'global'){
db.characters[selectedID].globalLore = lore
}
else if(mode === 'sglobal'){
db.loreBook[db.loreBookPage].data = lore
}
else{
db.characters[selectedID].chats[page].localLore = lore
}
@@ -388,6 +335,49 @@ export async function importLoreBook(mode:'global'|'local'|'sglobal'){
}
}
interface CCLorebook{
key:string[]
comment:string
content:string
order:number
constant:boolean,
name:string,
keywords:string[],
priority:number
entry:string
secondary_keys:string[]
selective:boolean
forceActivation:boolean
keys:string[]
displayName:string
text:string
contextConfig?: {
budgetPriority:number
prefix:string
suffix:string
}
}
export function convertExternalLorebook(entries:{[key:string]:CCLorebook}){
let lore:loreBook[] = []
for(const key in entries){
const currentLore = entries[key]
lore.push({
key: currentLore.key ? currentLore.key.join(', ') :
currentLore.keys ? currentLore.keys.join(', ') :
currentLore.keywords ? currentLore.keywords.join(', ') : '',
insertorder: currentLore.order ?? currentLore.priority ?? currentLore?.contextConfig?.budgetPriority ?? 0,
comment: currentLore.comment || currentLore.name || currentLore.displayName || '',
content: currentLore.content || currentLore.entry || currentLore.text || '',
mode: "normal",
alwaysActive: currentLore.constant ?? currentLore.forceActivation ?? false,
secondkey: currentLore.secondary_keys ? currentLore.secondary_keys.join(', ') : "",
selective: currentLore.selective ?? false
})
}
return lore
}
export async function exportLoreBook(mode:'global'|'local'|'sglobal'){
try {
const selectedID = get(selectedCharID)
@@ -395,7 +385,6 @@ export async function exportLoreBook(mode:'global'|'local'|'sglobal'){
const page = mode === 'sglobal' ? -1 : db.characters[selectedID].chatPage
const lore =
mode === 'global' ? db.characters[selectedID].globalLore :
mode === 'sglobal' ? db.loreBook[db.loreBookPage].data :
db.characters[selectedID].chats[page].localLore
const stringl = Buffer.from(JSON.stringify({
type: 'risu',

59
src/ts/process/modules.ts
View File

@@ -1,11 +1,12 @@
import { language } from "src/lang"
import { alertError, alertNormal } from "../alert"
import { DataBase, type customscript, type loreBook, type triggerscript } from "../storage/database"
import { DataBase, setDatabase, type customscript, type loreBook, type triggerscript } from "../storage/database"
import { downloadFile } from "../storage/globalApi"
import { get } from "svelte/store"
import { CurrentChat } from "../stores"
import { selectSingleFile } from "../util"
import { v4 } from "uuid"
import { convertExternalLorebook } from "./lorebook"
export interface RisuModule{
name: string
@@ -26,24 +27,50 @@ export async function exportModule(module:RisuModule){
}
export async function importModule(){
const f = await selectSingleFile(['json'])
const f = await selectSingleFile(['json', 'lorebook'])
if(!f){
return
}
const file = f.data
const db = get(DataBase)
try {
const importedModule = JSON.parse(Buffer.from(file).toString())
if(importedModule.type === 'risuModule'){
const db = get(DataBase)
const importData = JSON.parse(Buffer.from(file).toString())
if(importData.type === 'risuModule'){
if(
(!importedModule.name)
|| (!importedModule.description)
|| (!importedModule.id)
(!importData.name)
|| (!importData.description)
|| (!importData.id)
){
alertError(language.errors.noData)
}
importedModule.id = v4()
db.modules.push(importedModule)
importData.id = v4()
db.modules.push(importData)
setDatabase(db)
return
}
if(importData.type === 'risu' && importData.data){
const lores:loreBook[] = importData.data
const importModule = {
name: importData.name || 'Imported Lorebook',
description: importData.description || 'Converted from risu lorebook',
lorebook: lores,
id: v4()
}
db.modules.push(importModule)
setDatabase(db)
return
}
if(importData.entries){
const lores:loreBook[] = convertExternalLorebook(importData.entries)
const importModule = {
name: importData.name || 'Imported Lorebook',
description: importData.description || 'Converted from external lorebook',
lorebook: lores,
id: v4()
}
db.modules.push(importModule)
setDatabase(db)
return
}
} catch (error) {
alertNormal(language.errors.noData)
@@ -65,8 +92,8 @@ export function getModuleLorebooks() {
const currentChat = get(CurrentChat)
const db = get(DataBase)
if (!currentChat) return []
const moduleIds = currentChat.modules ?? []
moduleIds.concat(db.enabledModules)
let moduleIds = currentChat.modules ?? []
moduleIds = moduleIds.concat(db.enabledModules)
let lorebooks: loreBook[] = []
for (const moduleId of moduleIds) {
const module = getModuleById(moduleId)
@@ -85,8 +112,8 @@ export function getModuleTriggers() {
const currentChat = get(CurrentChat)
const db = get(DataBase)
if (!currentChat) return []
const moduleIds = currentChat.modules ?? []
moduleIds.concat(db.enabledModules)
let moduleIds = currentChat.modules ?? []
moduleIds = moduleIds.concat(db.enabledModules)
let triggers: triggerscript[] = []
for (const moduleId of moduleIds) {
const module = getModuleById(moduleId)
@@ -104,8 +131,8 @@ export function getModuleRegexScripts() {
const currentChat = get(CurrentChat)
const db = get(DataBase)
if (!currentChat) return []
const moduleIds = currentChat.modules ?? []
moduleIds.concat(db.enabledModules)
let moduleIds = currentChat.modules ?? []
moduleIds = moduleIds.concat(db.enabledModules)
let customscripts: customscript[] = []
for (const moduleId of moduleIds) {
const module = getModuleById(moduleId)

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

@@ -15,7 +15,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba';
export const DataBase = writable({} as any as Database)
export const loadedStore = writable(false)
export let appVer = "1.77.0"
export let appVer = "1.78.2"
export let webAppSubVer = ''
export function setDatabase(data:Database){
@@ -591,6 +591,7 @@ export interface Database{
memoryLimitThickness?:number
modules: RisuModule[]
enabledModules: string[]
sideMenuRerollButton?:boolean
}
export interface customscript{

40
src/ts/storage/globalApi.ts
View File

@@ -1,7 +1,7 @@
import { writeBinaryFile,BaseDirectory, readBinaryFile, exists, createDir, readDir, removeFile } from "@tauri-apps/api/fs"
import { changeFullscreen, checkNullish, findCharacterbyId, sleep } from "../util"
import { convertFileSrc, invoke } from "@tauri-apps/api/tauri"
import { v4 as uuidv4 } from 'uuid';
import { v4 as uuidv4, v4 } from 'uuid';
import { appDataDir, join } from "@tauri-apps/api/path";
import { get } from "svelte/store";
import {open} from '@tauri-apps/api/shell'
@@ -26,6 +26,7 @@ import { saveDbKei } from "../kei/backup";
import { Capacitor, CapacitorHttp } from '@capacitor/core';
import * as CapFS from '@capacitor/filesystem'
import { save } from "@tauri-apps/api/dialog";
import type { RisuModule } from "../process/modules";
//@ts-ignore
export const isTauri = !!window.__TAURI__
@@ -985,6 +986,43 @@ async function checkNewFormat() {
db.formatversion = 3
}
if(db.formatversion < 4){
db.modules ??= []
db.enabledModules ??=[]
//convert globallore and global regex to modules
if(db.globalscript && db.globalscript.length > 0){
const id = v4()
let regexModule:RisuModule = {
name: "Global Regex",
description: "Converted from legacy global regex",
id: id,
regex: cloneDeep(db.globalscript)
}
db.modules.push(regexModule)
db.enabledModules.push(id)
db.globalscript = []
}
if(db.loreBook && db.loreBook.length > 0){
const selIndex = db.loreBookPage
for(let i=0;i<db.loreBook.length;i++){
const id = v4()
let lbModule:RisuModule = {
name: db.loreBook[i].name || "Unnamed Global Lorebook",
description: "Converted from legacy global lorebook",
id: id,
lorebook: cloneDeep(db.loreBook[i].data)
}
db.modules.push(lbModule)
if(i === selIndex){
db.enabledModules.push(id)
}
db.globalscript = []
}
db.loreBook = []
}
db.formatversion = 4
}
if(!db.characterOrder){
db.characterOrder = []
}