From ae215b94d5954434300748eb630ec2adf7b4340f Mon Sep 17 00:00:00 2001
From: Llama <34464159+pi6am@users.noreply.github.com>
Date: Thu, 5 Jan 2023 23:42:24 -0800
Subject: [PATCH] ix loading a non-started V1 story json in UI2

There was an exception loading or importing a V1 story json into UI2 if
the story had zero actions. Do to incorrect indendation, the V1 load
process would attempt to use an uninitialized temp_story_class variable.

However, even after fixing this, it was impossible to continue playing
the saved story, because it was not possible to submit a blank action
when a story only had a prompt and zero actions. Modify the logic around
the first submission to handle a non-empty initial prompt. This allows
the player to begin playing the loaded game.
---
 aiserver.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index bb79fe99..90f1cb26 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -4816,6 +4816,11 @@ def actionsubmit(data, actionmode=0, force_submit=False, force_prompt_gen=False,
                 execute_inmod()
             koboldai_vars.submission = re.sub(r"[^\S\r\n]*([\r\n]*)$", r"\1", koboldai_vars.submission)  # Remove trailing whitespace, excluding newlines
             data = koboldai_vars.submission
+            if koboldai_vars.prompt:
+                # This will happen only when loading a non-started save game (i.e. one consisting only of a saved prompt).
+                # In this case, prepend the prompt to the sumission. This allows the player to submit a blank initial submission
+                # (preserving the prompt), or to add to the prompt by submitting non-empty data.
+                data = koboldai_vars.prompt + data
             if(not force_submit and len(data.strip()) == 0):
                 set_aibusy(0)
                 socketio.emit("error", "No prompt or random story theme entered", broadcast=True, room="UI_2")
@@ -7426,17 +7431,17 @@ def load_story_v1(js, from_file=None):
         logger.debug("Added actions to temp story class")
         
 
-    if "actions_metadata" in js:
-        if type(js["actions_metadata"]) == dict:
-            for key in js["actions_metadata"]:
-                if js["actions_metadata"][key]["Alternative Text"] != []:
-                    data = js["actions_metadata"][key]["Alternative Text"]
-                    for i in range(len(js["actions_metadata"][key]["Alternative Text"])):
-                        data[i]["text"] = data[i].pop("Text")
-                    temp_story_class.set_options(data, int(key))
-    koboldai_vars.actions.load_json(temp_story_class.to_json())
-    logger.debug("Saved temp story class")
-    del temp_story_class
+        if "actions_metadata" in js:
+            if type(js["actions_metadata"]) == dict:
+                for key in js["actions_metadata"]:
+                    if js["actions_metadata"][key]["Alternative Text"] != []:
+                        data = js["actions_metadata"][key]["Alternative Text"]
+                        for i in range(len(js["actions_metadata"][key]["Alternative Text"])):
+                            data[i]["text"] = data[i].pop("Text")
+                        temp_story_class.set_options(data, int(key))
+        koboldai_vars.actions.load_json(temp_story_class.to_json())
+        logger.debug("Saved temp story class")
+        del temp_story_class
     
     # Try not to break older save files
     if("authorsnote" in js):