Resolve merge conflict

aiserver.py

@@ -1097,9 +1097,10 @@ if(not vars.use_colab_tpu and vars.model not in ["InferKit", "Colab", "OAI", "Re
         else:
             vars.lazy_load = False
 
-        # Temporary fix for XGLM positional embedding issues until
+        # Some versions of transformers 4.17.0.dev0 are affected by
         # https://github.com/huggingface/transformers/issues/15736
-        # is resolved
+        # This is a workaround for those versions of transformers.
+        if(transformers_version == "4.17.0.dev0"):
             try:
                 from transformers.models.xglm.modeling_xglm import XGLMSinusoidalPositionalEmbedding
             except ImportError:
@@ -2877,7 +2878,7 @@ def actionback():
         vars.recentback = True
         remove_story_chunk(last_key + 1)
         #for the redo to not get out of whack, need to reset the max # in the actions sequence
-        vars.actions.set_next_id(vars.actions.get_last_key())
+        vars.actions.set_next_id(last_key)
     elif(len(vars.genseqs) == 0):
         emit('from_server', {'cmd': 'errmsg', 'data': "Cannot delete the prompt."})
     else:
@@ -2890,10 +2891,9 @@ def actionredo():
         genout = [{"generated_text": item['Text']} for item in vars.actions_metadata[vars.actions.get_last_key()+1]['Alternative Text'] if (item["Previous Selection"]==True)]
         if len(genout) > 0:
             genout = genout + [{"generated_text": item['Text']} for item in vars.actions_metadata[vars.actions.get_last_key()+1]['Alternative Text'] if (item["Pinned"]==True) and (item["Previous Selection"]==False)]
-            
             if len(genout) == 1:
                 vars.actions_metadata[vars.actions.get_last_key()+1]['Alternative Text'] = [item for item in vars.actions_metadata[vars.actions.get_last_key()+1]['Alternative Text'] if (item["Previous Selection"]!=True)]
-                genresult(genout[0]['generated_text'], flash=True)
+                genresult(genout[0]['generated_text'], flash=True, ignore_formatting=True)
             else:
                 # Store sequences in memory until selection is made
                 vars.genseqs = genout
@@ -2901,6 +2901,7 @@ def actionredo():
                 
                 # Send sequences to UI for selection
                 genout = [[item['Text'], "redo"] for item in vars.actions_metadata[vars.actions.get_last_key()+1]['Alternative Text'] if (item["Previous Selection"]==True)]
+                
                 emit('from_server', {'cmd': 'genseqs', 'data': genout}, broadcast=True)
     else:
         emit('from_server', {'cmd': 'popuperror', 'data': "There's nothing to undo"}, broadcast=True)
@@ -3281,11 +3282,12 @@ def generate(txt, minimum, maximum, found_entries=None):
 #==================================================================#
 #  Deal with a single return sequence from generate()
 #==================================================================#
-def genresult(genout, flash=True):
+def genresult(genout, flash=True, ignore_formatting=False):
     if not vars.quiet:
         print("{0}{1}{2}".format(colors.CYAN, genout, colors.END))
     
     # Format output before continuing
+    if not ignore_formatting:
         genout = applyoutputformatting(genout)
 
     vars.lua_koboldbridge.feedback = genout
@@ -4708,8 +4710,6 @@ def loadRequest(loadpath, filename=None):
         emit('from_server', {'cmd': 'hidegenseqs', 'data': ''}, broadcast=True)
         print("{0}Story loaded from {1}!{2}".format(colors.GREEN, filename, colors.END))
         
-        print([k for k in vars.actions])
-        print([k for k in vars.actions_metadata])
         send_debug()
 
 #==================================================================#
@@ -5120,7 +5120,7 @@ def send_debug():
         except:
             pass
         try:
-            debug_info = "{}Actions: {}\n".format(debug_info, vars.actions.get_last_key())
+            debug_info = "{}Actions: {}\n".format(debug_info, [k for k in vars.actions])
         except:
             pass
         try:

colabkobold.sh

@@ -48,7 +48,7 @@ function launch
         exit 0
     else
     cd /content/KoboldAI-Client
-    echo "Launching KoboldAI with the following options : python3 aiserver.py$model$kmpath$configname$ngrok --remote --override_delete --override_rename"
+    echo "Launching KoboldAI with the following options : python3 aiserver.py$model$kmpath$configname$ngrok --colab"
     python3 aiserver.py$model$kmpath$configname$ngrok --colab
     exit
     fi
@@ -151,7 +151,7 @@ if [ "$init" != "skip" ]; then
     ln -s /content/drive/MyDrive/KoboldAI/userscripts/ userscripts
     ln -s /content/drive/MyDrive/KoboldAI/models/ models
 
-    if [ "$model" == " --model TPUMeshTransformerGPTJ" ]; then
+    if [ -n "${COLAB_TPU_ADDR+set}" ]; then
         pip install -r requirements_mtj.txt
     else
         pip install -r requirements.txt

structures.py

@@ -19,9 +19,15 @@ class KoboldStoryRegister(collections.OrderedDict):
         return self.popitem()[1]
     
     def get_first_key(self) -> int:
+        if len(self) == 0:
+            return -1
+        else:
             return next(iter(self))
 
     def get_last_key(self) -> int:
+        if len(self) == 0:
+            return -1
+        else:
             return next(reversed(self))
 
     def __getitem__(self, k: int) -> str: