Bug fix for merge (disabled functions)

This commit is contained in:
ebolam
2022-09-16 09:42:05 -04:00
parent 278b673307
commit d96dd5ede2
2 changed files with 68 additions and 52 deletions

View File

@@ -77,10 +77,12 @@ class koboldai_vars(object):
with open("settings/system_settings.v2_settings", "w") as settings_file:
settings_file.write(self._system_settings.to_json())
def save_story(self):
self._story_settings['default'].save_story()
def save_revision(self):
self._story_settings['default'].save_revision()
def create_story(self, story_name, json_data=None):
#Story name here is intended for multiple users on multiple stories. Now always uses default
#If we can figure out a way to get flask sessions into/through the lua bridge we could re-enable
@@ -505,7 +507,7 @@ class model_settings(settings):
process_variable_changes(self.socketio, self.__class__.__name__.replace("_settings", ""), name, value, old_value)
class story_settings(settings):
local_only_variables = ['socketio', 'tokenizer', 'koboldai_vars', 'no_save']
local_only_variables = ['socketio', 'tokenizer', 'koboldai_vars', 'no_save', 'revisions']
no_save_variables = ['socketio', 'tokenizer', 'koboldai_vars', 'context', 'no_save']
settings_name = "story"
def __init__(self, socketio, koboldai_vars, tokenizer=None):
@@ -568,6 +570,7 @@ class story_settings(settings):
self.prompt_in_ai = False
self.context = []
self.last_story_load = None
self.revisions = []
#must be at bottom
self.no_save = False #Temporary disable save (doesn't save with the file)
@@ -595,6 +598,12 @@ class story_settings(settings):
settings_file.write(self.to_json())
self.gamesaved = True
def save_revision(self):
game = json.loads(self.to_json())
del game['revisions']
self.revisions.append(game)
self.gamesaved = False
def reset(self):
self.no_save = True
self.socketio.emit("reset_story", {}, broadcast=True, room="UI_2")