Merge pull request #62 from rmusser01/dev

fixes for buttons, and chat editing/deleting messages

Author: rmusser01

tldw_chatbook/Event_Handlers/Chat_Events/chat_events.py

@@ -458,7 +458,7 @@ async def handle_chat_action_button_pressed(app: 'TldwCli', button: Button, acti
                 # to render it as is, without trying to parse for markup.
                 static_text_widget.update(Text(new_text))
                 # --- DO NOT REMOVE ---
-                static_text_widget.update(escape_markup(new_text))  # Update display with escaped text
+                #static_text_widget.update(escape_markup(new_text))  # Update display with escaped text
 
                 static_text_widget.display = True
                 action_widget._editing = False
@@ -1054,7 +1054,7 @@ async def handle_chat_load_selected_button_pressed(app: 'TldwCli', event: Button
         app.notify("Unexpected error loading chat.", severity="error")
 
 
-async def perform_chat_conversation_search(app: 'TldwCli', event: Button.Pressed) -> None:
+async def perform_chat_conversation_search(app: 'TldwCli') -> None:
     loguru_logger.debug("Performing chat conversation search...")
     try:
         search_bar = app.query_one("#chat-conversation-search-bar", Input)

tldw_chatbook/Event_Handlers/notes_events.py

@@ -288,7 +288,7 @@ async def _note_import_callback(app: 'TldwCli', selected_path: Optional[Path]) -
         app.notify("Note import cancelled.", severity="information", timeout=2)
 
 
-async def handle_notes_import_button_pressed(app: 'TldwCli') -> None:
+async def handle_notes_import_button_pressed(app: 'TldwCli', event: Button.Pressed) -> None:
     logger_instance = getattr(app, 'loguru_logger', logger)
     logger_instance.info("Notes 'Import Note' button pressed.")
 

tldw_chatbook/Widgets/chat_message.py

@@ -10,6 +10,7 @@
 from textual.app import ComposeResult
 from textual.containers import Horizontal, Vertical
 from textual.css.query import QueryError
+from textual.message import Message
 from textual.widget import Widget
 from textual.widgets import Static, Button, Label # Added Label
 from textual.reactive import reactive
@@ -23,6 +24,13 @@
 class ChatMessage(Widget):
     """A widget to display a single chat message with action buttons."""
 
+    class Action(Message):
+        """Posted when a button on the message is pressed."""
+        def __init__(self, message_widget: "ChatMessage", button: Button) -> None:
+            super().__init__()
+            self.message_widget = message_widget
+            self.button = button
+
     DEFAULT_CSS = """
     ChatMessage {
         width: 100%;
@@ -168,17 +176,21 @@ def watch__generation_complete_internal(self, complete: bool) -> None:
         if self.has_class("-ai"):
             try:
                 actions_container = self.query_one(".message-actions")
-                continue_button = self.query_one("#continue-response-button", Button)
-
                 if complete:
-                    actions_container.remove_class("-generating") # Makes the bar visible via CSS
-                    actions_container.styles.display = "block"    # Ensures bar is visible
-                    continue_button.display = True                # Makes continue button visible
+                    actions_container.remove_class("-generating")
+                    actions_container.styles.display = "block"
                 else:
-                    # This state typically occurs during initialization if generation_complete=False
-                    actions_container.add_class("-generating") # Hides the bar via CSS
-                    # actions_container.styles.display = "none" # CSS rule should handle this
-                    continue_button.display = False           # Hides continue button
+                    actions_container.add_class("-generating")
+
+                # Separately handle the continue button in its own try...except block
+                # This prevents an error here from stopping the whole function.
+                try:
+                    continue_button = self.query_one("#continue-response-button", Button)
+                    continue_button.display = complete
+                except QueryError:
+                    # It's okay if the continue button doesn't exist, as it's commented out.
+                    logging.debug("Continue button not found in ChatMessage, skipping visibility toggle.")
+
             except QueryError as qe:
                 # This might happen if the query runs before the widget is fully composed or if it's being removed.
                 logging.debug(f"ChatMessage (ID: {self.id}, Role: {self.role}): QueryError in watch__generation_complete_internal: {qe}. Widget might not be fully ready or is not an AI message with these components.")
@@ -191,6 +203,13 @@ def watch__generation_complete_internal(self, complete: bool) -> None:
             except QueryError:
                 pass # Expected for non-AI messages as the button isn't composed.
 
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Called when a button inside this message is pressed."""
+        # Post our custom Action message so the app can handle it.
+        # The message carries the button and this widget instance.
+        self.post_message(self.Action(self, event.button))
+        # Stop the event from bubbling up to the app's on_button_pressed.
+        event.stop()
 
     def mark_generation_complete(self):
         """

tldw_chatbook/app.py

@@ -19,6 +19,7 @@
 from textual.widgets import (
     Static, Button, Input, Header, RichLog, TextArea, Select, ListView, Checkbox, Collapsible, ListItem, Label
 )
+
 from textual.containers import Container
 from textual.reactive import reactive
 from textual.worker import Worker, WorkerState
@@ -645,6 +646,21 @@ def compose_content_area(self) -> ComposeResult:
             yield EvalsWindow(self, id="evals-window", classes="window")
             yield CodingWindow(self, id="coding-window", classes="window")
 
+    @on(ChatMessage.Action)
+    async def handle_chat_message_action(self, event: ChatMessage.Action) -> None:
+        """Handles actions (edit, copy, etc.) from within a ChatMessage widget."""
+        button_classes = " ".join(event.button.classes) # Get class string for logging
+        self.loguru_logger.debug(
+            f"ChatMessage.Action received for button "
+            f"(Classes: {button_classes}, Label: '{event.button.label}') "
+            f"on message role: {event.message_widget.role}"
+        )
+        # The event directly gives us the context we need.
+        # Now we call the existing handler function with the correct arguments.
+        await chat_events.handle_chat_action_button_pressed(
+            self, event.button, event.message_widget
+        )
+
     # --- Watcher for CCP Active View ---
     def watch_ccp_active_view(self, old_view: Optional[str], new_view: str) -> None:
         loguru_logger.debug(f"CCP active view changing from '{old_view}' to: '{new_view}'")
@@ -1990,17 +2006,7 @@ async def on_button_pressed(self, event: Button.Pressed) -> None:
             await tab_events.handle_tab_button_pressed(self, event)
             return
 
-        # 2. Handle dynamically generated ChatMessage action buttons
-        # This needs to check the current tab, as ChatMessages can appear in Chat and CCP tabs.
-        if self.current_tab in [TAB_CHAT, TAB_CCP]:
-            action_widget = self._get_chat_message_widget_from_button(event.button)
-            if action_widget:
-                self.loguru_logger.debug(
-                    f"Button '{button_id}' is inside a ChatMessage, dispatching to action handler.")
-                await chat_events.handle_chat_action_button_pressed(self, event.button, action_widget)
-                return
-
-        # 3. Use the handler map for all other tab-specific buttons
+        # 2. Use the handler map for all other tab-specific buttons
         current_tab_handlers = self.button_handler_map.get(self.current_tab, {})
         handler = current_tab_handlers.get(button_id)
 
@@ -2021,28 +2027,9 @@ async def on_button_pressed(self, event: Button.Pressed) -> None:
                 self.loguru_logger.error(f"Handler for button '{button_id}' is not callable: {handler}")
             return  # The button press was handled (or an error occurred).
 
-        # 4. Fallback for unmapped buttons
+        # 3. Fallback for unmapped buttons
         self.loguru_logger.warning(f"Unhandled button press for ID '{button_id}' on tab '{self.current_tab}'.")
 
-    def _get_chat_message_widget_from_button(self, button: Button) -> Optional[ChatMessage]:
-        """Helper to find the parent ChatMessage widget from an action button within it."""
-        self.loguru_logger.debug(f"_get_chat_message_widget_from_button searching for parent of button ID: {button.id}, Classes: {button.classes}")
-        node: Optional[DOMNode] = button.parent
-        depth = 0
-        max_depth = 5 # Safety break
-        while node is not None and depth < max_depth:
-            self.loguru_logger.debug(f"  Traversal depth {depth}: current node is {type(node)}, id: {getattr(node, 'id', 'N/A')}, classes: {getattr(node, 'classes', '')}")
-            if isinstance(node, ChatMessage):
-                self.loguru_logger.debug(f"  Found ChatMessage parent!")
-                return node
-            node = node.parent
-            depth += 1
-        if depth >= max_depth:
-            self.loguru_logger.warning(f"  _get_chat_message_widget_from_button reached max depth for button: {button.id}")
-        else:
-            self.loguru_logger.warning(f"  _get_chat_message_widget_from_button could not find parent ChatMessage for button: {button.id}")
-        return None
-
     async def on_text_area_changed(self, event: TextArea.Changed) -> None:
         """Handles text area changes, e.g., for live updates to character data."""
         control_id = event.control.id