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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
kwaroran
2023-05-31 05:27:32 +09:00
committed by GitHub
parent 307aeaa36d f98764776e
commit cf93e5c6f1
11 changed files with 258 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/en.ts
View File

@@ -291,4 +291,8 @@ export const languageEnglish = {
advanced: "Advanced",
askReRollAutoSuggestions: "Re-Roll Auto Suggestions",
creatingSuggestions: "Creating Suggestions...",
orderByOrder: "Talk by Order",
removeFromGroup: "Do you really want to remove {{char}} from group?",
talkness: "Talkativeness",
active: "Active"
}

8
src/lang/ko.ts
View File

@@ -266,4 +266,12 @@ export const languageKorean = {
clickToEdit: "클릭해서 수정하기",
askReRollAutoSuggestions: "자동 제안 다시 뽑기",
creatingSuggestions: "응답 제안 작성 중...",
setNodePassword: "보안을 위해 비밀번호를 정해주세요",
inputNodePassword: "비밀번호를 입력해주세요. 기억이 안나신다면, save/__password를 지우고 서버를 재시작해주세요.",
simple:"간단",
advanced: "고급",
orderByOrder: "순서대로 말하기",
removeFromGroup: "정말로 {{char}}을 그룹에서 삭제시키겠습니까?",
talkness: "대화량",
active: "활성화"
}

3
src/lib/Others/Check.svelte
View File

@@ -3,9 +3,10 @@
export let check = false
export let onChange = (check) => {}
export let margin = true
</script>
<label class="mr-2">
<label class:mr-2={margin}>
<input type="checkbox" class="hidden" bind:checked={check} on:change={() => {
onChange(check)
}}>

73
src/lib/SideBars/CharConfig.svelte
View File

@@ -3,7 +3,7 @@
import { tokenize } from "../../ts/tokenizer";
import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database";
import { selectedCharID } from "../../ts/stores";
import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon } from 'lucide-svelte'
import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon } from 'lucide-svelte'
import Check from "../Others/Check.svelte";
import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage } from "../../ts/characters";
import LoreBook from "./LoreBookSetting.svelte";
@@ -17,6 +17,7 @@
import { exportChar } from "src/ts/characterCards";
import { getElevenTTSVoices, getWebSpeechTTSVoices, getVOICEVOXVoices } from "src/ts/process/tts";
import { checkCharOrder } from "src/ts/storage/globalApi";
import { addGroupChar, rmCharFromGroup } from "src/ts/process/group";
let subMenu = 0
let subberMenu = 0
@@ -58,41 +59,6 @@
}
async function addGroupChar(){
let group = currentChar.data
if(group.type === 'group'){
const res = await alertSelectChar()
if(res){
if(group.characters.includes(res)){
alertError(language.errors.alreadyCharInGroup)
}
else{
if(await alertConfirm(language.askLoadFirstMsg)){
group.chats[group.chatPage].message.push({
role:'char',
data: findCharacterbyId(res).firstMessage,
saying: res,
})
}
group.characters.push(res)
currentChar.data = group
}
}
}
currentChar = currentChar
}
function rmCharFromGroup(index:number){
let group = currentChar.data
if(group.type === 'group'){
group.characters.splice(index, 1)
currentChar.data = group
}
}
let database:Database
let currentChar:{
type: 'character',
@@ -182,10 +148,13 @@
{:else}
<input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" placeholder="Group Name" bind:value={currentChar.data.name}>
<span class="text-neutral-200">{language.character}</span>
<div class="p-2 flex gap-2">
<div class="p-4 gap-2 bg-bgcolor rounded-lg char-grid">
{#if currentChar.data.characters.length === 0}
<span class="text-gray-500">No Character</span>
{:else}
<div></div>
<div class="text-center">{language.talkness}</div>
<div class="text-center">{language.active}</div>
{#each currentChar.data.characters as char, i}
{#await getCharImage(findCharacterbyId(char).image, 'css')}
<BarIcon onClick={() => {
@@ -198,6 +167,24 @@
rmCharFromGroup(i)
}} additionalStyle={im} />
{/await}
<div class="flex items-center px-2 py-3">
{#each [1,2,3,4,5,6] as barIndex}
<button class="bg-selected h-full flex-1 border-r-bgcolor border-r"
class:bg-green-500={currentChar.data.characterTalks[i] >= (1 / 6 * barIndex)}
class:bg-selected={currentChar.data.characterTalks[i] < (1 / 6 * barIndex)}
class:rounded-l-lg={barIndex === 1}
class:rounded-r-lg={barIndex === 6}
on:click={() => {
if(currentChar.data.type === 'group'){
currentChar.data.characterTalks[i] = (1 / 6 * barIndex)
}
}}
></button>
{/each}
</div>
<div class="flex items-center justify-center">
<Check margin={false} bind:check={currentChar.data.characterActive[i]} />
</div>
{/each}
{/if}
</div>
@@ -222,6 +209,13 @@
<span class="text-neutral-200 ml-2">{language.ToggleSuperMemory}</span>
</div>
{/if}
{#if currentChar.type === 'group'}
<div class="flex mt-2 items-center">
<Check bind:check={currentChar.data.orderByOrder}/>
<span class="text-neutral-200 ml-2">{language.orderByOrder}</span>
</div>
{/if}
{:else if subMenu === 1}
<h2 class="mb-2 text-2xl font-bold mt-2">{language.characterDisplay}</h2>
<span class="text-neutral-200 mt-2 mb-2">{currentChar.type !== 'group' ? language.charIcon : language.groupIcon}</span>
@@ -714,4 +708,9 @@
overflow: hidden;
text-overflow: ellipsis;
}
.char-grid{
display: grid;
grid-template-columns: auto 1fr auto;
}
</style>

18
src/ts/characters.ts
View File

@@ -38,7 +38,9 @@ export function createNewGroup(){
emotionImages: [],
customscript: [],
chaId: uuidv4(),
firstMsgIndex: -1
firstMsgIndex: -1,
characterTalks: [],
characterActive: []
})
setDatabase(db)
checkCharOrder()
@@ -300,6 +302,20 @@ export function characterFormatUpdate(index:number|character){
}
}
else{
if((!cha.characterTalks) || cha.characterTalks.length !== cha.characters.length){
cha.characterTalks = []
for(let i=0;i<cha.characters.length;i++){
cha.characterTalks.push(1 / 6 * 4)
}
}
if((!cha.characterActive) || cha.characterActive.length !== cha.characters.length){
cha.characterActive = []
for(let i=0;i<cha.characters.length;i++){
cha.characterActive.push(true)
}
}
}
if(checkNullish(cha.customscript)){
cha.customscript = []
}

103
src/ts/process/group.ts Normal file
View File

@@ -0,0 +1,103 @@
import { shuffle } from "lodash";
import { findCharacterbyId } from "../util";
import { alertConfirm, alertError, alertSelectChar } from "../alert";
import { language } from "src/lang";
import { get } from "svelte/store";
import { DataBase, setDatabase } from "../storage/database";
import { selectedCharID } from "../stores";
export async function addGroupChar(){
let db = get(DataBase)
let selectedId = get(selectedCharID)
let group = db.characters[selectedId]
if(group.type === 'group'){
const res = await alertSelectChar()
if(res){
if(group.characters.includes(res)){
alertError(language.errors.alreadyCharInGroup)
}
else{
if(await alertConfirm(language.askLoadFirstMsg)){
group.chats[group.chatPage].message.push({
role:'char',
data: findCharacterbyId(res).firstMessage,
saying: res,
})
}
group.characters.push(res)
group.characterTalks.push(1 / 6 * 4)
group.characterActive.push(true)
}
}
setDatabase(db)
}
}
export function rmCharFromGroup(index:number){
let db = get(DataBase)
let selectedId = get(selectedCharID)
let group = db.characters[selectedId]
if(group.type === 'group'){
group.characters.splice(index, 1)
group.characterTalks.splice(index, 1)
group.characterActive.splice(index, 1)
setDatabase(db)
}
}
export type GroupOrder = {
id: string,
talkness: number,
index: number
}
export function groupOrder(chars:GroupOrder[], input:string):GroupOrder[] {
let order:GroupOrder[] = [];
if (input) {
const words = getWords(input)
for (const word of words) {
for (let char of chars) {
const charNameChunks = getWords(findCharacterbyId(char.id).name)
console.log(charNameChunks)
if (charNameChunks.includes(word)) {
order.push(char);
break;
}
}
}
}
const shuffled = shuffle(chars)
for (const char of shuffled) {
if(order.includes(char)){
continue
}
//TODO
const chance = 0.5
if (chance >= Math.random()) {
order.push(char);
}
}
while (order.length === 0) {
order.push(chars[Math.floor(Math.random() * chars.length)]);
}
return order;
}
function getWords(data:string){
const matches = data.match(/\b\w+\b/gmi)
let words:string[] = []
for(const match of matches){
words.push(match.toLocaleLowerCase())
}
return words
}

76
src/ts/process/index.ts
View File

@@ -13,6 +13,9 @@ import { exampleMessage } from "./exampleMessages";
import { sayTTS } from "./tts";
import { supaMemory } from "./supaMemory";
import { v4 } from "uuid";
import { cloneDeep } from "lodash";
import { groupOrder } from "./group";
import { getNameMaxTokens } from "./stringlize";
export interface OpenAIChat{
role: 'system'|'user'|'assistant'
@@ -23,7 +26,7 @@ export interface OpenAIChat{
export const doingChat = writable(false)
export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:number} = {}):Promise<boolean> {
let findCharCache:{[key:string]:character} = {}
function findCharacterbyIdwithCache(id:string){
@@ -55,11 +58,40 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
let selectedChar = get(selectedCharID)
const nowChatroom = db.characters[selectedChar]
let currentChar:character
let caculatedChatTokens = 0
if(db.aiModel.startsWith('gpt')){
caculatedChatTokens += 5
}
else{
caculatedChatTokens += 3
}
if(nowChatroom.type === 'group'){
if(chatProcessIndex === -1){
for(let i=0;i<nowChatroom.characters.length;i++){
const r = await sendChat(i)
const charNames =nowChatroom.characters.map((v) => findCharacterbyIdwithCache(v).name)
caculatedChatTokens += await getNameMaxTokens([...charNames, db.username])
const messages = nowChatroom.chats[nowChatroom.chatPage].message
const lastMessage = messages[messages.length-1]
let order = nowChatroom.characters.map((v,i) => {
return {
id: v,
talkness: nowChatroom.characterActive[i] ? nowChatroom.characterTalks[i] : -1,
index: i
}
})
if(!nowChatroom.orderByOrder){
order = groupOrder(order, lastMessage?.data).filter((v) => {
if(v.id === lastMessage?.saying){
return false
}
return true
})
}
for(let i=0;i<order.length;i++){
const r = await sendChat(order[i].index, {
chatAdditonalTokens: caculatedChatTokens
})
if(!r){
return false
}
@@ -76,7 +108,13 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
}
else{
currentChar = nowChatroom
if(!db.aiModel.startsWith('gpt')){
caculatedChatTokens += await getNameMaxTokens([currentChar.name, db.username])
}
}
let chatAdditonalTokens = arg.chatAdditonalTokens ?? caculatedChatTokens
let selectedChat = nowChatroom.chatPage
let currentChat = nowChatroom.chats[selectedChat]
@@ -103,6 +141,7 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
'authorNote':([] as OpenAIChat[]),
'lastChat':([] as OpenAIChat[]),
'description':([] as OpenAIChat[]),
'postEverything':([] as OpenAIChat[]),
}
if(!currentChar.utilityBot){
@@ -149,6 +188,13 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
content: description
})
if(nowChatroom.type === 'group'){
const systemMsg = `[Write the next reply only as ${currentChar.name}]`
unformated.postEverything.push({
role: 'system',
content: systemMsg
})
}
}
unformated.lorebook.push({
@@ -161,13 +207,13 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
return (unformated[key] as OpenAIChat[]).map((d) => {
return d.content
}).join('\n\n')
}).join('\n\n')) + db.maxResponse) + 150
}).join('\n\n')) + db.maxResponse) + 100
const examples = exampleMessage(currentChar)
for(const example of examples){
currentTokens += await tokenize(example.content) + 5
currentTokens += await tokenize(example.content) + chatAdditonalTokens
}
let chats:OpenAIChat[] = examples
@@ -217,20 +263,11 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
memo: msg.chatId,
name: name
})
currentTokens += (await tokenize(formedChat) + 5)
}
if(nowChatroom.type === 'group'){
const systemMsg = `[Write the next reply only as ${currentChar.name}]`
chats.push({
role: 'system',
content: systemMsg
})
currentTokens += (await tokenize(systemMsg) + 5)
currentTokens += (await tokenize(formedChat) + chatAdditonalTokens)
}
if(nowChatroom.supaMemory && db.supaMemoryType !== 'none'){
const sp = await supaMemory(chats, currentTokens, maxContextTokens, currentChat, nowChatroom)
const sp = await supaMemory(chats, currentTokens, maxContextTokens, currentChat, nowChatroom, chatAdditonalTokens)
if(sp.error){
alertError(sp.error)
return false
@@ -248,11 +285,10 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
return false
}
currentTokens -= (await tokenize(chats[0].content) + 5)
currentTokens -= (await tokenize(chats[0].content) + chatAdditonalTokens)
chats.splice(0, 1)
}
currentChat.lastMemory = chats[0].memo
console.log(currentChat.lastMemory)
}
let bias:{[key:number]:number} = {}
@@ -283,7 +319,8 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
//make into one
let formated:OpenAIChat[] = []
const formatOrder = db.formatingOrder
const formatOrder = cloneDeep(db.formatingOrder)
formatOrder.push('postEverything')
let sysPrompts:string[] = []
for(let i=0;i<formatOrder.length;i++){
const cha = unformated[formatOrder[i]]
@@ -443,7 +480,6 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
},
]
console.log('requesting chat')
const rq = await requestChatData({
formated: promptbody,
bias: emobias,

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

@@ -60,7 +60,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
case 'gpt4_32k':{
for(let i=0;i<formated.length;i++){
if(arg.isGroupChat){
if(arg.isGroupChat && formated[i].name){
formated[i].content = formated[i].name + ": " + formated[i].content
}
formated[i].name = undefined

12
src/ts/process/stringlize.ts
View File

@@ -1,4 +1,5 @@
import type { OpenAIChat } from ".";
import { tokenize } from "../tokenizer";
export function multiChatReplacer(){
@@ -52,4 +53,15 @@ export function unstringlizeChat(text:string, formated:OpenAIChat[], char:string
}
return text
}
export async function getNameMaxTokens(names:string[]){
let maxCharNameTokens = 0
for(const name of names){
const tokens = await tokenize(name + ': ') + 1
if(maxCharNameTokens < tokens){
maxCharNameTokens = tokens
}
}
return maxCharNameTokens
}

22
src/ts/process/supaMemory.ts
View File

@@ -5,9 +5,17 @@ import { tokenize } from "../tokenizer";
import { findCharacterbyId } from "../util";
import { requestChatData } from "./request";
export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxContextTokens:number,room:Chat,char:character|groupChat): Promise<{ currentTokens: number; chats: OpenAIChat[]; error?:string; memory?:string;lastId?:string}>{
export async function supaMemory(
chats:OpenAIChat[],
currentTokens:number,
maxContextTokens:number,
room:Chat,
char:character|groupChat,
chatAdditonalTokens:number
): Promise<{ currentTokens: number; chats: OpenAIChat[]; error?:string; memory?:string;lastId?:string}>{
const db = get(DataBase)
console.log("Memory: " + currentTokens)
currentTokens += 10
if(currentTokens > maxContextTokens){
let coIndex = -1
@@ -19,7 +27,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
}
if(coIndex !== -1){
for(let i=0;i<coIndex;i++){
currentTokens -= (await tokenize(chats[0].content) + 1)
currentTokens -= (await tokenize(chats[0].content) + chatAdditonalTokens)
chats.splice(0, 1)
}
}
@@ -45,13 +53,13 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
lastId = id
break
}
currentTokens -= (await tokenize(chats[0].content) + 1)
currentTokens -= (await tokenize(chats[0].content) + chatAdditonalTokens)
chats.splice(0, 1)
i += 1
}
supaMemory = data
currentTokens += await tokenize(supaMemory) + 1
currentTokens += await tokenize(supaMemory) + chatAdditonalTokens
}
@@ -171,7 +179,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
}
continue
}
const tokens = await tokenize(cont.content) + 5
const tokens = await tokenize(cont.content) + chatAdditonalTokens
if((chunkSize + tokens) > maxChunkSize){
if(stringlizedChat === ''){
stringlizedChat += `${cont.role === 'assistant' ? char.type === 'group' ? '' : char.name : db.username}: ${cont.content}\n\n`
@@ -193,7 +201,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
return result
}
const tokenz = await tokenize(result + '\n\n') + 5
const tokenz = await tokenize(result + '\n\n') + chatAdditonalTokens
currentTokens += tokenz
supaMemory += result.replace(/\n+/g,'\n') + '\n\n'

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

@@ -353,6 +353,8 @@ export interface groupChat{
name:string
viewScreen: 'single'|'multiple'|'none'|'emp',
characters:string[]
characterTalks:number[]
characterActive:boolean[]
globalLore: loreBook[]
autoMode: boolean
useCharacterLore :boolean
@@ -367,6 +369,7 @@ export interface groupChat{
supaMemory?:boolean
ttsMode?:string
suggestMessages?:string[]
orderByOrder?:boolean
}
export interface botPreset{
@@ -522,7 +525,7 @@ interface sdConfig{
hr_upscaler:string
}
export type FormatingOrderItem = 'main'|'jailbreak'|'chats'|'lorebook'|'globalNote'|'authorNote'|'lastChat'|'description'
export type FormatingOrderItem = 'main'|'jailbreak'|'chats'|'lorebook'|'globalNote'|'authorNote'|'lastChat'|'description'|'postEverything'
export interface Chat{
message: Message[]