chat-console 0.1.96.dev1__py3-none-any.whl → 0.1.991.dev1__py3-none-any.whl

app/main.py

@@ -19,7 +19,8 @@ from openai import OpenAI
 from app.models import Message, Conversation
 from app.database import ChatDatabase
 from app.config import CONFIG, OPENAI_API_KEY, ANTHROPIC_API_KEY, OLLAMA_BASE_URL
-from app.ui.chat_interface import MessageDisplay
+# Import InputWithFocus as well
+from app.ui.chat_interface import MessageDisplay, InputWithFocus
 from app.ui.model_selector import ModelSelector, StyleSelector
 from app.ui.chat_list import ChatList
 from app.api.base import BaseModelClient
@@ -114,10 +115,15 @@ class HistoryScreen(Screen):
 class SimpleChatApp(App): # Keep SimpleChatApp class definition
     """Simplified Chat CLI application.""" # Keep SimpleChatApp docstring
     
-    TITLE = "Chat CLI" # Keep SimpleChatApp TITLE
+    TITLE = "Chat Console"
     SUB_TITLE = "AI Chat Interface" # Keep SimpleChatApp SUB_TITLE
     DARK = True # Keep SimpleChatApp DARK
     
+    # Ensure the log directory exists in a standard cache location
+    log_dir = os.path.expanduser("~/.cache/chat-cli")
+    os.makedirs(log_dir, exist_ok=True)
+    LOG_FILE = os.path.join(log_dir, "textual.log") # Use absolute path
+
     CSS = """ # Keep SimpleChatApp CSS start
     #main-content { # Keep SimpleChatApp CSS
         width: 100%;
@@ -240,15 +246,17 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
     
     BINDINGS = [ # Keep SimpleChatApp BINDINGS, ensure Enter is not globally bound for settings
         Binding("q", "quit", "Quit", show=True, key_display="q"),
+        # Removed priority=True - actions should only trigger when input is NOT focused
         Binding("n", "action_new_conversation", "New Chat", show=True, key_display="n"),
-        Binding("c", "action_new_conversation", "New Chat", show=False, key_display="c"),
+        Binding("c", "action_new_conversation", "New Chat", show=False, key_display="c"), # Removed priority from alias
         Binding("escape", "escape", "Cancel / Stop", show=True, key_display="esc"), # Escape might close settings panel too
         Binding("ctrl+c", "quit", "Quit", show=False),
-        Binding("h", "view_history", "History", show=True, key_display="h"),
-        Binding("s", "settings", "Settings", show=True, key_display="s"),
+        Binding("h", "view_history", "History", show=True, key_display="h"), # Action method checks focus
+        Binding("s", "settings", "Settings", show=True, key_display="s"),     # Action method checks focus
+        # Removed priority=True - action should only trigger when input is NOT focused
         Binding("t", "action_update_title", "Update Title", show=True, key_display="t"),
     ] # Keep SimpleChatApp BINDINGS end
-    
+
     current_conversation = reactive(None) # Keep SimpleChatApp reactive var
     is_generating = reactive(False) # Keep SimpleChatApp reactive var
     
@@ -259,7 +267,8 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
         self.selected_model = CONFIG["default_model"] # Keep SimpleChatApp __init__
         self.selected_style = CONFIG["default_style"] # Keep SimpleChatApp __init__
         self.initial_text = initial_text # Keep SimpleChatApp __init__
-        
+        # Removed self.input_widget instance variable
+
     def compose(self) -> ComposeResult: # Modify SimpleChatApp compose
         """Create the simplified application layout."""
         yield Header()
@@ -278,7 +287,8 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
             
             # Input area
             with Container(id="input-area"):
-                yield Input(placeholder="Type your message here...", id="message-input")
+                # Use the custom InputWithFocus widget
+                yield InputWithFocus(placeholder="Type your message here...", id="message-input")
                 # Removed Static widgets previously used for diagnosis
 
             # --- Add Settings Panel (hidden initially) ---
@@ -335,10 +345,12 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
             await self.action_send_message() # Keep SimpleChatApp on_mount
         else: # Keep SimpleChatApp on_mount
             # Focus the input if no initial text # Keep SimpleChatApp on_mount
+            # Removed assignment to self.input_widget
             self.query_one("#message-input").focus() # Keep SimpleChatApp on_mount
-        
+
     async def create_new_conversation(self) -> None: # Keep SimpleChatApp create_new_conversation
         """Create a new chat conversation.""" # Keep SimpleChatApp create_new_conversation docstring
+        log("Entering create_new_conversation") # Added log
         # Create new conversation in database using selected model and style # Keep SimpleChatApp create_new_conversation
         model = self.selected_model # Keep SimpleChatApp create_new_conversation
         style = self.selected_style # Keep SimpleChatApp create_new_conversation
@@ -347,7 +359,9 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
         title = f"New conversation ({datetime.now().strftime('%Y-%m-%d %H:%M')})" # Keep SimpleChatApp create_new_conversation
         
         # Create conversation in database using the correct method # Keep SimpleChatApp create_new_conversation
+        log(f"Creating conversation with title: {title}, model: {model}, style: {style}") # Added log
         conversation_id = self.db.create_conversation(title, model, style) # Keep SimpleChatApp create_new_conversation
+        log(f"Database returned conversation_id: {conversation_id}") # Added log
         
         # Get the full conversation data # Keep SimpleChatApp create_new_conversation
         conversation_data = self.db.get_conversation(conversation_id) # Keep SimpleChatApp create_new_conversation
@@ -361,26 +375,42 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
         
         # Clear messages and update UI # Keep SimpleChatApp create_new_conversation
         self.messages = [] # Keep SimpleChatApp create_new_conversation
+        log("Finished updating messages UI in create_new_conversation") # Added log
         await self.update_messages_ui() # Keep SimpleChatApp create_new_conversation
-        
+
     async def action_new_conversation(self) -> None: # Keep SimpleChatApp action_new_conversation
         """Handle the new conversation action.""" # Keep SimpleChatApp action_new_conversation docstring
-        await self.create_new_conversation() # Keep SimpleChatApp action_new_conversation
+        log("--- ENTERING action_new_conversation ---") # Add entry log
         
+        # Check if the currently focused widget is the input widget
+        currently_focused = self.focused
+        if currently_focused and currently_focused.id == "message-input":
+            log("action_new_conversation skipped: input has focus")
+            return
+
+        log("action_new_conversation EXECUTING") # Add execution log
+        await self.create_new_conversation() # Keep SimpleChatApp action_new_conversation
+        log("action_new_conversation finished") # Added log
+
     def action_escape(self) -> None: # Modify SimpleChatApp action_escape
         """Handle escape key globally."""
+        log("action_escape triggered") # Added log
         settings_panel = self.query_one("#settings-panel")
+        log(f"Settings panel visible: {settings_panel.has_class('visible')}") # Added log
         if settings_panel.has_class("visible"):
+            log("Hiding settings panel") # Added log
             # If settings panel is visible, hide it
             settings_panel.remove_class("visible")
             self.query_one("#message-input").focus() # Focus input after closing settings
         elif self.is_generating:
+            log("Stopping generation") # Added log
             # Otherwise, stop generation if running
             self.is_generating = False # Keep SimpleChatApp action_escape
             self.notify("Generation stopped", severity="warning") # Keep SimpleChatApp action_escape
             loading = self.query_one("#loading-indicator") # Keep SimpleChatApp action_escape
             loading.add_class("hidden") # Keep SimpleChatApp action_escape
-        # else: # Optional: Add other escape behavior for the main screen if desired # Keep SimpleChatApp action_escape comment
+        else: # Optional: Add other escape behavior for the main screen if desired # Keep SimpleChatApp action_escape comment
+            log("Escape pressed, but settings not visible and not generating.") # Added log
             # pass # Keep SimpleChatApp action_escape comment
 
     # Removed action_confirm_or_send - Enter is handled by Input submission # Keep SimpleChatApp comment
@@ -490,6 +520,7 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
             return # Keep SimpleChatApp generate_response
             
         self.is_generating = True # Keep SimpleChatApp generate_response
+        log(f"Setting is_generating to True") # Added log
         loading = self.query_one("#loading-indicator") # Keep SimpleChatApp generate_response
         loading.remove_class("hidden") # Keep SimpleChatApp generate_response
         
@@ -531,6 +562,7 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
             
             async def update_ui(content: str): # Keep SimpleChatApp generate_response
                 if not self.is_generating: # Keep SimpleChatApp generate_response
+                    log("update_ui called but is_generating is False, returning.") # Added log
                     return # Keep SimpleChatApp generate_response
                 
                 async with update_lock: # Keep SimpleChatApp generate_response
@@ -550,7 +582,7 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
                         # Force another refresh to ensure content is visible # Keep SimpleChatApp generate_response
                         self.refresh(layout=True) # Keep SimpleChatApp generate_response
                     except Exception as e: # Keep SimpleChatApp generate_response
-                        logger.error(f"Error updating UI: {str(e)}") # Keep SimpleChatApp generate_response
+                        log.error(f"Error updating UI: {str(e)}") # Use log instead of logger
                 
             # Generate the response with timeout and cleanup # Keep SimpleChatApp generate_response
             generation_task = None # Keep SimpleChatApp generate_response
@@ -558,6 +590,7 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
                 # Create a task for the response generation # Keep SimpleChatApp generate_response
                 generation_task = asyncio.create_task( # Keep SimpleChatApp generate_response
                     generate_streaming_response( # Keep SimpleChatApp generate_response
+                        self, # Pass the app instance
                         api_messages, # Keep SimpleChatApp generate_response
                         model, # Keep SimpleChatApp generate_response
                         style, # Keep SimpleChatApp generate_response
@@ -571,6 +604,7 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
                 
                 # Save to database only if we got a complete response # Keep SimpleChatApp generate_response
                 if self.is_generating and full_response: # Keep SimpleChatApp generate_response
+                    log("Generation finished, saving full response to DB") # Added log
                     self.db.add_message( # Keep SimpleChatApp generate_response
                         self.current_conversation.id, # Keep SimpleChatApp generate_response
                         "assistant", # Keep SimpleChatApp generate_response
@@ -579,9 +613,11 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
                     # Force a final refresh # Keep SimpleChatApp generate_response
                     self.refresh(layout=True) # Keep SimpleChatApp generate_response
                     await asyncio.sleep(0.1)  # Wait for UI to update # Keep SimpleChatApp generate_response
+                elif not full_response:
+                    log("Generation finished but full_response is empty/None") # Added log
                     
             except asyncio.TimeoutError: # Keep SimpleChatApp generate_response
-                logger.error("Response generation timed out") # Keep SimpleChatApp generate_response
+                log.error("Response generation timed out") # Use log instead of logger
                 error_msg = "Response generation timed out. The model may be busy or unresponsive. Please try again." # Keep SimpleChatApp generate_response
                 self.notify(error_msg, severity="error") # Keep SimpleChatApp generate_response
                 
@@ -596,22 +632,25 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
                 # Ensure task is properly cancelled and cleaned up # Keep SimpleChatApp generate_response
                 if generation_task: # Keep SimpleChatApp generate_response
                     if not generation_task.done(): # Keep SimpleChatApp generate_response
+                        log("Cancelling generation task") # Added log
                         generation_task.cancel() # Keep SimpleChatApp generate_response
                         try: # Keep SimpleChatApp generate_response
                             await generation_task # Keep SimpleChatApp generate_response
                         except (asyncio.CancelledError, Exception) as e: # Keep SimpleChatApp generate_response
-                            logger.error(f"Error cleaning up generation task: {str(e)}") # Keep SimpleChatApp generate_response
+                            log.error(f"Error cleaning up generation task: {str(e)}") # Use log instead of logger
                     
                 # Force a final UI refresh # Keep SimpleChatApp generate_response
                 self.refresh(layout=True) # Keep SimpleChatApp generate_response
                 
         except Exception as e: # Keep SimpleChatApp generate_response
+            log.error(f"Exception during generate_response: {str(e)}") # Added log
             self.notify(f"Error generating response: {str(e)}", severity="error") # Keep SimpleChatApp generate_response
             # Add error message # Keep SimpleChatApp generate_response
             error_msg = f"Error generating response: {str(e)}" # Keep SimpleChatApp generate_response
             self.messages.append(Message(role="assistant", content=error_msg)) # Keep SimpleChatApp generate_response
             await self.update_messages_ui() # Keep SimpleChatApp generate_response
         finally: # Keep SimpleChatApp generate_response
+            log(f"Setting is_generating to False in finally block") # Added log
             self.is_generating = False # Keep SimpleChatApp generate_response
             loading = self.query_one("#loading-indicator") # Keep SimpleChatApp generate_response
             loading.add_class("hidden") # Keep SimpleChatApp generate_response
@@ -726,6 +765,16 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
 
     async def action_update_title(self) -> None:
         """Allow users to manually change the conversation title"""
+        log("--- ENTERING action_update_title ---") # Add entry log
+        
+        # Check focus using self.focused instead of has_focus
+        currently_focused = self.focused
+        if currently_focused and currently_focused.id == "message-input":
+            log("action_update_title skipped: input has focus")
+            return
+
+        log("action_update_title EXECUTING") # Add execution log
+
         if not self.current_conversation:
             self.notify("No active conversation", severity="warning")
             return

app/ui/chat_interface.py

@@ -129,20 +129,23 @@ class MessageDisplay(RichLog):
 
 class InputWithFocus(Input):
     """Enhanced Input that better handles focus and maintains cursor position"""
-    
+    # Reverted on_key to default Input behavior for 'n' and 't'
+    # Let the standard Input handle key presses when focused.
+    # We will rely on focus checks within the App's action methods.
+
+    # Keep custom handling only for Enter submission if needed,
+    # but standard Input might already do this. Let's simplify
+    # and remove the custom on_key entirely for now unless
     def on_key(self, event) -> None:
-        """Custom key handling for input"""
-        # Let control keys pass through
-        if event.is_control:
-            return super().on_key(event)
-            
-        # Handle Enter key
-        if event.key == "enter":
-            self.post_message(self.Submitted(self))
-            return
-            
-        # Normal input handling for other keys
-        super().on_key(event)
+        # Let global hotkeys 'n' and 't' pass through even when input has focus
+        # by simply *not* stopping the event here.
+        if event.key == "n" or event.key == "t":
+            # Do nothing, allow the event to bubble up to the app level bindings.
+            return # Explicitly return to prevent further processing in this method
+
+        # For all other keys, the event continues to be processed by the Input
+        # widget's internal handlers (like _on_key shown in the traceback)
+        # because we didn't stop it in this method.
 
 class ChatInterface(Container):
     """Main chat interface container"""

app/utils.py

@@ -4,10 +4,14 @@ import time
 import asyncio
 import subprocess
 import logging
-from typing import Optional, Dict, Any, List
+from typing import Optional, Dict, Any, List, TYPE_CHECKING
 from datetime import datetime
 from .config import CONFIG, save_config
 
+# Import SimpleChatApp for type hinting only if TYPE_CHECKING is True
+if TYPE_CHECKING:
+    from .main import SimpleChatApp
+
 # Set up logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -74,7 +78,8 @@ async def generate_conversation_title(message: str, model: str, client: Any) ->
     logger.error(f"Failed to generate title after multiple retries. Last error: {last_error}")
     return f"Conversation ({datetime.now().strftime('%Y-%m-%d %H:%M')})"
 
-async def generate_streaming_response(messages: List[Dict], model: str, style: str, client: Any, callback: Any) -> str:
+# Modified signature to accept app instance
+async def generate_streaming_response(app: 'SimpleChatApp', messages: List[Dict], model: str, style: str, client: Any, callback: Any) -> str:
     """Generate a streaming response from the model"""
     logger.info(f"Starting streaming response with model: {model}")
     full_response = ""
@@ -84,6 +89,11 @@ async def generate_streaming_response(messages: List[Dict], model: str, style: s
     
     try:
         async for chunk in client.generate_stream(messages, model, style):
+            # Check if generation was cancelled by the app (e.g., via escape key)
+            if not app.is_generating:
+                logger.info("Generation cancelled by app flag.")
+                break # Exit the loop immediately
+
             if chunk:  # Only process non-empty chunks
                 buffer.append(chunk)
                 current_time = time.time()
@@ -92,6 +102,10 @@ async def generate_streaming_response(messages: List[Dict], model: str, style: s
                 if current_time - last_update >= update_interval or len(''.join(buffer)) > 100:
                     new_content = ''.join(buffer)
                     full_response += new_content
+                    # Check again before calling callback, in case it was cancelled during chunk processing
+                    if not app.is_generating:
+                        logger.info("Generation cancelled before UI update.")
+                        break
                     await callback(full_response)
                     buffer = []
                     last_update = current_time
@@ -99,16 +113,22 @@ async def generate_streaming_response(messages: List[Dict], model: str, style: s
                     # Small delay to let UI catch up
                     await asyncio.sleep(0.05)
         
-        # Send any remaining content
-        if buffer:
+        # Send any remaining content if generation wasn't cancelled
+        if buffer and app.is_generating:
             new_content = ''.join(buffer)
             full_response += new_content
             await callback(full_response)
         
-        logger.info("Streaming response completed")
+        if app.is_generating:
+            logger.info("Streaming response completed normally.")
+        else:
+             logger.info("Streaming response loop exited due to cancellation.")
+             
         return full_response
     except Exception as e:
         logger.error(f"Error in streaming response: {str(e)}")
+        # Ensure the app knows generation stopped on error
+        app.is_generating = False
         raise
 
 def ensure_ollama_running() -> bool:

{chat_console-0.1.96.dev1.dist-info → chat_console-0.1.991.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chat-console
-Version: 0.1.96.dev1
+Version: 0.1.991.dev1
 Summary: A command-line interface for chatting with LLMs, storing chats and (future) rag interactions
 Home-page: https://github.com/wazacraftrfid/chat-console
 Author: Johnathan Greenaway

{chat_console-0.1.96.dev1.dist-info → chat_console-0.1.991.dev1.dist-info}/RECORD

@@ -1,23 +1,23 @@
 app/__init__.py,sha256=OeqboIrx_Kjea0CY9Be8nLI-No1YWQfqbWIp-4lMOOI,131
 app/config.py,sha256=sKNp6Za4ZfW-CZBOvEv0TncAS77AnKi86hTM51C4KQ4,5227
 app/database.py,sha256=nt8CVuDpy6zw8mOYqDcfUmNw611t7Ln7pz22M0b6-MI,9967
-app/main.py,sha256=SfeSORMICQR5GPwniN-Hg0TH9xvhmWHvkhTdyxjbK3k,43450
+app/main.py,sha256=PepaAw5akZkWQDeq-BNRVhXWNqsztu9-Tgsz9LuIBTg,46275
 app/models.py,sha256=4-y9Lytay2exWPFi0FDlVeRL3K2-I7E-jBqNzTfokqY,2644
-app/utils.py,sha256=VzsdBvuj8zk7HsLlBjIvq6jvU1G2lSEE1Ml6_sbYs1I,7432
+app/utils.py,sha256=AgmLrmyikt1Y7KturNmZVK2eC6de-RfRadVbp3HmUAg,8434
 app/api/__init__.py,sha256=A8UL84ldYlv8l7O-yKzraVFcfww86SgWfpl4p7R03-w,62
 app/api/anthropic.py,sha256=x5PmBXEKe_ow2NWk8XdqSPR0hLOdCc_ypY5QAySeA78,4234
 app/api/base.py,sha256=-6RSxSpqe-OMwkaq1wVWbu3pVkte-ZYy8rmdvt-Qh48,3953
 app/api/ollama.py,sha256=zFZ3g2sYncvMgcvx92jTCLkigIaDvTuhILcLiCrwisc,11640
 app/api/openai.py,sha256=1fYgFXXL6yj_7lQ893Yj28RYG4M8d6gt_q1gzhhjcig,3641
 app/ui/__init__.py,sha256=RndfbQ1Tv47qdSiuQzvWP96lPS547SDaGE-BgOtiP_w,55
-app/ui/chat_interface.py,sha256=4ahB7IpqL3hLzVPsfN6E4uC833_gMvRSzjSVfdjHGUY,13082
+app/ui/chat_interface.py,sha256=VwmVvltxS9l18DI9U7kL43t8kSPPNsrkkrrUSoGu16Q,13623
 app/ui/chat_list.py,sha256=WQTYVNSSXlx_gQal3YqILZZKL9UiTjmNMIDX2I9pAMM,11205
 app/ui/model_selector.py,sha256=Aj1irAs9DQMn8wfcPsFZGxWmx0JTzHjSe7pVdDMwqTQ,13182
 app/ui/search.py,sha256=b-m14kG3ovqW1-i0qDQ8KnAqFJbi5b1FLM9dOnbTyIs,9763
 app/ui/styles.py,sha256=04AhPuLrOd2yenfRySFRestPeuTPeMLzhmMB67NdGvw,5615
-chat_console-0.1.96.dev1.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
-chat_console-0.1.96.dev1.dist-info/METADATA,sha256=EVvIxf_H7acsAEoSRl2Jw-LeIPdwJVLLS6ca7KcyOXY,2927
-chat_console-0.1.96.dev1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-chat_console-0.1.96.dev1.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
-chat_console-0.1.96.dev1.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
-chat_console-0.1.96.dev1.dist-info/RECORD,,
+chat_console-0.1.991.dev1.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
+chat_console-0.1.991.dev1.dist-info/METADATA,sha256=1eRmKQXkPFNZT4f54lotKMLPMsmJP4gSLecZZN82VuY,2928
+chat_console-0.1.991.dev1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+chat_console-0.1.991.dev1.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
+chat_console-0.1.991.dev1.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
+chat_console-0.1.991.dev1.dist-info/RECORD,,