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

Retry Bug Fix

This commit is contained in:
ebolam 2022-03-12 10:32:27 -05:00
parent ae854bab3d
commit b55e5a8e0b
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aiserver.py
View File

@ -2314,7 +2314,7 @@ def get_message(msg):
actionretry(msg['data']) actionretry(msg['data'])
# Back/Undo Action # Back/Undo Action
elif(msg['cmd'] == 'back'): elif(msg['cmd'] == 'back'):
actionback() ignore = actionback()
# Forward/Redo Action # Forward/Redo Action
elif(msg['cmd'] == 'redo'): elif(msg['cmd'] == 'redo'):
actionredo() actionredo()
@ -2851,31 +2851,7 @@ def actionretry(data):
if(vars.noai): if(vars.noai):
emit('from_server', {'cmd': 'errmsg', 'data': "Retry function unavailable in Read Only mode."}) emit('from_server', {'cmd': 'errmsg', 'data': "Retry function unavailable in Read Only mode."})
return return
if(vars.aibusy): if actionback():
return
if(vars.recentrng is not None):
randomGameRequest(vars.recentrng, memory=vars.recentrngm)
return
# Remove last action if possible and resubmit
if(vars.gamestarted if vars.useprompt else len(vars.actions) > 0):
if(not vars.recentback and len(vars.actions) != 0 and len(vars.genseqs) == 0): # Don't pop if we're in the "Select sequence to keep" menu or if there are no non-prompt actions
# We are going to move the selected text to alternative text in the actions_metadata variable so we can redo this action
vars.actions_metadata[vars.actions.get_last_key() ]['Alternative Text'] = [{'Text': vars.actions_metadata[vars.actions.get_last_key() ]['Selected Text'],
'Pinned': False,
"Previous Selection": True,
"Edited": False}] + vars.actions_metadata[vars.actions.get_last_key() ]['Alternative Text']
vars.actions_metadata[vars.actions.get_last_key()]['Selected Text'] = ""
last_key = vars.actions.get_last_key()
vars.actions.pop()
remove_story_chunk(last_key + 1)
#for the redo to not get out of whack, need to reset the max # in the actions sequence
vars.actions.set_next_id(last_key)
vars.recentback = False
vars.recentedit = False
vars.lua_koboldbridge.feedback = None
actionsubmit("", actionmode=vars.actionmode, force_submit=True) actionsubmit("", actionmode=vars.actionmode, force_submit=True)
send_debug() send_debug()
elif(not vars.useprompt): elif(not vars.useprompt):
@ -2902,11 +2878,15 @@ def actionback():
remove_story_chunk(last_key + 1) remove_story_chunk(last_key + 1)
#for the redo to not get out of whack, need to reset the max # in the actions sequence #for the redo to not get out of whack, need to reset the max # in the actions sequence
vars.actions.set_next_id(last_key) vars.actions.set_next_id(last_key)
success = True
elif(len(vars.genseqs) == 0): elif(len(vars.genseqs) == 0):
emit('from_server', {'cmd': 'errmsg', 'data': "Cannot delete the prompt."}) emit('from_server', {'cmd': 'errmsg', 'data': "Cannot delete the prompt."})
success = False
else: else:
vars.genseqs = [] vars.genseqs = []
success = True
send_debug() send_debug()
return success
def actionredo(): def actionredo():
i = 0 i = 0