Merge pull request #59 from rmusser01/main

Sync refactor changes back into dev branch

Author: rmusser01

Docs/FAQs.md

@@ -82,6 +82,9 @@ Refer to the official [Windows Terminal Interaction Settings Documentation](http
 
 
 
+### MLX on Mac
+https://github.com/google/sentencepiece/issues/1083
+
 
 ### Samplers
 https://rentry.org/samplers

tldw_chatbook/Event_Handlers/Chat_Events/chat_events.py

@@ -18,6 +18,10 @@
 from textual.containers import VerticalScroll
 from textual.css.query import QueryError
 
+from tldw_chatbook.Event_Handlers.Chat_Events.chat_events_sidebar import (
+    handle_chat_media_load_selected_button_pressed, handle_chat_media_copy_title_button_pressed,
+    handle_chat_media_copy_content_button_pressed, handle_chat_media_copy_author_button_pressed,
+    handle_chat_media_copy_url_button_pressed)
 from tldw_chatbook.Utils.Utils import safe_float, safe_int
 #
 # Local Imports
@@ -41,9 +45,10 @@
 #
 # Functions:
 
-async def handle_chat_tab_sidebar_toggle(app: 'TldwCli', button_id: str) -> None:
+async def handle_chat_tab_sidebar_toggle(app: 'TldwCli', event: Button.Pressed) -> None:
     """Handles sidebar toggles specific to the Chat tab."""
     logger = getattr(app, 'loguru_logger', logging)
+    button_id = event.button.id
     if button_id == "toggle-chat-left-sidebar":
         app.chat_sidebar_collapsed = not app.chat_sidebar_collapsed
         logger.debug("Chat tab settings sidebar (left) now %s", "collapsed" if app.chat_sidebar_collapsed else "expanded")
@@ -53,8 +58,9 @@ async def handle_chat_tab_sidebar_toggle(app: 'TldwCli', button_id: str) -> None
     else:
         logger.warning(f"Unhandled sidebar toggle button ID '{button_id}' in Chat tab handler.")
 
-async def handle_chat_send_button_pressed(app: 'TldwCli', prefix: str) -> None:
+async def handle_chat_send_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Handles the send button press for the main chat tab."""
+    prefix = "chat"  # This handler is specific to the main chat tab's send button
     loguru_logger.info(f"Send button pressed for '{prefix}' (main chat)") # Use loguru_logger consistently
 
     # --- 1. Query UI Widgets ---
@@ -766,7 +772,7 @@ async def handle_chat_action_button_pressed(app: 'TldwCli', button: Button, acti
                        description=f"Regenerating for {selected_provider_regen}")
 
 
-async def handle_chat_new_conversation_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_new_conversation_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     loguru_logger.info("New Chat button pressed.")
     try:
         chat_log_widget = app.query_one("#chat-log", VerticalScroll)
@@ -808,7 +814,7 @@ async def handle_chat_new_conversation_button_pressed(app: 'TldwCli') -> None:
         loguru_logger.error(f"UI component not found during new chat setup: {e}")
 
 
-async def handle_chat_save_current_chat_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_save_current_chat_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     loguru_logger.info("Save Current Chat button pressed.")
     if not (app.current_chat_is_ephemeral and app.current_chat_conversation_id is None):
         loguru_logger.warning("Chat not eligible for saving (not ephemeral or already has ID).")
@@ -905,7 +911,7 @@ async def handle_chat_save_current_chat_button_pressed(app: 'TldwCli') -> None:
         app.notify(f"Error saving chat: {str(e_save_chat)[:100]}", severity="error")
 
 
-async def handle_chat_save_details_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_save_details_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     loguru_logger.info("Save conversation details button pressed.")
     if app.current_chat_is_ephemeral or not app.current_chat_conversation_id:
         loguru_logger.warning("Cannot save details for an ephemeral or non-existent chat.")
@@ -1009,7 +1015,7 @@ async def handle_chat_save_details_button_pressed(app: 'TldwCli') -> None:
         app.notify("Unexpected error saving details.", severity="error", timeout=3)
 
 
-async def handle_chat_load_selected_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_load_selected_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     loguru_logger.info("Load selected chat button pressed.")
     try:
         results_list_view = app.query_one("#chat-conversation-search-results-list", ListView)
@@ -1048,7 +1054,7 @@ async def handle_chat_load_selected_button_pressed(app: 'TldwCli') -> None:
         app.notify("Unexpected error loading chat.", severity="error")
 
 
-async def perform_chat_conversation_search(app: 'TldwCli') -> None:
+async def perform_chat_conversation_search(app: 'TldwCli', event: Button.Pressed) -> None:
     loguru_logger.debug("Performing chat conversation search...")
     try:
         search_bar = app.query_one("#chat-conversation-search-bar", Input)
@@ -1294,7 +1300,7 @@ async def display_conversation_in_chat_tab_ui(app: 'TldwCli', conversation_id: s
     loguru_logger.info(f"Displayed conversation '{conv_metadata.get('title', 'Untitled')}' (ID: {conversation_id}) in chat tab.")
 
 
-async def load_branched_conversation_history_ui(app: 'TldwCli', target_conversation_id: str, chat_log_widget: VerticalScroll):
+async def load_branched_conversation_history_ui(app: 'TldwCli', target_conversation_id: str, chat_log_widget: VerticalScroll) -> None:
     """
     Loads the complete message history for a given conversation_id,
     tracing back through parent branches to the root if necessary.
@@ -1605,7 +1611,7 @@ async def handle_chat_character_attribute_changed(app: 'TldwCli', event: Union[I
         loguru_logger.warning(f"Attribute change event from unmapped control_id: {control_id}")
 
 
-async def handle_chat_clear_active_character_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_clear_active_character_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Clears the currently active character data and resets related UI fields."""
     loguru_logger.info("Clear Active Character button pressed.")
 
@@ -1732,7 +1738,7 @@ async def perform_chat_prompt_search(app: 'TldwCli') -> None:
         logger.error(f"Chat Tab: Error performing prompt search via perform_chat_prompt_search: {e}", exc_info=True)
 
 
-async def handle_chat_view_selected_prompt_button_pressed(app: 'TldwCli') -> None:
+async def handle_chat_view_selected_prompt_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     logger = getattr(app, 'loguru_logger', logging)
     logger.debug("Chat Tab: View Selected Prompt button pressed.")
 
@@ -1977,7 +1983,7 @@ async def handle_chat_sidebar_prompt_search_changed(
     logger.info(f"[Prompts] Search '{search_term}' → {len(prompts)} results.")
 
 
-async def handle_continue_response_button_pressed(app: 'TldwCli', button: Button, message_widget: ChatMessage) -> None:
+async def handle_continue_response_button_pressed(app: 'TldwCli', event: Button.Pressed, message_widget: ChatMessage) -> None:
     """Handles the 'Continue Response' button press on an AI chat message."""
     loguru_logger.info(f"Continue Response button pressed for message_id: {message_widget.message_id_internal}, current text: '{message_widget.message_text[:50]}...'")
     db = app.chachanotes_db
@@ -1989,9 +1995,8 @@ async def handle_continue_response_button_pressed(app: 'TldwCli', button: Button
     original_display_text_obj: Optional[Union[str, Text]] = None # renderable can be str or Text
 
     try:
-        # Ensure we are targeting the correct button on the specific message_widget instance
-        # The 'button' argument is the button that was pressed.
-        continue_button_widget = button # This IS the button that was pressed.
+        button = event.button
+        continue_button_widget = button
         original_button_label = continue_button_widget.label
         continue_button_widget.disabled = True
         continue_button_widget.label = get_char(EMOJI_THINKING, FALLBACK_THINKING) # "⏳" or similar
@@ -2307,7 +2312,7 @@ async def handle_continue_response_button_pressed(app: 'TldwCli', button: Button
     loguru_logger.info(f"Continuation process completed for message_id: {message_widget.message_id_internal}. Final text length: {len(current_full_text)}")
 
 
-async def handle_respond_for_me_button_pressed(app: 'TldwCli') -> None:
+async def handle_respond_for_me_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Handles the 'Respond for Me' (Suggest) button press in the chat input area."""
     loguru_logger.info("Enter: handle_respond_for_me_button_pressed")
     loguru_logger.info("Respond for Me button pressed.")
@@ -2541,7 +2546,7 @@ class ApiKeyMissingError(Exception): # Custom exception for cleaner handling in
     pass
 
 
-async def handle_stop_chat_generation_pressed(app: 'TldwCli') -> None:
+async def handle_stop_chat_generation_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Handles the 'Stop Chat Generation' button press."""
     loguru_logger.info("Stop Chat Generation button pressed.")
 
@@ -2637,11 +2642,10 @@ async def populate_chat_conversation_character_filter_select(app: 'TldwCli') ->
 # --- Button Handler Map ---
 # This maps button IDs to their async handler functions.
 CHAT_BUTTON_HANDLERS = {
-    "send-chat": lambda app: handle_chat_send_button_pressed(app, "chat"),
+    "send-chat": handle_chat_send_button_pressed,
     "respond-for-me-button": handle_respond_for_me_button_pressed,
     "stop-chat-generation": handle_stop_chat_generation_pressed,
     "chat-new-conversation-button": handle_chat_new_conversation_button_pressed,
-    "chat-new-temp-chat-button": handle_chat_new_conversation_button_pressed,  # Reuses handler
     "chat-save-current-chat-button": handle_chat_save_current_chat_button_pressed,
     "chat-save-conversation-details-button": handle_chat_save_details_button_pressed,
     "chat-conversation-load-selected-button": handle_chat_load_selected_button_pressed,
@@ -2650,19 +2654,13 @@ async def populate_chat_conversation_character_filter_select(app: 'TldwCli') ->
     "chat-prompt-copy-user-button": handle_chat_copy_user_prompt_button_pressed,
     "chat-load-character-button": handle_chat_load_character_button_pressed,
     "chat-clear-active-character-button": handle_chat_clear_active_character_button_pressed,
-
-    # --- Sidebar Toggles ---
-    "toggle-chat-left-sidebar": lambda app: handle_chat_tab_sidebar_toggle(app, "toggle-chat-left-sidebar"),
-    "toggle-chat-right-sidebar": lambda app: handle_chat_tab_sidebar_toggle(app, "toggle-chat-right-sidebar"),
-
-    # --- Sidebar Media Buttons (from chat_events_sidebar.py) ---
-    "chat-media-load-selected-button": 'chat_events_sidebar.handle_chat_media_load_selected_button_pressed',
-    "chat-media-copy-title-button": 'chat_events_sidebar.handle_chat_media_copy_title_button_pressed',
-    "chat-media-copy-content-button": 'chat_events_sidebar.handle_chat_media_copy_content_button_pressed',
-    "chat-media-copy-author-button": 'chat_events_sidebar.handle_chat_media_copy_author_button_pressed',
-    "chat-media-copy-url-button": 'chat_events_sidebar.handle_chat_media_copy_url_button_pressed',
-
-    # --- Note: ChatMessage action buttons (like edit, copy, delete) are handled separately by _get_chat_message_widget_from_button ---
+    "toggle-chat-left-sidebar": handle_chat_tab_sidebar_toggle,
+    "toggle-chat-right-sidebar": handle_chat_tab_sidebar_toggle,
+    "chat-media-load-selected-button": handle_chat_media_load_selected_button_pressed,
+    "chat-media-copy-title-button": handle_chat_media_copy_title_button_pressed,
+    "chat-media-copy-content-button": handle_chat_media_copy_content_button_pressed,
+    "chat-media-copy-author-button": handle_chat_media_copy_author_button_pressed,
+    "chat-media-copy-url-button": handle_chat_media_copy_url_button_pressed,
 }
 
 #

tldw_chatbook/Event_Handlers/Chat_Events/chat_events_sidebar.py

@@ -132,7 +132,7 @@ async def handle_chat_media_search_input_changed(app: 'TldwCli', input_widget: I
     logger.debug(f"Set new media search timer for term: '{search_term}'")
 
 
-async def handle_chat_media_load_selected_button_pressed(app: 'TldwCli'):
+async def handle_chat_media_load_selected_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """
     Loads the selected media item's details into the review display.
     """
@@ -177,7 +177,7 @@ async def handle_chat_media_load_selected_button_pressed(app: 'TldwCli'):
     logger.debug("Media copy buttons state updated.")
 
 
-async def handle_chat_media_copy_title_button_pressed(app: 'TldwCli'):
+async def handle_chat_media_copy_title_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Copies the title of the currently loaded sidebar media to clipboard."""
     logger.debug("Copy Title button pressed.")
     if app.current_sidebar_media_item and 'title' in app.current_sidebar_media_item:
@@ -190,7 +190,7 @@ async def handle_chat_media_copy_title_button_pressed(app: 'TldwCli'):
         logger.warning("No media title available to copy.")
 
 
-async def handle_chat_media_copy_content_button_pressed(app: 'TldwCli'):
+async def handle_chat_media_copy_content_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Copies the content of the currently loaded sidebar media to clipboard."""
     logger.debug("Copy Content button pressed.")
     if app.current_sidebar_media_item and 'content' in app.current_sidebar_media_item:
@@ -203,7 +203,7 @@ async def handle_chat_media_copy_content_button_pressed(app: 'TldwCli'):
         logger.warning("No media content available to copy.")
 
 
-async def handle_chat_media_copy_author_button_pressed(app: 'TldwCli'):
+async def handle_chat_media_copy_author_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Copies the author of the currently loaded sidebar media to clipboard."""
     logger.debug("Copy Author button pressed.")
     if app.current_sidebar_media_item and 'author' in app.current_sidebar_media_item:
@@ -216,7 +216,7 @@ async def handle_chat_media_copy_author_button_pressed(app: 'TldwCli'):
         logger.warning("No media author available to copy.")
 
 
-async def handle_chat_media_copy_url_button_pressed(app: 'TldwCli'):
+async def handle_chat_media_copy_url_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     """Copies the URL of the currently loaded sidebar media to clipboard."""
     logger.debug("Copy URL button pressed.")
     if app.current_sidebar_media_item and 'url' in app.current_sidebar_media_item and app.current_sidebar_media_item['url']:

tldw_chatbook/Event_Handlers/LLM_Management_Events/llm_management_events.py

@@ -70,7 +70,7 @@ async def _callback(selected_path: Optional[Path]) -> None:
 ###############################################################################
 
 
-async def handle_llamafile_browse_exec_button_pressed(app: "TldwCli") -> None:
+async def handle_llamafile_browse_exec_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.debug("Llamafile browse executable button pressed.")
 
@@ -85,7 +85,7 @@ async def handle_llamafile_browse_exec_button_pressed(app: "TldwCli") -> None:
     )
 
 
-async def handle_llamafile_browse_model_button_pressed(app: "TldwCli") -> None:
+async def handle_llamafile_browse_model_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.debug("Llamafile browse model button pressed.")
 
@@ -527,7 +527,7 @@ async def stream_worker_output_to_log(app: "TldwCli", worker: Worker, log_widget
 ###############################################################################
 
 
-async def handle_start_llamafile_server_button_pressed(app: "TldwCli") -> None:
+async def handle_start_llamafile_server_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.info("User requested to start Llamafile server.")
 
@@ -597,7 +597,7 @@ async def handle_start_llamafile_server_button_pressed(app: "TldwCli") -> None:
         app.notify("Error setting up Llamafile server start.", severity="error")
 
 
-async def handle_stop_llamafile_server_button_pressed(app: "TldwCli") -> None:
+async def handle_stop_llamafile_server_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.info("User requested to stop Llamafile server.")
 
@@ -668,7 +668,7 @@ async def handle_stop_llamafile_server_button_pressed(app: "TldwCli") -> None:
 ###############################################################################
 
 
-async def handle_llamacpp_browse_exec_button_pressed(app: "TldwCli") -> None:
+async def handle_llamacpp_browse_exec_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.debug("Llama.cpp browse executable button pressed.")
 
@@ -683,7 +683,7 @@ async def handle_llamacpp_browse_exec_button_pressed(app: "TldwCli") -> None:
     )
 
 
-async def handle_llamacpp_browse_model_button_pressed(app: "TldwCli") -> None:
+async def handle_llamacpp_browse_model_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     gguf_filters = Filters(
         ("GGUF Models (*.gguf)", lambda p: p.suffix.lower() == ".gguf"),
         ("All files (*.*)", lambda p: True),
@@ -698,7 +698,7 @@ async def handle_llamacpp_browse_model_button_pressed(app: "TldwCli") -> None:
     )
 
 
-async def handle_start_llamacpp_server_button_pressed(app: "TldwCli") -> None:
+async def handle_start_llamacpp_server_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.info("User requested to start Llama.cpp server.")
 
@@ -769,7 +769,7 @@ async def handle_start_llamacpp_server_button_pressed(app: "TldwCli") -> None:
         app.notify("Error setting up Llama.cpp server start.", severity="error")
 
 
-async def handle_stop_llamacpp_server_button_pressed(app: "TldwCli") -> None:
+async def handle_stop_llamacpp_server_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     """Stops the Llama.cpp server process if it is running."""
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))
     logger.info("User requested to stop Llama.cpp server.")
@@ -880,7 +880,7 @@ async def handle_stop_llamacpp_server_button_pressed(app: "TldwCli") -> None:
 ###############################################################################
 
 
-async def handle_browse_models_dir_button_pressed(app: "TldwCli") -> None:
+async def handle_browse_models_dir_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     """Open a directory picker so the user can choose the *models* directory."""
     await app.push_screen(
         FileOpen(
@@ -891,7 +891,7 @@ async def handle_browse_models_dir_button_pressed(app: "TldwCli") -> None:
     )
 
 
-async def handle_start_model_download_button_pressed(app: "TldwCli") -> None:
+async def handle_start_model_download_button_pressed(app: "TldwCli", event: Button.Pressed) -> None:
     """Validate inputs and launch *run_model_download_worker*."""
 
     logger = getattr(app, "loguru_logger", logging.getLogger(__name__))