'
)
- selected_class = " selected-message" if message_versioning.is_message_selected(i, 1) else ""
output += (
- f'
'
f'
'
diff --git a/modules/message_versioning.py b/modules/message_versioning.py
deleted file mode 100644
index 5ed7c6fa..00000000
--- a/modules/message_versioning.py
+++ /dev/null
@@ -1,225 +0,0 @@
-from typing import Dict, List, Iterable
-from functools import reduce
-from operator import getitem
-import logging as logger
-
-last_state = {
- 'display_mode': 'html', # Default display mode
-}
-
-# --- Functions to be called by integrated logic ---
-
-
-def set_versioning_display_mode(new_dmode: str):
- """Sets the display mode ('html', 'overlay', 'off')."""
- global last_state
- last_state['display_mode'] = new_dmode
-
-
-def get_versioning_display_mode():
- """Gets the current display mode from the loaded history."""
- current_mode = last_state.get('display_mode', 'html')
- return current_mode
-
-
-# --- Core Logic ---
-
-last_history_index = -1
-last_msg_type = -1
-
-
-# --- Helper Functions ---
-
-def recursive_get(data: Dict | Iterable, keyList: List[int | str], default=None):
- """Iterate nested dictionary / iterable safely."""
- try:
- result = reduce(getitem, keyList, data)
- return result
- except (KeyError, IndexError, TypeError):
- return default
- except Exception as e:
- logger.error(f"Error in recursive_get: {e}", exc_info=True)
- return None
-
-
-def length(data: Iterable):
- """Get length of iterable with try-catch."""
- try:
- result = len(data)
- return result
- except TypeError:
- return 0
- except Exception as e:
- logger.error(f"Error getting length: {e}", exc_info=True)
- return 0
-
-
-def get_message_metadata(history: dict, history_index: int, msg_type: int) -> dict:
- msg_role = 'assistant' if msg_type == 1 else 'user'
- return recursive_get(history, ['metadata', f'{msg_role}_{history_index}'])
-
-# --- Core Functions ---
-
-
-def get_message_positions(history: dict, history_index: int, msg_type: int):
- """
- Get the message position and total message versions for a specific message from the currently loaded history data.
- Assumes the correct history data has already been loaded by the calling context.
- """
- msg_data = get_message_metadata(history, history_index, msg_type)
-
- if msg_data is None or msg_data['versions'] is None:
- return 0, 0
-
- pos = msg_data.get('current_version_index', 0)
- total = length(msg_data['versions'])
- return pos, total
-
-
-def navigate_message_version(history_index: float, msg_type: float, direction: str, history: Dict):
- """
- Handles navigation (left/right swipe) for a message version.
- Updates the history dictionary directly and returns the modified history.
- The calling function will be responsible for regenerating the HTML.
- """
- global last_history_index, last_msg_type
- try:
- i = int(history_index)
- m_type = int(msg_type)
- last_history_index = i # Default to current index/type
- last_msg_type = m_type
-
- current_pos, total_pos = get_message_positions(history, i, m_type)
-
- if total_pos <= 1:
- return history
-
- # Calculate new position
- new_pos = current_pos
- if direction == "right":
- new_pos += 1
- if new_pos >= total_pos:
- return history
- elif direction == "left":
- new_pos -= 1
- if new_pos < 0:
- return history
- else:
- logger.warning(f"Invalid navigation direction: {direction}")
- return history
-
- history_metadata = history['metadata']
- msg_metadata = get_message_metadata(history, i, m_type)
- if msg_metadata is None:
- logger.error(f"Message metadata not found for index {i}, type {m_type}. Data: {history_metadata}")
- return history
- versions = msg_metadata.get('versions', [])
- new_ver = versions[new_pos]
- if new_ver is None:
- logger.error(f"Message version not found for metadata index {i}, type {m_type}, version index {new_pos}. Data: {history_metadata}")
- return history
-
- ver_content = new_ver['content']
- ver_visible_content = new_ver['visible_content']
-
- if ver_content is None or ver_visible_content is None:
- logger.error(f"Loaded version data structure invalid during navigation for index {i}, type {m_type}. Data: {history_metadata}")
- return history
-
- # Check bounds for the new position against the text lists
- if new_pos < 0 or new_pos >= len(msg_metadata['versions']):
- logger.error(f"Navigation error: new_pos {new_pos} out of bounds for history text list (len {len(versions)})")
- return history
-
- history['internal'][i][m_type] = ver_content
- history['visible'][i][m_type] = ver_visible_content
- msg_metadata['timestamp'] = new_ver['timestamp']
- msg_metadata['current_version_index'] = new_pos # Updates history object
-
- last_history_index = i
- last_msg_type = m_type
-
- return history
-
- except Exception as e:
- logger.error(f"Error during message version navigation: {e}", exc_info=True)
- return history
-
-
-# --- Functions to be called during HTML Generation ---
-
-
-def get_message_version_nav_elements(history: dict, history_index: int, msg_type: int):
- """
- Generates the HTML for the message version navigation arrows and position indicator.
- Should be called by the HTML generator.
- Returns an empty string if history storage mode is 'off' or navigation is not needed.
- """
- if get_versioning_display_mode() == 'off':
- return ""
-
- try:
- current_pos, total_pos = get_message_positions(history, history_index, msg_type)
-
- if total_pos <= 1:
- return ""
-
- left_activated_attr = ' activated="true"' if current_pos > 0 else ''
- right_activated_attr = ' activated="true"' if current_pos < total_pos - 1 else ''
-
- left_arrow_svg = ''''''
- right_arrow_svg = ''''''
-
- nav_left = f''
- nav_pos = f'
{current_pos + 1}/{total_pos}
'
- nav_right = f''
-
- nav_container = (
- f'
'
- f'{nav_left}'
- f'{nav_pos}'
- f'{nav_right}'
- f'
'
- )
-
- versioning_container = (
- f'
'
- f'{nav_container}'
- f'
'
- )
-
- return versioning_container
-
- except Exception as e:
- logger.error(f"Error generating message versioning nav elements for index {history_index}, type {msg_type}: {e}", exc_info=True)
- return ""
-
-
-def is_message_selected(history_index: int, msg_type: int) -> bool:
- """
- Returns True if the message at the specified index and type is selected.
- """
- global last_history_index, last_msg_type
- return last_history_index == history_index and last_msg_type == msg_type
-
-
-def handle_display_mode_change(display_mode: str):
- """
- Handles changes to the message versioning display mode radio button.
- Updates the history storage mode. The UI redraw should be triggered by the main logic.
- """
- set_versioning_display_mode(display_mode)
-
-
-def handle_navigate_click(history_index: float, msg_type: float, direction: str, history: Dict, character: str, unique_id: str, mode: str, name1: str, name2: str, chat_style: str):
- """
- Handles clicks on the navigation buttons generated by get_message_version_nav_elements.
- Calls navigate_message_version and returns the updated history and potentially the regenerated HTML.
- """
- updated_history = navigate_message_version(history_index, msg_type, direction, history)
-
- import modules.chat as chat
- html = chat.redraw_html(updated_history, name1, name2, mode, chat_style, character)
- chat.save_history(history, unique_id, character, mode)
-
- return updated_history, html
diff --git a/modules/ui.py b/modules/ui.py
index 5e8fa14e..52c095a2 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -157,6 +157,8 @@ def list_model_elements():
def list_interface_input_elements():
elements = [
+ 'navigate_message_index',
+ 'navigate_direction',
'temperature',
'dynatemp_low',
'dynatemp_high',
diff --git a/modules/ui_chat.py b/modules/ui_chat.py
index b2bc8210..7a9f6f76 100644
--- a/modules/ui_chat.py
+++ b/modules/ui_chat.py
@@ -5,7 +5,7 @@ from pathlib import Path
import gradio as gr
from PIL import Image
-from modules import chat, shared, ui, utils, message_versioning
+from modules import chat, shared, ui, utils
from modules.html_generator import chat_html_wrapper
from modules.text_generation import stop_everything_event
from modules.utils import gradio
@@ -94,18 +94,14 @@ def create_ui():
with gr.Row():
shared.gradio['chat_style'] = gr.Dropdown(choices=utils.get_available_chat_styles(), label='Chat style', value=shared.settings['chat_style'], visible=shared.settings['mode'] != 'instruct')
- with gr.Row(visible=True):
- shared.gradio['message_versioning_display_mode'] = gr.Radio(choices=['html', 'off'], value='html', label="Message Versioning Display", info="Controls how message version navigation is displayed.", elem_id="message-versioning-display-mode", elem_classes=['slim-dropdown'])
-
with gr.Row():
shared.gradio['chat-instruct_command'] = gr.Textbox(value=shared.settings['chat-instruct_command'], lines=12, label='Command for chat-instruct mode', info='<|character|> and <|prompt|> get replaced with the bot name and the regular chat prompt respectively.', visible=shared.settings['mode'] == 'chat-instruct', elem_classes=['add_scrollbar'])
- # Hidden elements for message versioning JS communication
- with gr.Row(visible=False, elem_id="message-versioning-hidden-row"):
- shared.gradio['message_versioning_history_index_hidden'] = gr.Number(value=0, elem_id="message-versioning-history-index-hidden")
- shared.gradio['message_versioning_message_type_hidden'] = gr.Number(value=0, elem_id="message-versioning-message-type-hidden")
- shared.gradio['message_versioning_direction_hidden'] = gr.Textbox(value="", elem_id="message-versioning-direction-hidden")
- shared.gradio['message_versioning_navigate_hidden'] = gr.Button(elem_id="message-versioning-navigate-hidden")
+ # Hidden elements for version navigation (similar to branch)
+ with gr.Row(visible=False):
+ shared.gradio['navigate_message_index'] = gr.Number(value=-1, precision=0, elem_id="Navigate-message-index")
+ shared.gradio['navigate_direction'] = gr.Textbox(value="", elem_id="Navigate-direction")
+ shared.gradio['navigate_version'] = gr.Button(elem_id="Navigate-version")
def create_chat_settings_ui():
@@ -303,18 +299,9 @@ def create_event_handlers():
shared.gradio['chat_style'].change(chat.redraw_html, gradio(reload_arr), gradio('display'), show_progress=False)
shared.gradio['Copy last reply'].click(chat.send_last_reply_to_input, gradio('history'), gradio('textbox'), show_progress=False)
- # Message Versioning event handlers
- shared.gradio['message_versioning_display_mode'].change(
+ shared.gradio['navigate_version'].click(
ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
- message_versioning.handle_display_mode_change, gradio('message_versioning_display_mode'), None).then(
- chat.redraw_html, gradio(reload_arr), gradio('display'), show_progress=False)
-
- shared.gradio['message_versioning_navigate_hidden'].click(
- ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
- message_versioning.handle_navigate_click,
- gradio('message_versioning_history_index_hidden', 'message_versioning_message_type_hidden', 'message_versioning_direction_hidden', 'history', 'character_menu', 'unique_id', 'mode', 'name1', 'name2', 'chat_style'),
- gradio('history', 'display'),
- show_progress=False)
+ chat.handle_navigate_version_click, gradio('interface_state'), gradio('history', 'display'), show_progress=False)
# Save/delete a character
shared.gradio['save_character'].click(chat.handle_save_character_click, gradio('name2'), gradio('save_character_filename', 'character_saver'), show_progress=False)