Mirrors/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2024-11-28 18:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading session in chat mode

Browse Source
This commit is contained in:
oobabooga 2023-08-02 21:13:16 -07:00
parent 4b6c1d3f08
commit 32c564509e
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/chat.py
View File

@ -418,6 +418,10 @@ def save_persistent_history(history, character, mode):
def load_persistent_history(state): def load_persistent_history(state):
if shared.session_is_loading:
shared.session_is_loading = False
return state['history']
if state['mode'] == 'instruct': if state['mode'] == 'instruct':
return state['history'] return state['history']

4
modules/shared.py
View File

@ -30,6 +30,10 @@ reload_inputs = [] # Parameters for reloading the chat interface
# For restarting the interface # For restarting the interface
need_restart = False need_restart = False
# To prevent the persistent chat history from being loaded when
# a session JSON file is being loaded in chat mode
session_is_loading = False
settings = { settings = {
'dark_theme': True, 'dark_theme': True,
'autoload_model': False, 'autoload_model': False,

22
server.py
View File

@ -511,21 +511,27 @@ def create_file_saving_event_handlers():
def load_session(file, state): def load_session(file, state):
decoded_file = file if type(file) == str else file.decode('utf-8') decoded_file = file if type(file) == str else file.decode('utf-8')
data = json.loads(decoded_file) data = json.loads(decoded_file)
if shared.is_chat() and 'character_menu' in data and state.get('character_menu') != data.get('character_menu'):
shared.session_is_loading = True
state.update(data) state.update(data)
if shared.is_chat():
chat.save_persistent_history(state['history'], state['character_menu'], state['mode'])
return state return state
shared.gradio['save_session'].click( shared.gradio['save_session'].click(
ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then( ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
lambda x: json.dumps(x, indent=4), gradio('interface_state'), gradio('temporary_text')).then( lambda x: json.dumps(x, indent=4), gradio('interface_state'), gradio('temporary_text')).then(
None, gradio('temporary_text'), None, _js=f"(contents) => {{{ui.save_files_js}; saveSession(contents, \"{shared.get_mode()}\")}}") None, gradio('temporary_text'), None, _js=f"(contents) => {{{ui.save_files_js}; saveSession(contents, \"{shared.get_mode()}\")}}")
shared.gradio['load_session'].upload( if shared.is_chat():
load_session, gradio('load_session', 'interface_state'), gradio('interface_state')).then( shared.gradio['load_session'].upload(
ui.apply_interface_values, gradio('interface_state'), gradio(ui.list_interface_input_elements()), show_progress=False) load_session, gradio('load_session', 'interface_state'), gradio('interface_state')).then(
ui.apply_interface_values, gradio('interface_state'), gradio(ui.list_interface_input_elements()), show_progress=False).then(
chat.redraw_html, shared.reload_inputs, gradio('display'))
else:
shared.gradio['load_session'].upload(
load_session, gradio('load_session', 'interface_state'), gradio('interface_state')).then(
ui.apply_interface_values, gradio('interface_state'), gradio(ui.list_interface_input_elements()), show_progress=False)
def set_interface_arguments(interface_mode, extensions, bool_active): def set_interface_arguments(interface_mode, extensions, bool_active):