From c2ed31de2803ae8959007cd1fdaf38273023ffe3 Mon Sep 17 00:00:00 2001
From: Gnome Ann <>
Date: Sat, 20 Nov 2021 01:27:57 -0500
Subject: [PATCH] Add syntax for comments <|...|>
---
aiserver.py | 10 +++++++---
static/custom.css | 5 +++++
templates/index.html | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/aiserver.py b/aiserver.py
index f392ffb5..6e9ab648 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -123,6 +123,8 @@ class vars:
regex_sl = re.compile(r'\n*(?<=.) *\n(.|\n)*') # Pattern for limiting the output to a single line
acregex_ai = re.compile(r'\n* *>(.|\n)*') # Pattern for matching adventure actions from the AI so we can remove them
acregex_ui = re.compile(r'^ *(>.*)$', re.MULTILINE) # Pattern for matching actions in the HTML-escaped story so we can apply colouring, etc (make sure to encase part to format in parentheses)
+ comregex_ui = re.compile(r'<\|(?:.|\n)*?\|>') # Pattern for matching comments to remove them before sending them to the AI
+ comregex_ui = re.compile(r'(<\|(?:.|\n)*?\|>)') # Pattern for matching comments in the editor
actionmode = 1
adventure = False
dynamicscan = False
@@ -1270,7 +1272,7 @@ def calcsubmitbudget(actionlen, winfo, mem, anotetxt, actions):
lnanote = 0 # Placeholder for Author's Note length
# Calculate token budget
- prompttkns = tokenizer.encode(vars.prompt)
+ prompttkns = tokenizer.encode(vars.comregex_ai.sub('', vars.prompt))
lnprompt = len(prompttkns)
memtokens = tokenizer.encode(mem)
@@ -1292,7 +1294,7 @@ def calcsubmitbudget(actionlen, winfo, mem, anotetxt, actions):
if(actionlen == 0):
# First/Prompt action
- subtxt = vars.memory + winfo + anotetxt + vars.prompt
+ subtxt = vars.memory + winfo + anotetxt + vars.comregex_ai.sub('', vars.prompt)
lnsub = lnsp + lnmem + lnwi + lnprompt + lnanote
return subtxt, lnsub+1, lnsub+vars.genamt
else:
@@ -1305,7 +1307,7 @@ def calcsubmitbudget(actionlen, winfo, mem, anotetxt, actions):
# Get most recent action tokens up to our budget
n = 0
for key in reversed(actions):
- chunk = actions[key]
+ chunk = vars.comregex_ai.sub('', actions[key])
if(budget <= 0):
break
@@ -1782,6 +1784,7 @@ def refresh_story():
item = vars.actions[idx]
idx += 1
item = html.escape(item)
+ item = vars.comregex_ui.sub(lambda m: '\n'.join('' + l + '' for l in m.group().split('\n')), item) # Add special formatting to comments
item = vars.acregex_ui.sub('\\1', item) # Add special formatting to adventure actions
text_parts.extend(('', item, ''))
emit('from_server', {'cmd': 'updatescreen', 'gamestarted': vars.gamestarted, 'data': formatforhtml(''.join(text_parts))}, broadcast=True)
@@ -1809,6 +1812,7 @@ def update_story_chunk(idx: Union[int, str]):
text = vars.actions[idx - 1]
item = html.escape(text)
+ item = vars.comregex_ui.sub(lambda m: '\n'.join('' + l + '' for l in m.group().split('\n')), item) # Add special formatting to comments
item = vars.acregex_ui.sub('\\1', item) # Add special formatting to adventure actions
chunk_text = f'{formatforhtml(item)}'
diff --git a/static/custom.css b/static/custom.css
index 3b1ee1dc..ff487def 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -11,6 +11,11 @@ chunk {
font-weight: bold;
}
+#gametext comment {
+ color: #888;
+ font-style: italic;
+}
+
chunk.editing, chunk.editing * {
color: #cdf !important;
font-weight: normal !important;
diff --git a/templates/index.html b/templates/index.html
index f8e091e3..1278f82b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,7 +13,7 @@
-
+