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

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 = {}