rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-01-05 21:07:08 +01:00
Code Issues Projects Releases Wiki Activity

Passthrough userscript loading errors

Browse Source
This commit is contained in:
Gnome Ann 2021-12-31 22:02:24 -05:00
parent b88d49e359
commit 3a243f9eed
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bridge.lua
View File

@ -1860,8 +1860,13 @@ return function(_python, _bridged)
bridged.load_callback(filename, modulenames[i])
koboldbridge.logging_name = modulenames[i]
koboldbridge.filename = filename
local f, err = old_loadfile(join_folder_and_filename(bridged.userscript_path, filename), "t", koboldbridge.get_universe(filename))
if err ~= nil then
error(err)
return
end
---@type KoboldUserScript
local _userscript = old_loadfile(join_folder_and_filename(bridged.userscript_path, filename), "t", koboldbridge.get_universe(filename))()
local _userscript = f()
koboldbridge.logging_name = nil
koboldbridge.filename = nil
local userscript = deepcopy(KoboldUserScriptModule)
@ -1900,8 +1905,13 @@ return function(_python, _bridged)
---@return nil
function koboldbridge.load_corescript(filename)
local f, err = old_loadfile(join_folder_and_filename(bridged.corescript_path, filename), "t", koboldbridge.get_universe(0))
if err ~= nil then
error(err)
return
end
---@type KoboldCoreScript
local corescript = old_loadfile(join_folder_and_filename(bridged.corescript_path, filename), "t", koboldbridge.get_universe(0))()
local corescript = f()
koboldbridge.inmod = corescript.inmod
koboldbridge.genmod = corescript.genmod
koboldbridge.outmod = corescript.outmod