Merge branch 'main' of https://github.com/kwaroran/RisuAI

2025-02-15 21:32:11 +09:00
parent d2fce340bb 089698a489
commit dcc7c56726
27 changed files with 1264 additions and 496 deletions
--- a/src/ts/parser.svelte.ts
+++ b/src/ts/parser.svelte.ts
@@ -10,7 +10,7 @@ import { SizeStore, selectedCharID } from './stores.svelte';
 import { calcString } from './process/infunctions';
 import { findCharacterbyId, getPersonaPrompt, getUserIcon, getUserName, parseKeyValue, sfc32, sleep, uuidtoNumber } from './util';
 import { getInlayAsset } from './process/files/inlays';
-import { getModuleAssets, getModuleLorebooks } from './process/modules';
+import { getModuleAssets, getModuleLorebooks, getModules } from './process/modules';
 import type { OpenAIChat } from './process/index.svelte';
 import hljs from 'highlight.js/lib/core'
 import 'highlight.js/styles/atom-one-dark.min.css'
@@ -292,9 +292,38 @@ async function renderHighlightableMarkdown(data:string) {

 }

-
 export const assetRegex = /{{(raw|path|img|image|video|audio|bg|emotion|asset|video-img|source)::(.+?)}}/gms

+async function replaceAsync(string, regexp, replacerFunction) {
+    const replacements = await Promise.all(
+        Array.from(string.matchAll(regexp),
+            match => replacerFunction(...match as any)))
+    let i = 0;
+    return string.replace(regexp, () => replacements[i++])
+}
+
+async function getAssetSrc(assetArr: string[][], name: string, assetPaths: {[key: string]:{path: string, ext?: string}}) {
+    name = name.toLocaleLowerCase()
+    for (const asset of assetArr) {
+        if (trimmer(asset[0].toLocaleLowerCase()) !== trimmer(name)) continue
+        const assetPath = await getFileSrc(asset[1])
+        assetPaths[asset[0].toLocaleLowerCase()] = {
+            path: assetPath,
+            ext: asset[2]
+        }
+        return
+    }
+}
+
+async function getEmoSrc(emoArr: string[][], emoPaths: {[key: string]:{path: string}}) {
+    for (const emo of emoArr) {
+        const emoPath = await getFileSrc(emo[1])
+        emoPaths[emo[0].toLocaleLowerCase()] = {
+            path: emoPath,
+        }
+    }
+}
+
 async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|character, mode:'normal'|'back', mode2:'unset'|'pre'|'post' = 'unset'){
    const assetWidthString = (DBState.db.assetWidth && DBState.db.assetWidth !== -1 || DBState.db.assetWidth === 0) ? `max-width:${DBState.db.assetWidth}rem;` : ''

@@ -306,37 +335,20 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
        path:string
    }} = {}

-    if(char.additionalAssets){
-        for(const asset of char.additionalAssets){
-            const assetPath = await getFileSrc(asset[1])
-            assetPaths[asset[0].toLocaleLowerCase()] = {
-                path: assetPath,
-                ext: asset[2]
-            }
-        }
-    }
-    if(char.emotionImages){
-        for(const emo of char.emotionImages){
-            const emoPath = await getFileSrc(emo[1])
-            emoPaths[emo[0].toLocaleLowerCase()] = {
-                path: emoPath,
-            }
-        }
-    }
-    const moduleAssets = getModuleAssets()
-    if(moduleAssets.length > 0){
-        for(const asset of moduleAssets){
-            const assetPath = await getFileSrc(asset[1])
-            assetPaths[asset[0].toLocaleLowerCase()] = {
-                path: assetPath,
-                ext: asset[2]
-            }
-        }
-    }
+    if (char.emotionImages) await getEmoSrc(char.emotionImages, emoPaths)
+
    const videoExtention = ['mp4', 'webm', 'avi', 'm4p', 'm4v']
    let needsSourceAccess = false
-    data = data.replaceAll(assetRegex, (full:string, type:string, name:string) => {
-        name = name.toLocaleLowerCase()
+
+    data = await replaceAsync(data, assetRegex, async (full:string, type:string, name:string) => {
+        const moduleAssets = getModuleAssets()
+        if (char.additionalAssets) {
+            await getAssetSrc(char.additionalAssets, name, assetPaths)
+        }
+        if (moduleAssets.length > 0) {
+            await getAssetSrc(moduleAssets, name, assetPaths)
+        }
+
        if(type === 'emotion'){
            const path = emoPaths[name]?.path
            if(!path){
@@ -344,6 +356,7 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
            }
            return `<img src="${path}" alt="${path}" style="${assetWidthString} "/>`
        }
+
        if(type === 'source'){
            needsSourceAccess = true
            switch(name){
@@ -355,13 +368,15 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
                }
            }
        }
+
        let path = assetPaths[name]
+
        if(!path){
            if(DBState.db.legacyMediaFindings){
                return ''
            }

-            path = getClosestMatch(name, assetPaths)
+            path = await getClosestMatch(char, name, assetPaths)

            if(!path){
                return ''
@@ -411,63 +426,72 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
    return data
 }

-function getClosestMatch(name:string, assetPaths:{[key:string]:{path:string, ext?:string}}){
-    
-    if(Object.keys(assetPaths).length === 0){
-        return null
-    }
-
-    //Levenshtein distance, new with 1d array
-    const dest = (a:string, b:string) => {
-        const h = a.length + 1
-        const w = b.length + 1
-        let d = new Int16Array(h * w)
-        for(let i=0;i<h;i++){
-            d[i * w] = i
-        }
-        for(let i=0;i<w;i++){
-            d[i] = i
-        }
-        for(let i=1; i<h; i++){
-            for(let j=1;j<w;j++){
-                d[i * w + j] = Math.min(
-                    d[(i-1) * w + j-1] + (a.charAt(i-1)===b.charAt(j-1) ? 0 : 1),
-                    d[(i-1) * w + j]+1, d[i * w + j-1]+1
-                )
-            }
-        }
-        return d[h * w - 1]
-
-    }
-
-    function trimmer(str:string){
-        const ext = ['webp', 'png', 'jpg', 'jpeg', 'gif', 'mp4', 'webm', 'avi', 'm4p', 'm4v', 'mp3', 'wav', 'ogg']
-        for(const e of ext){
-            if(str.endsWith('.' + e)){
-                str = str.substring(0, str.length - e.length - 1)
-            }
-        }
-
-
-        return str.trim().replace(/[_ -.]/g, '')
-    }
+async function getClosestMatch(char: simpleCharacterArgument|character, name:string, assetPaths:{[key:string]:{path:string, ext?:string}}){   
+    if(!char.additionalAssets) return null

    let closest = ''
    let closestDist = 999999
+    let targetPath = ''
+    let targetExt = ''
+
    const trimmedName = trimmer(name)
-    for(const key in assetPaths){
-        const dist = dest(trimmedName, trimmer(key))
+    for(const asset of char.additionalAssets) {
+        const key = asset[0].toLocaleLowerCase()
+        const dist = getDistance(trimmedName, trimmer(key))
        if(dist < closestDist){
            closest = key
            closestDist = dist
+            targetPath = asset[1]
+            targetExt = asset[2]
        }
    }
+    
    if(closestDist > DBState.db.assetMaxDifference){
        return null
    }
+
+    const assetPath = await getFileSrc(targetPath)
+    assetPaths[closest] = {
+        path: assetPath,
+        ext: targetExt
+    }
+
    return assetPaths[closest]
 }

+//Levenshtein distance, new with 1d array
+function getDistance(a:string, b:string) {
+    const h = a.length + 1
+    const w = b.length + 1
+    let d = new Int16Array(h * w)
+    for(let i=0;i<h;i++){
+        d[i * w] = i
+    }
+    for(let i=0;i<w;i++){
+        d[i] = i
+    }
+    for(let i=1; i<h; i++){
+        for(let j=1;j<w;j++){
+            d[i * w + j] = Math.min(
+                d[(i-1) * w + j-1] + (a.charAt(i-1)===b.charAt(j-1) ? 0 : 1),
+                d[(i-1) * w + j]+1, d[i * w + j-1]+1
+            )
+        }
+    }
+    return d[h * w - 1]
+}
+
+function trimmer(str:string){
+    const ext = ['webp', 'png', 'jpg', 'jpeg', 'gif', 'mp4', 'webm', 'avi', 'm4p', 'm4v', 'mp3', 'wav', 'ogg']
+    for(const e of ext){
+        if(str.endsWith('.' + e)){
+            str = str.substring(0, str.length - e.length - 1)
+        }
+    }
+
+    return str.trim().replace(/[_ -.]/g, '')
+}
+
 async function parseInlayAssets(data:string){
    const inlayMatch = data.match(/{{(inlay|inlayed)::(.+?)}}/g)
    if(inlayMatch){
@@ -605,7 +629,6 @@ function decodeStyleRule(rule:CssAtRuleAST){
 }

 function decodeStyle(text:string){
-
    return text.replaceAll(styleDecodeRegex, (full, txt:string) => {
        try {
            let text = Buffer.from(txt, 'hex').toString('utf-8')
@@ -1508,16 +1531,13 @@ function basicMatcher (p1:string,matcherArg:matcherArg,vars:{[key:string]:string
                    return dateTimeFormat(arra[1],t)
                }
                case 'module_enabled':{
-                    const selchar = db.characters[get(selectedCharID)]
-                    let enabledChatModules:string[] = []
-                    if(!selchar){
-                        enabledChatModules = selchar.chats[selchar.chatPage].modules ?? []
-
+                    const modules = getModules()
+                    for(const module of modules){
+                        if(module.namespace === arra[1]){
+                            return '1'
+                        }
                    }
-                    const moduleId = db.modules.find((f) => {
-                        return f.name === arra[1]
-                    }).id
-                    return (db.enabledModules.includes(moduleId) || enabledChatModules.includes(moduleId)) ? '1' : '0'
+                    return '0'
                }
                case 'filter':{
                    const array = parseArray(arra[1])
--- a/src/ts/process/lua.ts
+++ b/src/ts/process/lua.ts
@@ -419,6 +419,64 @@ export async function runLua(code:string, arg:{
                return true
            })

+            luaEngine.global.set('axLLMMain', async (id:string, promptStr:string) => {
+                let prompt:{
+                    role: string,
+                    content: string
+                }[] = JSON.parse(promptStr)
+                if(!LuaLowLevelIds.has(id)){
+                    return
+                }
+                let promptbody:OpenAIChat[] = prompt.map((dict) => {
+                    let role:'system'|'user'|'assistant' = 'assistant'
+                    switch(dict['role']){
+                        case 'system':
+                        case 'sys':
+                            role = 'system'
+                            break
+                        case 'user':
+                            role = 'user'
+                            break
+                        case 'assistant':
+                        case 'bot':
+                        case 'char':{
+                            role = 'assistant'
+                            break
+                        }
+                    }
+
+                    return {
+                        content: dict['content'] ?? '',
+                        role: role,
+                    }
+                })
+                const result = await requestChatData({
+                    formated: promptbody,
+                    bias: {},
+                    useStreaming: false,
+                    noMultiGen: true,
+                }, 'otherAx')
+
+                if(result.type === 'fail'){
+                    return JSON.stringify({
+                        success: false,
+                        result: 'Error: ' + result.result
+                    })
+                }
+
+                if(result.type === 'streaming' || result.type === 'multiline'){
+                    return JSON.stringify({
+                        success: false,
+                        result: result.result
+                    })
+                }
+
+                return JSON.stringify({
+                    success: true,
+                    result: result.result
+                })
+            })
+
            await luaEngine.doString(luaCodeWarper(code))
            luaEngineState.code = code
        }
@@ -538,6 +596,10 @@ function LLM(id, prompt)
    return json.decode(LLMMain(id, json.encode(prompt)):await())
 end

+function axLLM(id, prompt)
+    return json.decode(axLLMMain(id, json.encode(prompt)):await())
+end
+
 local editRequestFuncs = {}
 local editDisplayFuncs = {}
 local editInputFuncs = {}
--- a/src/ts/process/memory/hypamemory.ts
+++ b/src/ts/process/memory/hypamemory.ts
@@ -106,7 +106,7 @@ export class HypaProcesser{
    
    
        if(!gf.ok){
-            throw gf.data
+            throw JSON.stringify(gf.data)
        }
    
        const result:number[][] = []
--- a/src/ts/process/memory/hypav3.ts
+++ b/src/ts/process/memory/hypav3.ts
@@ -421,6 +421,12 @@ export async function hypaMemoryV3(
        continue;
      }

+      if (db.hypaV3Settings.doNotSummarizeUserMessage && chat.role === "user") {
+        console.log(`[HypaV3] Skipping user role at index ${i}`);
+
+        continue;
+      }
+
      toSummarize.push(chat);
    }

@@ -436,23 +442,25 @@ export async function hypaMemoryV3(
    }

    // Attempt summarization
-    const summarizeResult = await retryableSummarize(toSummarize);
+    if (toSummarize.length > 0) {
+      const summarizeResult = await retryableSummarize(toSummarize);

-    if (!summarizeResult.success) {
-      return {
-        currentTokens,
-        chats,
-        error: `[HypaV3] Summarization failed after maximum retries: ${summarizeResult.data}`,
-        memory: toSerializableHypaV3Data(data),
-      };
+      if (!summarizeResult.success) {
+        return {
+          currentTokens,
+          chats,
+          error: `[HypaV3] Summarization failed after maximum retries: ${summarizeResult.data}`,
+          memory: toSerializableHypaV3Data(data),
+        };
+      }
+
+      data.summaries.push({
+        text: summarizeResult.data,
+        chatMemos: new Set(toSummarize.map((chat) => chat.memo)),
+        isImportant: false,
+      });
    }

-    data.summaries.push({
-      text: summarizeResult.data,
-      chatMemos: new Set(toSummarize.map((chat) => chat.memo)),
-      isImportant: false,
-    });
-
    currentTokens -= toSummarizeTokens;
    startIdx = endIdx;
  }
@@ -469,6 +477,37 @@ export async function hypaMemoryV3(
    availableMemoryTokens
  );

+  // Early return if no summaries
+  if (data.summaries.length === 0) {
+    // Generate final memory prompt
+    const memory = encapsulateMemoryPrompt("");
+
+    const newChats: OpenAIChat[] = [
+      {
+        role: "system",
+        content: memory,
+        memo: "supaMemory",
+      },
+      ...chats.slice(startIdx),
+    ];
+
+    console.log(
+      "[HypaV3] Exiting function:",
+      "\nCurrent Tokens:",
+      currentTokens,
+      "\nAll chats, including memory prompt:",
+      newChats,
+      "\nMemory Data:",
+      data
+    );
+
+    return {
+      currentTokens,
+      chats: newChats,
+      memory: toSerializableHypaV3Data(data),
+    };
+  }
+
  const selectedSummaries: Summary[] = [];
  const randomMemoryRatio =
    1 -
--- a/src/ts/process/modules.ts
+++ b/src/ts/process/modules.ts
@@ -24,6 +24,7 @@ export interface RisuModule{
    backgroundEmbedding?:string
    assets?:[string,string,string][]
    namespace?:string
+    customModuleToggle?:string
 }

 export async function exportModule(module:RisuModule, arg:{
@@ -267,7 +268,20 @@ function getModuleByIds(ids:string[]){
            modules.push(module)
        }
    }
-    return modules
+    return deduplicateModuleById(modules)
+}
+
+function deduplicateModuleById(modules:RisuModule[]){
+    let ids:string[] = []
+    let newModules:RisuModule[] = []
+    for(let i=0;i<modules.length;i++){
+        if(ids.includes(modules[i].id)){
+            continue
+        }
+        ids.push(modules[i].id)
+        newModules.push(modules[i])
+    }
+    return newModules
 }

 let lastModules = ''
@@ -279,6 +293,10 @@ export function getModules(){
    if (currentChat){
        ids = ids.concat(currentChat.modules ?? [])
    }
+    if(db.moduleIntergration){
+        const intList = db.moduleIntergration.split(',').map((s) => s.trim())
+        ids = ids.concat(intList)
+    }
    const idsJoined = ids.join('-')
    if(lastModules === idsJoined){
        return lastModuleData
@@ -352,6 +370,20 @@ export function getModuleRegexScripts() {
    return customscripts
 }

+export function getModuleToggles() {
+    const modules = getModules()
+    let costomModuleToggles: string = ''
+    for (const module of modules) {
+        if(!module){
+            continue
+        }
+        if (module.customModuleToggle) {
+            costomModuleToggles += '\n' + module.customModuleToggle + '\n'
+        }
+    }
+    return costomModuleToggles
+}
+
 export async function applyModule() {
    const sel = await alertModuleSelect()
    if (!sel) {
@@ -425,4 +457,9 @@ export function moduleUpdate(){
        ReloadGUIPointer.set(get(ReloadGUIPointer) + 1)
        lastModuleIds = ids
    }
+}
+
+export function refreshModules(){
+    lastModules = ''
+    lastModuleData = []
 }
--- a/src/ts/process/triggers.ts
+++ b/src/ts/process/triggers.ts
@@ -152,6 +152,12 @@ export interface triggerEffectRunLLM{
    inputVar: string
 }

+export interface triggerEffectRunAxLLM{
+    type: 'runAxLLM',
+    value: string,
+    inputVar: string
+}
+
 export type additonalSysPrompt = {
    start:string,
    historyend: string,
@@ -1033,6 +1039,7 @@ export async function runTrigger(char:character,mode:triggerMode, arg:{
                    setVar(effect.inputVar, res)
                    break
                }
+
                case 'triggerlua':{
                    const triggerCodeResult = await runLua(effect.code,{
                        lowLevelAccess: trigger.lowLevelAccess,
--- a/src/ts/storage/database.svelte.ts
+++ b/src/ts/storage/database.svelte.ts
@@ -474,13 +474,14 @@ export function setDatabase(data:Database){
    data.reasoningEffort ??= 0
    data.hypaV3Settings = {
        memoryTokensRatio: data.hypaV3Settings?.memoryTokensRatio ?? 0.2,
-        extraSummarizationRatio: data.hypaV3Settings?.extraSummarizationRatio ?? 0.2,
+        extraSummarizationRatio: data.hypaV3Settings?.extraSummarizationRatio ?? 0,
        maxChatsPerSummary: data.hypaV3Settings?.maxChatsPerSummary ?? 4,
        recentMemoryRatio: data.hypaV3Settings?.recentMemoryRatio ?? 0.4,
        similarMemoryRatio: data.hypaV3Settings?.similarMemoryRatio ?? 0.4,
        enableSimilarityCorrection: data.hypaV3Settings?.enableSimilarityCorrection ?? false,
        preserveOrphanedMemory: data.hypaV3Settings?.preserveOrphanedMemory ?? false,
-        processRegexScript: data.hypaV3Settings?.processRegexScript ?? false
+        processRegexScript: data.hypaV3Settings?.processRegexScript ?? false,
+        doNotSummarizeUserMessage: data.hypaV3Settings?.doNotSummarizeUserMessage ?? false
    }
    changeLanguage(data.language)
    setDatabaseLite(data)
@@ -894,6 +895,7 @@ export interface Database{
        enableSimilarityCorrection: boolean
        preserveOrphanedMemory: boolean
        processRegexScript: boolean
+        doNotSummarizeUserMessage: boolean
    },
    OaiCompAPIKeys: {[key:string]:string}
    inlayErrorResponse:boolean
--- a/src/ts/stores.svelte.ts
+++ b/src/ts/stores.svelte.ts
@@ -115,6 +115,7 @@ $effect.root(() => {
        DBState?.db?.characters?.[selIdState.selId]?.chats?.[DBState?.db?.characters?.[selIdState.selId]?.chatPage]?.modules?.length
        DBState?.db?.characters?.[selIdState.selId]?.hideChatIcon
        DBState?.db?.characters?.[selIdState.selId]?.backgroundHTML
+        DBState?.db?.moduleIntergration
        moduleUpdate()
    })
 })
--- a/src/ts/translator/translator.ts
+++ b/src/ts/translator/translator.ts
@@ -231,7 +231,9 @@ export async function translateHTML(html: string, reverse:boolean, charArg:simpl
    let DoingChat = get(doingChat)
    if(DoingChat){
        if(isExpTranslator()){
-            return html
+            if(!(db.translatorType === 'llm' && await getLLMCache(html) !== null)){
+                return html
+            }
        }
    }
    if(db.translatorType === 'llm'){