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

Merge pull request #9 from VE-FORBRYDERNE/big-o

Browse Source 
Optimization for very large stories
This commit is contained in:
henk717
2021-08-26 11:06:20 +02:00
committed by GitHub
parent bbd5bd0cd7 d7605a717b
commit 829d309abd
6 changed files with 214 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -8,4 +8,10 @@ stories/*
*.bak *.bak
miniconda3/* miniconda3/*
*.settings *.settings
__pycache__ __pycache__
# Ignore PyCharm project files.
.idea
# Ignore compiled Python files.
*.pyc

141
aiserver.py
View File

@@ -10,6 +10,9 @@ import re
import tkinter as tk import tkinter as tk
from tkinter import messagebox from tkinter import messagebox
import json import json
import collections
from typing import Literal, Union
import requests import requests
import html import html
import argparse import argparse
@@ -21,6 +24,7 @@ import fileops
import gensettings import gensettings
from utils import debounce from utils import debounce
import utils import utils
import structures
import breakmodel import breakmodel
#==================================================================# #==================================================================#
@@ -76,7 +80,7 @@ class vars:
memory = "" # Text submitted to memory field memory = "" # Text submitted to memory field
authornote = "" # Text submitted to Author's Note field authornote = "" # Text submitted to Author's Note field
andepth = 3 # How far back in history to append author's note andepth = 3 # How far back in history to append author's note
actions = [] # Array of actions submitted by user and AI actions = structures.KoboldStoryRegister() # Actions submitted by user and AI
worldinfo = [] # Array of World Info key/value objects worldinfo = [] # Array of World Info key/value objects
badwords = [] # Array of str/chr values that should be removed from output badwords = [] # Array of str/chr values that should be removed from output
badwordsids = [] # Tokenized array of badwords badwordsids = [] # Tokenized array of badwords
@@ -706,7 +710,6 @@ def get_message(msg):
vars.adventure = msg['data'] vars.adventure = msg['data']
settingschanged() settingschanged()
refresh_settings() refresh_settings()
refresh_story()
elif(msg['cmd'] == 'importwi'): elif(msg['cmd'] == 'importwi'):
wiimportrequest() wiimportrequest()
@@ -865,13 +868,13 @@ def actionsubmit(data, actionmode=0):
data = applyinputformatting(data) data = applyinputformatting(data)
# Store the result in the Action log # Store the result in the Action log
vars.actions.append(data) vars.actions.append(data)
update_story_chunk('last')
if(not vars.noai): if(not vars.noai):
# Off to the tokenizer! # Off to the tokenizer!
calcsubmit(data) calcsubmit(data)
emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True) emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
else: else:
refresh_story()
set_aibusy(0) set_aibusy(0)
emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True) emit('from_server', {'cmd': 'scrolldown', 'data': ''}, broadcast=True)
@@ -888,9 +891,10 @@ def actionretry(data):
if(vars.gamestarted if vars.useprompt else len(vars.actions) > 0): if(vars.gamestarted if vars.useprompt else len(vars.actions) > 0):
set_aibusy(1) set_aibusy(1)
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 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
last_key = vars.actions.get_last_key()
vars.actions.pop() vars.actions.pop()
remove_story_chunk(last_key + 1)
vars.genseqs = [] vars.genseqs = []
refresh_story()
calcsubmit('') calcsubmit('')
vars.recentback = False vars.recentback = False
elif(not vars.useprompt): elif(not vars.useprompt):
@@ -904,9 +908,10 @@ def actionback():
return return
# Remove last index of actions and refresh game screen # Remove last index of actions and refresh game screen
if(len(vars.genseqs) == 0 and len(vars.actions) > 0): if(len(vars.genseqs) == 0 and len(vars.actions) > 0):
last_key = vars.actions.get_last_key()
vars.actions.pop() vars.actions.pop()
vars.recentback = True vars.recentback = True
refresh_story() remove_story_chunk(last_key + 1)
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."})
else: else:
@@ -977,11 +982,13 @@ def calcsubmit(txt):
forceanote = True forceanote = True
# Get most recent action tokens up to our budget # Get most recent action tokens up to our budget
for n in range(actionlen): n = 0
for key in reversed(vars.actions):
chunk = vars.actions[key]
if(budget <= 0): if(budget <= 0):
break break
acttkns = tokenizer.encode(vars.actions[(-1-n)]) acttkns = tokenizer.encode(chunk)
tknlen = len(acttkns) tknlen = len(acttkns)
if(tknlen < budget): if(tknlen < budget):
tokens = acttkns + tokens tokens = acttkns + tokens
@@ -997,6 +1004,7 @@ def calcsubmit(txt):
if(anotetxt != ""): if(anotetxt != ""):
tokens = anotetkns + tokens # A.N. len already taken from bdgt tokens = anotetkns + tokens # A.N. len already taken from bdgt
anoteadded = True anoteadded = True
n += 1
# If we're not using the prompt every time and there's still budget left, # If we're not using the prompt every time and there's still budget left,
# add some prompt. # add some prompt.
@@ -1051,17 +1059,19 @@ def calcsubmit(txt):
subtxt = "" subtxt = ""
prompt = vars.prompt prompt = vars.prompt
for n in range(actionlen): n = 0
for key in reversed(vars.actions):
chunk = vars.actions[key]
if(budget <= 0): if(budget <= 0):
break break
actlen = len(vars.actions[(-1-n)]) actlen = len(chunk)
if(actlen < budget): if(actlen < budget):
subtxt = vars.actions[(-1-n)] + subtxt subtxt = chunk + subtxt
budget -= actlen budget -= actlen
else: else:
count = budget * -1 count = budget * -1
subtxt = vars.actions[(-1-n)][count:] + subtxt subtxt = chunk[count:] + subtxt
budget = 0 budget = 0
break break
@@ -1078,6 +1088,7 @@ def calcsubmit(txt):
if(anotetxt != ""): if(anotetxt != ""):
subtxt = anotetxt + subtxt # A.N. len already taken from bdgt subtxt = anotetxt + subtxt # A.N. len already taken from bdgt
anoteadded = True anoteadded = True
n += 1
# Did we get to add the A.N.? If not, do it here # Did we get to add the A.N.? If not, do it here
if(anotetxt != ""): if(anotetxt != ""):
@@ -1169,8 +1180,8 @@ def genresult(genout):
# Add formatted text to Actions array and refresh the game screen # Add formatted text to Actions array and refresh the game screen
vars.actions.append(genout) vars.actions.append(genout)
refresh_story() update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': vars.actions.get_last_key() if len(vars.actions) else 0}, broadcast=True)
#==================================================================# #==================================================================#
# Send generator sequences to the UI for selection # Send generator sequences to the UI for selection
@@ -1188,9 +1199,6 @@ def genselect(genout):
# Send sequences to UI for selection # Send sequences to UI for selection
emit('from_server', {'cmd': 'genseqs', 'data': genout}, broadcast=True) emit('from_server', {'cmd': 'genseqs', 'data': genout}, broadcast=True)
# Refresh story for any input text
refresh_story()
#==================================================================# #==================================================================#
# Send selected sequence to action log and refresh UI # Send selected sequence to action log and refresh UI
@@ -1199,8 +1207,8 @@ def selectsequence(n):
if(len(vars.genseqs) == 0): if(len(vars.genseqs) == 0):
return return
vars.actions.append(vars.genseqs[int(n)]["generated_text"]) vars.actions.append(vars.genseqs[int(n)]["generated_text"])
refresh_story() update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': vars.actions.get_last_key() if len(vars.actions) else 0}, broadcast=True)
emit('from_server', {'cmd': 'hidegenseqs', 'data': ''}, broadcast=True) emit('from_server', {'cmd': 'hidegenseqs', 'data': ''}, broadcast=True)
vars.genseqs = [] vars.genseqs = []
@@ -1259,7 +1267,7 @@ def sendtocolab(txt, min, max):
# Add formatted text to Actions array and refresh the game screen # Add formatted text to Actions array and refresh the game screen
#vars.actions.append(genout) #vars.actions.append(genout)
#refresh_story() #refresh_story()
#emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)}) #emit('from_server', {'cmd': 'texteffect', 'data': vars.actions.get_last_key() if len(vars.actions) else 0})
set_aibusy(0) set_aibusy(0)
else: else:
@@ -1330,13 +1338,51 @@ def applyoutputformatting(txt):
# Sends the current story content to the Game Screen # Sends the current story content to the Game Screen
#==================================================================# #==================================================================#
def refresh_story(): def refresh_story():
text_parts = ['<chunk n="0" id="n0">', html.escape(vars.prompt), '</chunk>'] text_parts = ['<chunk n="0" id="n0" tabindex="-1">', html.escape(vars.prompt), '</chunk>']
for idx, item in enumerate(vars.actions, start=1): for idx in vars.actions:
if vars.adventure: # Add special formatting to adventure actions item = vars.actions[idx]
item = vars.acregex_ui.sub('<action>\\1</action>', html.escape(item)) idx += 1
text_parts.extend(('<chunk n="', str(idx), '" id="n', str(idx), '">', item, '</chunk>')) item = html.escape(item)
item = vars.acregex_ui.sub('<action>\\1</action>', item) # Add special formatting to adventure actions
text_parts.extend(('<chunk n="', str(idx), '" id="n', str(idx), '" tabindex="-1">', item, '</chunk>'))
emit('from_server', {'cmd': 'updatescreen', 'gamestarted': vars.gamestarted, 'data': formatforhtml(''.join(text_parts))}, broadcast=True) emit('from_server', {'cmd': 'updatescreen', 'gamestarted': vars.gamestarted, 'data': formatforhtml(''.join(text_parts))}, broadcast=True)
#==================================================================#
# 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..."
# message instead).
refresh_story()
return
idx = (vars.actions.get_last_key() if len(vars.actions) else 0) + 1
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]
item = html.escape(text)
item = vars.acregex_ui.sub('<action>\\1</action>', item) # Add special formatting to adventure actions
chunk_text = f'<chunk n="{idx}" id="n{idx}" tabindex="-1">{formatforhtml(item)}</chunk>'
emit('from_server', {'cmd': 'updatechunk', 'data': {'index': idx, 'html': chunk_text, 'last': (idx == (vars.actions.get_last_key() if len(vars.actions) else 0))}}, broadcast=True)
#==================================================================#
# Signals the Game Screen to remove one of the chunks
#==================================================================#
def remove_story_chunk(idx: int):
emit('from_server', {'cmd': 'removechunk', 'data': idx}, broadcast=True)
#==================================================================# #==================================================================#
# Sends the current generator settings to the Game Menu # Sends the current generator settings to the Game Menu
#==================================================================# #==================================================================#
@@ -1405,7 +1451,7 @@ def editsubmit(data):
vars.actions[vars.editln-1] = data vars.actions[vars.editln-1] = data
vars.mode = "play" vars.mode = "play"
refresh_story() update_story_chunk(vars.editln)
emit('from_server', {'cmd': 'texteffect', 'data': vars.editln}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': vars.editln}, broadcast=True)
emit('from_server', {'cmd': 'editmode', 'data': 'false'}) emit('from_server', {'cmd': 'editmode', 'data': 'false'})
@@ -1420,7 +1466,7 @@ def deleterequest():
else: else:
del vars.actions[vars.editln-1] del vars.actions[vars.editln-1]
vars.mode = "play" vars.mode = "play"
refresh_story() remove_story_chunk(vars.editln)
emit('from_server', {'cmd': 'editmode', 'data': 'false'}) emit('from_server', {'cmd': 'editmode', 'data': 'false'})
#==================================================================# #==================================================================#
@@ -1433,7 +1479,7 @@ def inlineedit(chunk, data):
else: else:
vars.actions[chunk-1] = data vars.actions[chunk-1] = data
refresh_story() update_story_chunk(chunk)
emit('from_server', {'cmd': 'texteffect', 'data': chunk}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': chunk}, broadcast=True)
emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True) emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True)
@@ -1445,12 +1491,12 @@ def inlinedelete(chunk):
# Don't delete prompt # Don't delete prompt
if(chunk == 0): if(chunk == 0):
# Send error message # Send error message
refresh_story() update_story_chunk(chunk)
emit('from_server', {'cmd': 'errmsg', 'data': "Cannot delete the prompt."}) emit('from_server', {'cmd': 'errmsg', 'data': "Cannot delete the prompt."})
emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True) emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True)
else: else:
del vars.actions[chunk-1] del vars.actions[chunk-1]
refresh_story() remove_story_chunk(chunk)
emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True) emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True)
#==================================================================# #==================================================================#
@@ -1580,10 +1626,19 @@ def checkworldinfo(txt):
txt = "" txt = ""
depth += 1 depth += 1
if(ln > 0):
chunks = collections.deque()
i = 0
for key in reversed(vars.actions):
chunk = vars.actions[key]
chunks.appendleft(chunk)
if(i == depth):
break
if(ln >= depth): if(ln >= depth):
txt = "".join(vars.actions[(depth*-1):]) txt = "".join(chunks)
elif(ln > 0): elif(ln > 0):
txt = vars.prompt + "".join(vars.actions[(depth*-1):]) txt = vars.prompt + "".join(chunks)
elif(ln == 0): elif(ln == 0):
txt = vars.prompt txt = vars.prompt
@@ -1679,8 +1734,8 @@ def ikrequest(txt):
genout = req.json()["data"]["text"] genout = req.json()["data"]["text"]
print("{0}{1}{2}".format(colors.CYAN, genout, colors.END)) print("{0}{1}{2}".format(colors.CYAN, genout, colors.END))
vars.actions.append(genout) vars.actions.append(genout)
refresh_story() update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': vars.actions.get_last_key() if len(vars.actions) else 0}, broadcast=True)
set_aibusy(0) set_aibusy(0)
else: else:
@@ -1729,8 +1784,8 @@ def oairequest(txt, min, max):
genout = req.json()["choices"][0]["text"] genout = req.json()["choices"][0]["text"]
print("{0}{1}{2}".format(colors.CYAN, genout, colors.END)) print("{0}{1}{2}".format(colors.CYAN, genout, colors.END))
vars.actions.append(genout) vars.actions.append(genout)
refresh_story() update_story_chunk('last')
emit('from_server', {'cmd': 'texteffect', 'data': len(vars.actions)}, broadcast=True) emit('from_server', {'cmd': 'texteffect', 'data': vars.actions.get_last_key() if len(vars.actions) else 0}, broadcast=True)
set_aibusy(0) set_aibusy(0)
else: else:
@@ -1808,7 +1863,7 @@ def saveRequest(savpath):
js["prompt"] = vars.prompt js["prompt"] = vars.prompt
js["memory"] = vars.memory js["memory"] = vars.memory
js["authorsnote"] = vars.authornote js["authorsnote"] = vars.authornote
js["actions"] = vars.actions js["actions"] = tuple(vars.actions.values())
js["worldinfo"] = [] js["worldinfo"] = []
# Extract only the important bits of WI # Extract only the important bits of WI
@@ -1860,10 +1915,14 @@ def loadRequest(loadpath):
vars.gamestarted = js["gamestarted"] vars.gamestarted = js["gamestarted"]
vars.prompt = js["prompt"] vars.prompt = js["prompt"]
vars.memory = js["memory"] vars.memory = js["memory"]
vars.actions = js["actions"]
vars.worldinfo = [] vars.worldinfo = []
vars.lastact = "" vars.lastact = ""
vars.lastctx = "" vars.lastctx = ""
del vars.actions
vars.actions = structures.KoboldStoryRegister()
for s in js["actions"]:
vars.actions.append(s)
# Try not to break older save files # Try not to break older save files
if("authorsnote" in js): if("authorsnote" in js):
@@ -1973,7 +2032,7 @@ def importgame():
vars.prompt = "" vars.prompt = ""
vars.memory = ref["memory"] vars.memory = ref["memory"]
vars.authornote = ref["authorsNote"] if type(ref["authorsNote"]) is str else "" vars.authornote = ref["authorsNote"] if type(ref["authorsNote"]) is str else ""
vars.actions = [] vars.actions = structures.KoboldStoryRegister()
vars.worldinfo = [] vars.worldinfo = []
vars.lastact = "" vars.lastact = ""
vars.lastctx = "" vars.lastctx = ""
@@ -2033,7 +2092,7 @@ def importAidgRequest(id):
vars.prompt = js["promptContent"] vars.prompt = js["promptContent"]
vars.memory = js["memory"] vars.memory = js["memory"]
vars.authornote = js["authorsNote"] vars.authornote = js["authorsNote"]
vars.actions = [] vars.actions = structures.KoboldStoryRegister()
vars.worldinfo = [] vars.worldinfo = []
vars.lastact = "" vars.lastact = ""
vars.lastctx = "" vars.lastctx = ""
@@ -2101,7 +2160,7 @@ def newGameRequest():
vars.gamestarted = False vars.gamestarted = False
vars.prompt = "" vars.prompt = ""
vars.memory = "" vars.memory = ""
vars.actions = [] vars.actions = structures.KoboldStoryRegister()
vars.authornote = "" vars.authornote = ""
vars.worldinfo = [] vars.worldinfo = []

51
static/application.js
View File

@@ -643,6 +643,11 @@ function setmodevisibility(state) {
function setadventure(state) { function setadventure(state) {
adventure = state; adventure = state;
if(state) {
game_text.addClass("adventure");
} else {
game_text.removeClass("adventure");
}
if(!memorymode){ if(!memorymode){
setmodevisibility(state); setmodevisibility(state);
} }
@@ -758,19 +763,12 @@ function submitEditedChunk(event) {
return; return;
} }
show([$('#curtain')]);
setTimeout(function () {
if(document.activeElement.tagName == "CHUNK") {
document.activeElement.blur();
}
}, 5);
chunk = current_editing_chunk; chunk = current_editing_chunk;
current_editing_chunk = null; current_editing_chunk = null;
// Submit the edited chunk if it's not empty, otherwise delete it // Submit the edited chunk if it's not empty, otherwise delete it
if(chunk.innerText.length) { if(chunk.innerText.length) {
socket.send({'cmd': 'inlineedit', 'chunk': chunk.getAttribute("n"), 'data': chunk.innerText}); socket.send({'cmd': 'inlineedit', 'chunk': chunk.getAttribute("n"), 'data': chunk.innerText.replace(/\u00a0/g, " ")});
} else { } else {
socket.send({'cmd': 'inlinedelete', 'data': chunk.getAttribute("n")}); socket.send({'cmd': 'inlinedelete', 'data': chunk.getAttribute("n")});
} }
@@ -841,11 +839,11 @@ $(document).ready(function(){
seqselmenu = $("#seqselmenu"); seqselmenu = $("#seqselmenu");
seqselcontents = $("#seqselcontents"); seqselcontents = $("#seqselcontents");
// Connect to SocketIO server // Connect to SocketIO server
socket = io.connect(window.document.origin); socket = io.connect(window.document.origin);
socket.on('from_server', function(msg) { socket.on('from_server', function(msg) {
if(msg.cmd == "connected") { if(msg.cmd == "connected") {
// Connected to Server Actions // Connected to Server Actions
connected = true; connected = true;
connect_status.html("<b>Connected to KoboldAI Process!</b>"); connect_status.html("<b>Connected to KoboldAI Process!</b>");
@@ -876,9 +874,7 @@ $(document).ready(function(){
} }
game_text.html(msg.data); game_text.html(msg.data);
// Make content editable if need be // Make content editable if need be
$("chunk").attr('tabindex', -1)
$('chunk').attr('contenteditable', allowedit); $('chunk').attr('contenteditable', allowedit);
hide([$('#curtain')]);
// Scroll to bottom of text // Scroll to bottom of text
if(newly_loaded) { if(newly_loaded) {
setTimeout(function () { setTimeout(function () {
@@ -891,6 +887,33 @@ $(document).ready(function(){
setTimeout(function () { setTimeout(function () {
$('#gamescreen').animate({scrollTop: $('#gamescreen').prop('scrollHeight')}, 1000); $('#gamescreen').animate({scrollTop: $('#gamescreen').prop('scrollHeight')}, 1000);
}, 5); }, 5);
} else if(msg.cmd == "updatechunk") {
hideMessage();
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);
}
newChunk.attr('contenteditable', allowedit);
hide([$('#curtain')]);
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") {
hideMessage();
let index = msg.data;
// Remove the chunk
game_text.children(`#n${index}`).remove()
hide([$('#curtain')]);
} else if(msg.cmd == "setgamestate") { } else if(msg.cmd == "setgamestate") {
// Enable or Disable buttons // Enable or Disable buttons
if(msg.data == "ready") { if(msg.data == "ready") {
@@ -1088,7 +1111,7 @@ $(document).ready(function(){
} else if(msg.cmd == "runs_remotely") { } else if(msg.cmd == "runs_remotely") {
hide([button_loadfrfile, button_savetofile, button_import, button_importwi]); hide([button_loadfrfile, button_savetofile, button_import, button_importwi]);
} }
}); });
socket.on('disconnect', function() { socket.on('disconnect', function() {
connected = false; connected = false;

58
static/custom.css
View File

@@ -6,14 +6,14 @@ chunk {
color: #ffffff; color: #ffffff;
} }
action { #gametext.adventure action {
color: #9ff7fa; color: #9ff7fa;
font-weight: bold; font-weight: bold;
} }
chunk[contenteditable="true"]:focus, chunk[contenteditable="true"]:focus * { chunk[contenteditable="true"]:focus, chunk[contenteditable="true"]:focus * {
color: #cdf; color: #cdf !important;
font-weight: normal; font-weight: normal !important;
} }
chunk, chunk * { chunk, chunk * {
@@ -355,8 +355,8 @@ chunk, chunk * {
.colorfade, .colorfade * { .colorfade, .colorfade * {
-moz-transition:color 1s ease-in; -moz-transition:color 1s ease-in;
-o-transition:color 1s ease-in; -o-transition:color 1s ease-in;
-webkit-transition:color 1s ease-in; -webkit-transition:color 1s ease-in;
transition:color 1s ease-in; transition:color 1s ease-in;
} }
@@ -398,7 +398,7 @@ chunk, chunk * {
} }
.edit-flash, .edit-flash * { .edit-flash, .edit-flash * {
color: #3bf723; color: #3bf723 !important;
} }
.flex { .flex {
@@ -443,21 +443,21 @@ chunk, chunk * {
} }
.helpicon { .helpicon {
display: inline-block; display: inline-block;
font-family: sans-serif; font-family: sans-serif;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
width: 2.2ex; width: 2.2ex;
height: 2.4ex; height: 2.4ex;
font-size: 1.4ex; font-size: 1.4ex;
line-height: 1.8ex; line-height: 1.8ex;
border-radius: 1.2ex; border-radius: 1.2ex;
margin-right: 4px; margin-right: 4px;
padding: 1px; padding: 1px;
color: #295071; color: #295071;
background: #ffffff; background: #ffffff;
border: 1px solid white; border: 1px solid white;
text-decoration: none; text-decoration: none;
} }
.helpicon:hover { .helpicon:hover {
@@ -569,8 +569,8 @@ chunk, chunk * {
color: #ffffff; color: #ffffff;
-moz-transition: background-color 0.25s ease-in; -moz-transition: background-color 0.25s ease-in;
-o-transition: background-color 0.25s ease-in; -o-transition: background-color 0.25s ease-in;
-webkit-transition: background-color 0.25s ease-in; -webkit-transition: background-color 0.25s ease-in;
transition: background-color 0.25s ease-in; transition: background-color 0.25s ease-in;
} }
@@ -580,12 +580,12 @@ chunk, chunk * {
} }
.navbar .navbar-nav .nav-link:hover { .navbar .navbar-nav .nav-link:hover {
border-radius: 5px; border-radius: 5px;
background-color: #98bcdb; background-color: #98bcdb;
} }
.navbar .navbar-nav .nav-link:focus { .navbar .navbar-nav .nav-link:focus {
border-radius: 5px; border-radius: 5px;
background-color: #98bcdb; background-color: #98bcdb;
} }
@@ -651,8 +651,8 @@ chunk, chunk * {
color: #ffffff; color: #ffffff;
-moz-transition: background-color 0.25s ease-in; -moz-transition: background-color 0.25s ease-in;
-o-transition: background-color 0.25s ease-in; -o-transition: background-color 0.25s ease-in;
-webkit-transition: background-color 0.25s ease-in; -webkit-transition: background-color 0.25s ease-in;
transition: background-color 0.25s ease-in; transition: background-color 0.25s ease-in;
} }
@@ -702,8 +702,8 @@ chunk, chunk * {
padding: 5px; padding: 5px;
color: #ffffff; color: #ffffff;
-moz-transition: all 0.15s ease-in; -moz-transition: all 0.15s ease-in;
-o-transition: all 0.15s ease-in; -o-transition: all 0.15s ease-in;
-webkit-transition: all 0.15s ease-in; -webkit-transition: all 0.15s ease-in;
transition: all 0.15s ease-in; transition: all 0.15s ease-in;
} }

40
structures.py Normal file
View File

@@ -0,0 +1,40 @@
import collections
from typing import Iterable, Tuple
class KoboldStoryRegister(collections.OrderedDict):
'''
Complexity-optimized class for keeping track of story chunks
'''
def __init__(self, sequence: Iterable[Tuple[int, str]] = ()):
super().__init__(sequence)
self.__next_id: int = len(sequence)
def append(self, v: str) -> None:
self[self.__next_id] = v
self.increment_id()
def pop(self) -> str:
return self.popitem()[1]
def get_first_key(self) -> int:
return next(iter(self))
def get_last_key(self) -> int:
return next(reversed(self))
def __getitem__(self, k: int) -> str:
return super().__getitem__(k)
def __setitem__(self, k: int, v: str) -> None:
return super().__setitem__(k, v)
def increment_id(self) -> None:
self.__next_id += 1
def get_next_id(self) -> int:
return self.__next_id
def set_next_id(self, x: int) -> None:
self.__next_id = x

2
templates/index.html
View File

@@ -247,7 +247,7 @@
Unsaved data will be lost.<br><br> Unsaved data will be lost.<br><br>
Below you can input a genre suggestion for the AI to loosely base the story on (For example Horror or Cowboy).<br> Below you can input a genre suggestion for the AI to loosely base the story on (For example Horror or Cowboy).<br>
</div> </div>
<div class="aidgpopupcontent"> <div class="aidgpopupcontent">
<input class="form-control" type="text" placeholder="Story Genre Suggestion (Leave blank for fully random)" id="topic"> <input class="form-control" type="text" placeholder="Story Genre Suggestion (Leave blank for fully random)" id="topic">
</div> </div>
<div class="popupfooter"> <div class="popupfooter">