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

revert: Revert Refactor function getCharImage

Browse Source
This commit is contained in:
phyyou
2023-05-13 02:47:55 +09:00
parent a10ee2e7a6
commit 8e6ac84c3b
1 changed files with 421 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

532
src/ts/characters.ts
View File

@@ -1,60 +1,35 @@
import { get, writable } from "svelte/store"; import { get, writable } from "svelte/store";
import { import { DataBase, saveImage, setDatabase, type character, type Chat, defaultSdDataFunc } from "./database";
DataBase, import exifr from 'exifr'
saveImage, import { alertConfirm, alertError, alertNormal, alertSelect, alertStore } from "./alert";
setDatabase,
type character,
type Chat,
defaultSdDataFunc,
} from "./database";
import exifr from "exifr";
import {
alertConfirm,
alertError,
alertNormal,
alertSelect,
alertStore,
} from "./alert";
import { language } from "../lang"; import { language } from "../lang";
import { PngMetadata } from "./exif"; import { PngMetadata } from "./exif";
import { import { encode as encodeMsgpack, decode as decodeMsgpack } from "@msgpack/msgpack";
encode as encodeMsgpack, import { checkNullish, findCharacterbyId, selectMultipleFile, selectSingleFile, sleep } from "./util";
decode as decodeMsgpack, import { v4 as uuidv4 } from 'uuid';
} from "@msgpack/msgpack";
import {
checkNullish,
findCharacterbyId,
selectMultipleFile,
selectSingleFile,
sleep,
} from "./util";
import { v4 as uuidv4 } from "uuid";
import { selectedCharID } from "./stores"; import { selectedCharID } from "./stores";
import { downloadFile, getFileSrc, readImage } from "./globalApi"; import { downloadFile, getFileSrc, readImage } from "./globalApi";
export function createNewCharacter() { export function createNewCharacter() {
let db = get(DataBase); let db = get(DataBase)
db.characters.push(createBlankChar()); db.characters.push(createBlankChar())
setDatabase(db); setDatabase(db)
return db.characters.length - 1; return db.characters.length - 1
} }
export function createNewGroup(){ export function createNewGroup(){
let db = get(DataBase); let db = get(DataBase)
db.characters.push({ db.characters.push({
type: "group", type: 'group',
name: "", name: "",
firstMessage: "", firstMessage: "",
chats: [ chats: [{
{
message: [], message: [],
note: "", note: '',
name: "Chat 1", name: 'Chat 1',
localLore: [], localLore: []
}, }], chatPage: 0,
], viewScreen: 'none',
chatPage: 0,
viewScreen: "none",
globalLore: [], globalLore: [],
characters: [], characters: [],
autoMode: false, autoMode: false,
@@ -62,323 +37,322 @@ export function createNewGroup() {
emotionImages: [], emotionImages: [],
customscript: [], customscript: [],
chaId: uuidv4(), chaId: uuidv4(),
firstMsgIndex: -1, firstMsgIndex: -1
}); })
setDatabase(db); setDatabase(db)
return db.characters.length - 1; return db.characters.length - 1
} }
export async function getCharImage( export async function getCharImage(loc:string, type:'plain'|'css'|'contain') {
loc: string, if(!loc || loc === ''){
type: "plain" | "css" | "contain" // TODO: REFACTOR BY REMOVE THIS PARAMETER if(type ==='css'){
) { return ''
const filesrc = await getFileSrc(loc); }
return filesrc; return null
}
const filesrc = await getFileSrc(loc)
if(type === 'plain'){
return filesrc
}
else if(type ==='css'){
return `background: url("${filesrc}");background-size: cover;`
}
else{
return `background: url("${filesrc}");background-size: contain;background-repeat: no-repeat;background-position: center;`
}
} }
export async function selectCharImg(charId:number) { export async function selectCharImg(charId:number) {
const selected = await selectSingleFile(["png"]); const selected = await selectSingleFile(['png'])
if(!selected){ if(!selected){
return; return
} }
const img = selected.data; const img = selected.data
let db = get(DataBase); let db = get(DataBase)
const imgp = await saveImage(img); const imgp = await saveImage(img)
db.characters[charId].image = imgp; db.characters[charId].image = imgp
setDatabase(db); setDatabase(db)
} }
export async function selectUserImg() { export async function selectUserImg() {
const selected = await selectSingleFile(["png"]); const selected = await selectSingleFile(['png'])
if(!selected){ if(!selected){
return; return
} }
const img = selected.data; const img = selected.data
let db = get(DataBase); let db = get(DataBase)
const imgp = await saveImage(img); const imgp = await saveImage(img)
db.userIcon = imgp; db.userIcon = imgp
setDatabase(db); setDatabase(db)
} }
export const addingEmotion = writable(false); export const addingEmotion = writable(false)
export async function addCharEmotion(charId:number) { export async function addCharEmotion(charId:number) {
addingEmotion.set(true); addingEmotion.set(true)
const selected = await selectMultipleFile(["png", "webp", "gif"]); const selected = await selectMultipleFile(['png', 'webp', 'gif'])
if(!selected){ if(!selected){
addingEmotion.set(false); addingEmotion.set(false)
return; return
} }
let db = get(DataBase); let db = get(DataBase)
for(const f of selected){ for(const f of selected){
console.log(f); console.log(f)
const img = f.data; const img = f.data
const imgp = await saveImage(img); const imgp = await saveImage(img)
const name = f.name.replace(".png", "").replace(".webp", ""); const name = f.name.replace('.png','').replace('.webp','')
let dbChar = db.characters[charId]; let dbChar = db.characters[charId]
if (dbChar.type !== "group") { if(dbChar.type !== 'group'){
dbChar.emotionImages.push([name, imgp]); dbChar.emotionImages.push([name,imgp])
db.characters[charId] = dbChar; db.characters[charId] = dbChar
} }
setDatabase(db); setDatabase(db)
} }
addingEmotion.set(false); addingEmotion.set(false)
} }
export async function rmCharEmotion(charId:number, emotionId:number) { export async function rmCharEmotion(charId:number, emotionId:number) {
let db = get(DataBase); let db = get(DataBase)
let dbChar = db.characters[charId]; let dbChar = db.characters[charId]
if (dbChar.type !== "group") { if(dbChar.type !== 'group'){
dbChar.emotionImages.splice(emotionId, 1); dbChar.emotionImages.splice(emotionId, 1)
db.characters[charId] = dbChar; db.characters[charId] = dbChar
} }
setDatabase(db); setDatabase(db)
} }
export async function exportChat(page:number){ export async function exportChat(page:number){
try { try {
const mode = await alertSelect(["Export as JSON", "Export as TXT"]);
const selectedID = get(selectedCharID); const mode = await alertSelect(['Export as JSON', "Export as TXT"])
const db = get(DataBase); const selectedID = get(selectedCharID)
const chat = db.characters[selectedID].chats[page]; const db = get(DataBase)
const char = db.characters[selectedID]; const chat = db.characters[selectedID].chats[page]
const char = db.characters[selectedID]
const date = new Date().toJSON(); const date = new Date().toJSON();
console.log(mode); console.log(mode)
if (mode === "0") { if(mode === '0'){
const stringl = Buffer.from( const stringl = Buffer.from(JSON.stringify({
JSON.stringify({ type: 'risuChat',
type: "risuChat",
ver: 1, ver: 1,
data: chat, data: chat
}), }), 'utf-8')
"utf-8"
);
await downloadFile( await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.json', stringl)
`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".json",
stringl }
); else{
} else {
let stringl = chat.message let stringl = chat.message.map((v) => {
.map((v) => {
if(v.saying){ if(v.saying){
return `${findCharacterbyId(v.saying).name}\n${v.data}`; return `${findCharacterbyId(v.saying).name}\n${v.data}`
} else {
return `${v.role === "char" ? char.name : db.username}\n${v.data}`;
} }
}) else{
.join("\n\n"); return `${v.role === 'char' ? char.name : db.username}\n${v.data}`
}
}).join('\n\n')
if (char.type !== "group") { if(char.type !== 'group'){
stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl; stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl
} }
await downloadFile( await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.txt', Buffer.from(stringl, 'utf-8'))
`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + ".txt",
Buffer.from(stringl, "utf-8")
);
} }
alertNormal(language.successExport); alertNormal(language.successExport)
} catch (error) { } catch (error) {
alertError(`${error}`); alertError(`${error}`)
} }
} }
export async function importChat(){ export async function importChat(){
const dat = await selectSingleFile(["json", "jsonl"]); const dat =await selectSingleFile(['json','jsonl'])
if(!dat){ if(!dat){
return; return
} }
try { try {
const selectedID = get(selectedCharID); const selectedID = get(selectedCharID)
let db = get(DataBase); let db = get(DataBase)
if (dat.name.endsWith("jsonl")) { if(dat.name.endsWith('jsonl')){
const lines = Buffer.from(dat.data).toString("utf-8").split("\n"); const lines = Buffer.from(dat.data).toString('utf-8').split('\n')
let newChat:Chat = { let newChat:Chat = {
message: [], message: [],
note: "", note: "",
name: "Imported Chat", name: "Imported Chat",
localLore: [], localLore: []
}; }
let isFirst = true; let isFirst = true
for(const line of lines){ for(const line of lines){
const presedLine = JSON.parse(line);
if ((presedLine.name && presedLine.is_user, presedLine.mes)) { const presedLine = JSON.parse(line)
if(presedLine.name && presedLine.is_user, presedLine.mes){
if(!isFirst){ if(!isFirst){
newChat.message.push({ newChat.message.push({
role: presedLine.is_user ? "user" : "char", role: presedLine.is_user ? "user" : 'char',
data: formatTavernChat( data: formatTavernChat(presedLine.mes, db.characters[selectedID].name)
presedLine.mes, })
db.characters[selectedID].name
),
});
} }
} }
isFirst = false; isFirst = false
} }
if(newChat.message.length === 0){ if(newChat.message.length === 0){
alertError(language.errors.noData); alertError(language.errors.noData)
return; return
} }
db.characters[selectedID].chats.push(newChat); db.characters[selectedID].chats.push(newChat)
setDatabase(db); setDatabase(db)
alertNormal(language.successImport); alertNormal(language.successImport)
} else {
const json = JSON.parse(Buffer.from(dat.data).toString("utf-8"));
if (json.type === "risuChat" && json.ver === 1) {
const das: Chat = json.data;
if (
!(
checkNullish(das.message) ||
checkNullish(das.note) ||
checkNullish(das.name) ||
checkNullish(das.localLore)
)
) {
db.characters[selectedID].chats.push(das);
setDatabase(db);
alertNormal(language.successImport);
return;
} else {
alertError(language.errors.noData);
return;
} }
} else { else{
alertError(language.errors.noData); const json = JSON.parse(Buffer.from(dat.data).toString('utf-8'))
return; if(json.type === 'risuChat' && json.ver === 1){
const das:Chat = json.data
if(!(checkNullish(das.message) || checkNullish(das.note) || checkNullish(das.name) || checkNullish(das.localLore))){
db.characters[selectedID].chats.push(das)
setDatabase(db)
alertNormal(language.successImport)
return
}
else{
alertError(language.errors.noData)
return
} }
} }
else{
alertError(language.errors.noData)
return
}
}
} catch (error) { } catch (error) {
alertError(`${error}`); alertError(`${error}`)
} }
} }
function formatTavernChat(chat:string, charName:string){ function formatTavernChat(chat:string, charName:string){
const db = get(DataBase); const db = get(DataBase)
return chat return chat.replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username).replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName)
.replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, db.username)
.replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName);
} }
export function characterFormatUpdate(index:number|character){ export function characterFormatUpdate(index:number|character){
let db = get(DataBase); let db = get(DataBase)
let cha = typeof index === "number" ? db.characters[index] : index; let cha = typeof(index) === 'number' ? db.characters[index] : index
if(cha.chats.length === 0){ if(cha.chats.length === 0){
cha.chats = [ cha.chats = [{
{
message: [], message: [],
note: "", note: '',
name: "Chat 1", name: 'Chat 1',
localLore: [], localLore: []
}, }]
];
} }
if(!cha.chats[cha.chatPage]){ if(!cha.chats[cha.chatPage]){
cha.chatPage = 0; cha.chatPage = 0
} }
if(!cha.chats[cha.chatPage].message){ if(!cha.chats[cha.chatPage].message){
cha.chats[cha.chatPage].message = []; cha.chats[cha.chatPage].message = []
} }
if(!cha.type){ if(!cha.type){
cha.type = "character"; cha.type = 'character'
} }
if(!cha.chaId){ if(!cha.chaId){
cha.chaId = uuidv4(); cha.chaId = uuidv4()
} }
if (cha.type !== "group") { if(cha.type !== 'group'){
if(checkNullish(cha.sdData)){ if(checkNullish(cha.sdData)){
cha.sdData = defaultSdDataFunc(); cha.sdData = defaultSdDataFunc()
} }
if(checkNullish(cha.utilityBot)){ if(checkNullish(cha.utilityBot)){
cha.utilityBot = false; cha.utilityBot = false
} }
cha.alternateGreetings = cha.alternateGreetings ?? []; cha.alternateGreetings = cha.alternateGreetings ?? []
cha.exampleMessage = cha.exampleMessage ?? ""; cha.exampleMessage = cha.exampleMessage ?? ''
cha.creatorNotes = cha.creatorNotes ?? ""; cha.creatorNotes = cha.creatorNotes ?? ''
cha.systemPrompt = cha.systemPrompt ?? ""; cha.systemPrompt = cha.systemPrompt ?? ''
cha.postHistoryInstructions = cha.postHistoryInstructions ?? ""; cha.postHistoryInstructions = cha.postHistoryInstructions ?? ''
cha.tags = cha.tags ?? []; cha.tags = cha.tags ?? []
cha.creator = cha.creator ?? ""; cha.creator = cha.creator ?? ''
cha.characterVersion = cha.characterVersion ?? 0; cha.characterVersion = cha.characterVersion ?? 0
cha.personality = cha.personality ?? ""; cha.personality = cha.personality ?? ''
cha.scenario = cha.scenario ?? ""; cha.scenario = cha.scenario ?? ''
cha.firstMsgIndex = cha.firstMsgIndex ?? -1; cha.firstMsgIndex = cha.firstMsgIndex ?? -1
} }
if(checkNullish(cha.customscript)){ if(checkNullish(cha.customscript)){
cha.customscript = []; cha.customscript = []
} }
if (typeof index === "number") { if(typeof(index) === 'number'){
db.characters[index] = cha; db.characters[index] = cha
setDatabase(db); setDatabase(db)
} }
return cha; return cha
} }
export function createBlankChar():character{ export function createBlankChar():character{
return { return {
name: "", name: '',
firstMessage: "", firstMessage: '',
desc: "", desc: '',
notes: "", notes: '',
chats: [ chats: [{
{
message: [], message: [],
note: "", note: '',
name: "Chat 1", name: 'Chat 1',
localLore: [], localLore: []
}, }],
],
chatPage: 0, chatPage: 0,
emotionImages: [], emotionImages: [],
bias: [], bias: [],
viewScreen: "none", viewScreen: 'none',
globalLore: [], globalLore: [],
chaId: uuidv4(), chaId: uuidv4(),
type: "character", type: 'character',
sdData: defaultSdDataFunc(), sdData: defaultSdDataFunc(),
utilityBot: false, utilityBot: false,
customscript: [], customscript: [],
exampleMessage: "", exampleMessage: '',
creatorNotes: "", creatorNotes:'',
systemPrompt: "", systemPrompt:'',
postHistoryInstructions: "", postHistoryInstructions:'',
alternateGreetings:[], alternateGreetings:[],
tags:[], tags:[],
creator:"", creator:"",
characterVersion: 0, characterVersion: 0,
personality:"", personality:"",
scenario:"", scenario:"",
firstMsgIndex: -1, firstMsgIndex: -1
};
} }
}
export async function makeGroupImage() { export async function makeGroupImage() {
try { try {
alertStore.set({ alertStore.set({
type: "wait", type: 'wait',
msg: `Loading..`, msg: `Loading..`
}); })
const db = get(DataBase); const db = get(DataBase)
const charID = get(selectedCharID); const charID = get(selectedCharID)
const group = db.characters[charID]; const group = db.characters[charID]
if (group.type !== "group") { if(group.type !== 'group'){
return; return
} }
const imageUrls = await Promise.all( const imageUrls = await Promise.all(group.characters.map((v) => {
group.characters.map((v) => { return getCharImage(findCharacterbyId(v).image, 'plain')
return getCharImage(findCharacterbyId(v).image, "plain"); }))
})
);
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");
canvas.width = 256; canvas.width = 256
canvas.height = 256; canvas.height = 256
const ctx = canvas.getContext("2d"); const ctx = canvas.getContext("2d");
// Load the images // Load the images
@@ -390,7 +364,7 @@ export async function makeGroupImage() {
(url) => (url) =>
new Promise<void>((resolve) => { new Promise<void>((resolve) => {
const img = new Image(); const img = new Image();
img.crossOrigin = "anonymous"; img.crossOrigin="anonymous"
img.onload = () => { img.onload = () => {
images.push(img); images.push(img);
resolve(); resolve();
@@ -423,17 +397,17 @@ export async function makeGroupImage() {
// Return the image URI // Return the image URI
const uri = canvas.toDataURL(); const uri = canvas.toDataURL()
console.log(uri); console.log(uri)
canvas.remove(); canvas.remove()
db.characters[charID].image = await saveImage(dataURLtoBuffer(uri)); db.characters[charID].image = await saveImage(dataURLtoBuffer(uri));
setDatabase(db); setDatabase(db)
alertStore.set({ alertStore.set({
type: "none", type: 'none',
msg: "", msg: ''
}); })
} catch (error) { } catch (error) {
alertError(`${error}`); alertError(`${error}`)
} }
} }
@@ -443,57 +417,55 @@ function dataURLtoBuffer(string: string) {
const matches = string.match(regex); const matches = string.match(regex);
const ext = matches[1]; const ext = matches[1];
const data = matches[2]; const data = matches[2];
return Buffer.from(data, "base64"); return Buffer.from(data, 'base64');
} }
export async function addDefaultCharacters() { export async function addDefaultCharacters() {
const imgs = [fetch("/sample/rika.png"), fetch("/sample/yuzu.png")]; const imgs = [fetch('/sample/rika.png'),fetch('/sample/yuzu.png')]
alertStore.set({ alertStore.set({
type: "wait", type: 'wait',
msg: `Loading Sample bots...`, msg: `Loading Sample bots...`
}); })
for(const img of imgs){ for(const img of imgs){
const imgBuffer = await (await img).arrayBuffer(); const imgBuffer = await (await img).arrayBuffer()
const readed = await exifr.parse(imgBuffer, true); const readed = (await exifr.parse(imgBuffer, true))
await sleep(10); await sleep(10)
const va = decodeMsgpack(Buffer.from(readed.risuai, "base64")) as any; const va = decodeMsgpack(Buffer.from(readed.risuai, 'base64')) as any
if(va.type !== 101){ if(va.type !== 101){
alertError(language.errors.noData); alertError(language.errors.noData)
return; return
} }
let char: character = va.data; let char:character = va.data
let db = get(DataBase); let db = get(DataBase)
if(char.emotionImages && char.emotionImages.length > 0){ if(char.emotionImages && char.emotionImages.length > 0){
for(let i=0;i<char.emotionImages.length;i++){ for(let i=0;i<char.emotionImages.length;i++){
await sleep(10); await sleep(10)
const imgp = await saveImage(char.emotionImages[i][1] as any); const imgp = await saveImage(char.emotionImages[i][1] as any)
char.emotionImages[i][1] = imgp; char.emotionImages[i][1] = imgp
} }
} }
char.chats = [ char.chats = [{
{
message: [], message: [],
note: "", note: '',
name: "Chat 1", name: 'Chat 1',
localLore: [], localLore: []
}, }]
];
if(checkNullish(char.sdData)){ if(checkNullish(char.sdData)){
char.sdData = defaultSdDataFunc(); char.sdData = defaultSdDataFunc()
} }
char.chatPage = 0; char.chatPage = 0
char.image = await saveImage(PngMetadata.filter(Buffer.from(imgBuffer))); char.image = await saveImage(PngMetadata.filter(Buffer.from(imgBuffer)))
char.chaId = uuidv4(); char.chaId = uuidv4()
db.characters.push(characterFormatUpdate(char)); db.characters.push(characterFormatUpdate(char))
setDatabase(db); setDatabase(db)
} }
alertStore.set({ alertStore.set({
type: "none", type: 'none',
msg: "", msg: ''
}); })
} }