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

Fix some of the logic for generation aborting

Browse Source
This commit is contained in:
Gnome Ann
2022-01-10 17:09:47 -05:00
parent 902b6b0cee
commit 43586c8f60
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aiserver.py
View File

@@ -1708,8 +1708,9 @@ def get_message(msg):
# Submit action
if(msg['cmd'] == 'submit'):
if(vars.mode == "play"):
if(vars.aibusy and msg.get('allowabort', False)):
vars.abort = True
if(vars.aibusy):
if(msg.get('allowabort', False)):
vars.abort = True
return
vars.abort = False
vars.lua_koboldbridge.feedback = None
@@ -1727,8 +1728,9 @@ def get_message(msg):
memsubmit(msg['data'])
# Retry Action
elif(msg['cmd'] == 'retry'):
if(vars.aibusy and msg.get('allowabort', False)):
vars.abort = True
if(vars.aibusy):
if(msg.get('allowabort', False)):
vars.abort = True
return
vars.abort = False
if(vars.chatmode):

2
static/application.js
View File

@@ -799,7 +799,7 @@ function formatChunkInnerText(chunk) {
function dosubmit(disallow_abort) {
var txt = input_text.val().replace(/\u00a0/g, " ");
if(gamestate !== "wait" && !memorymode && !gamestarted && ((!adventure || !action_mode) && txt.trim().length == 0)) {
if((disallow_abort || gamestate !== "wait") && !memorymode && !gamestarted && ((!adventure || !action_mode) && txt.trim().length == 0)) {
return;
}
input_text.val("");

2
templates/index.html
View File

@@ -17,7 +17,7 @@
<script src="static/bootstrap.min.js"></script>
<script src="static/bootstrap-toggle.min.js"></script>
<script src="static/rangy-core.min.js"></script>
<script src="static/application.js?ver=1.16.4w"></script>
<script src="static/application.js?ver=1.16.4x"></script>
</head>
<body>
<input type="file" id="remote-save-select" accept="application/json" style="display:none">