From 9559347f82529f43a0a2f239b7830722c66b93f3 Mon Sep 17 00:00:00 2001
From: Javalar <39832337+Javalar@users.noreply.github.com>
Date: Tue, 15 Jun 2021 00:59:08 -0400
Subject: [PATCH] Update or remove targeted chunks in Game Screen (#2)
---
.gitignore | 8 +++++-
aiserver.py | 59 +++++++++++++++++++++++++++++++++----------
static/application.js | 33 ++++++++++++++++++++++++
3 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index ff83d6e7..33d3c719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,10 @@ client.settings
# Ignore stories file except for test_story
stories/*
-!stories/sample_story.json
\ No newline at end of file
+!stories/sample_story.json
+
+# Ignore PyCharm project files.
+.idea
+
+# Ignore compiled Python files.
+*.pyc
diff --git a/aiserver.py b/aiserver.py
index 8dcec2af..c6b27672 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -9,6 +9,8 @@ from os import path, getcwd
import tkinter as tk
from tkinter import messagebox
import json
+from typing import Literal, Union
+
import requests
import html
@@ -666,12 +668,12 @@ def actionsubmit(data):
data = applyinputformatting(data)
# Store the result in the Action log
vars.actions.append(data)
-
+ update_story_chunk('last')
+
if(not vars.noai):
# Off to the tokenizer!
calcsubmit(data)
else:
- refresh_story()
set_aibusy(0)
#==================================================================#
@@ -687,7 +689,7 @@ def actionretry(data):
# Remove last action if possible and resubmit
if(len(vars.actions) > 0):
vars.actions.pop()
- refresh_story()
+ remove_story_chunk(len(vars.actions) + 1)
calcsubmit('')
#==================================================================#
@@ -698,8 +700,9 @@ def actionback():
return
# Remove last index of actions and refresh game screen
if(len(vars.actions) > 0):
+ action_index = len(vars.actions)
vars.actions.pop()
- refresh_story()
+ remove_story_chunk(len(vars.actions) + 1)
#==================================================================#
# Take submitted text and build the text to be given to generator
@@ -936,7 +939,7 @@ def genresult(genout):
# Add formatted text to Actions array and refresh the game screen
vars.actions.append(genout)
- refresh_story()
+ update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)})
#==================================================================#
@@ -955,9 +958,6 @@ def genselect(genout):
# Send sequences to UI for selection
emit('from_server', {'cmd': 'genseqs', 'data': genout})
-
- # Refresh story for any input text
- refresh_story()
#==================================================================#
# Send selected sequence to action log and refresh UI
@@ -966,7 +966,7 @@ def selectsequence(n):
if(len(vars.genseqs) == 0):
return
vars.actions.append(vars.genseqs[int(n)]["generated_text"])
- refresh_story()
+ update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)})
emit('from_server', {'cmd': 'hidegenseqs', 'data': ''})
vars.genseqs = []
@@ -1096,6 +1096,39 @@ def refresh_story():
text_parts.extend(('', html.escape(item), ''))
emit('from_server', {'cmd': 'updatescreen', 'data': formatforhtml(''.join(text_parts))})
+
+#==================================================================#
+# Signals the Game Screen to update one of the chunks
+#==================================================================#
+def update_story_chunk(idx: Union[int, Literal['last']]):
+ if idx == 'last':
+ if len(vars.actions) <= 1:
+ # In this case, we are better off just refreshing the whole thing as the
+ # prompt might not have been shown yet (with a "Generating story..."
+ # messsage instead).
+ refresh_story()
+ return
+
+ idx = len(vars.actions)
+
+ if idx == 0:
+ text = vars.prompt
+ else:
+ # Actions are 0 based, but in chunks 0 is the prompt.
+ # So the chunk index is one more than the corresponding action index.
+ text = vars.actions[idx - 1]
+
+ chunk_text = f'{formatforhtml(html.escape(text))}'
+ emit('from_server', {'cmd': 'updatechunk', 'data': {'index': idx, 'html': chunk_text, 'last': (idx == len(vars.actions))}})
+
+
+#==================================================================#
+# Signals the Game Screen to remove one of the chunks
+#==================================================================#
+def remove_story_chunk(idx: int):
+ emit('from_server', {'cmd': 'removechunk', 'data': idx})
+
+
#==================================================================#
# Sends the current generator settings to the Game Menu
#==================================================================#
@@ -1161,7 +1194,7 @@ def editsubmit(data):
vars.actions[vars.editln-1] = data
vars.mode = "play"
- refresh_story()
+ update_story_chunk(vars.editln)
emit('from_server', {'cmd': 'texteffect', 'data': vars.editln})
emit('from_server', {'cmd': 'editmode', 'data': 'false'})
@@ -1176,7 +1209,7 @@ def deleterequest():
else:
del vars.actions[vars.editln-1]
vars.mode = "play"
- refresh_story()
+ remove_story_chunk(vars.editln)
emit('from_server', {'cmd': 'editmode', 'data': 'false'})
#==================================================================#
@@ -1382,7 +1415,7 @@ def ikrequest(txt):
genout = req.json()["data"]["text"]
print("{0}{1}{2}".format(colors.CYAN, genout, colors.END))
vars.actions.append(genout)
- refresh_story()
+ update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)})
set_aibusy(0)
@@ -1432,7 +1465,7 @@ def oairequest(txt, min, max):
genout = req.json()["choices"][0]["text"]
print("{0}{1}{2}".format(colors.CYAN, genout, colors.END))
vars.actions.append(genout)
- refresh_story()
+ update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)})
set_aibusy(0)
diff --git a/static/application.js b/static/application.js
index e5ebc806..2cf66dfe 100644
--- a/static/application.js
+++ b/static/application.js
@@ -599,6 +599,39 @@ $(document).ready(function(){
setTimeout(function () {
$('#gamescreen').animate({scrollTop: $('#gamescreen').prop('scrollHeight')}, 1000);
}, 5);
+ } else if(msg.cmd == "updatechunk") {
+ const {index, html, last} = msg.data;
+ const existingChunk = game_text.children(`#n${index}`)
+ const newChunk = $(html);
+ if (existingChunk.length > 0) {
+ // Update existing chunk
+ existingChunk.before(newChunk);
+ existingChunk.remove();
+ } else {
+ // Append at the end
+ game_text.append(newChunk);
+ }
+ if(last) {
+ // Scroll to bottom of text if it's the last element
+ setTimeout(function () {
+ $('#gamescreen').animate({scrollTop: $('#gamescreen').prop('scrollHeight')}, 1000);
+ }, 5);
+ }
+ } else if(msg.cmd == "removechunk") {
+ let index = msg.data;
+ // Remove the chunk
+ game_text.children(`#n${index}`).remove()
+ // Shift all existing chunks by 1
+ index++;
+ while (true) {
+ const chunk = game_text.children(`#n${index}`)
+ if(chunk.length === 0) {
+ break;
+ }
+ const newIndex = index - 1;
+ chunk.attr('n', newIndex.toString()).attr('id', `n${newIndex}`);
+ index++;
+ }
} else if(msg.cmd == "setgamestate") {
// Enable or Disable buttons
if(msg.data == "ready") {