rixty
/
KoboldAI-Client
mirror of https://github.com/KoboldAI/KoboldAI-Client.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Handle nested wrapped functions in bridge.lua properly

This commit is contained in:
Gnome Ann 2021-12-12 11:30:04 -05:00
parent 00eb125ad0
commit 09df371d99
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bridge.lua
View File

@ -78,6 +78,8 @@ return function(_python, _bridged)
-- metatables prior to executing the function body -- metatables prior to executing the function body
--========================================================================== --==========================================================================
local wrapped = false
---@class Metatables ---@class Metatables
local metatables = {} local metatables = {}
local type_map = { local type_map = {
@ -111,10 +113,18 @@ return function(_python, _bridged)
function metawrapper.__newindex(t, k, v) function metawrapper.__newindex(t, k, v)
if type(v) == "function" then if type(v) == "function" then
return rawset(t, k, function(...) return rawset(t, k, function(...)
metatables:overwrite() local _needs_unwrap = false
metatables_original:restore() if not wrapped then
metatables:overwrite()
metatables_original:restore()
_needs_unwrap = true
wrapped = true
end
local r = {v(...)} local r = {v(...)}
metatables:restore() if _needs_unwrap then
metatables:restore()
wrapped = false
end
return table.unpack(r) return table.unpack(r)
end) end)
else else