fix: fixed behavior for keyboard interrupts and user commands

Author: ErikBjare

gptme/chat.py

@@ -4,10 +4,10 @@
 import re
 import sys
 import termios
-from typing import cast
 import urllib.parse
 from collections.abc import Generator
 from pathlib import Path
+from typing import cast
 
 from .commands import action_descriptions, execute_cmd
 from .config import get_config
@@ -19,12 +19,12 @@
 from .message import Message
 from .prompts import get_workspace_prompt
 from .tools import (
+    ConfirmFunc,
     ToolFormat,
     ToolUse,
-    has_tool,
-    get_tools,
     execute_msg,
-    ConfirmFunc,
+    get_tools,
+    has_tool,
     set_tool_format,
 )
 from .tools.browser import read_url
@@ -126,41 +126,31 @@ def confirm_func(msg) -> bool:
         if prompt_msgs:
             while prompt_msgs:
                 msg = prompt_msgs.pop(0)
-                if not msg.content.startswith("/") and msg.role == "user":
-                    msg = _include_paths(msg, workspace)
-                manager.append(msg)
                 # if prompt is a user-command, execute it
-                if msg.role == "user" and execute_cmd(msg, manager, confirm_func):
+                if execute_cmd(msg, manager, confirm_func):
                     continue
+                # else, collect paths
+                msg = _include_paths(msg, workspace)
+                manager.append(msg)
 
                 # Generate and execute response for this prompt
                 while True:
                     try:
                         set_interruptible()
-                        response_msgs = list(
-                            step(
-                                manager.log,
-                                stream,
-                                confirm_func,
-                                tool_format=tool_format_with_default,
-                                workspace=workspace,
-                            )
-                        )
-                    except KeyboardInterrupt:
-                        console.log("Interrupted. Stopping current execution.")
-                        manager.append(Message("system", INTERRUPT_CONTENT))
-                        break
+                        for msg in step(
+                            manager.log,
+                            stream,
+                            confirm_func,
+                            tool_format=tool_format_with_default,
+                            workspace=workspace,
+                        ):
+                            manager.append(msg)
+                            # run any user-commands, if msg is from user
+                            if execute_cmd(msg, manager, confirm_func):
+                                break
                     finally:
                         clear_interruptible()
 
-                    for response_msg in response_msgs:
-                        manager.append(response_msg)
-                        # run any user-commands, if msg is from user
-                        if response_msg.role == "user" and execute_cmd(
-                            response_msg, manager, confirm_func
-                        ):
-                            break
-
                     # Check if there are any runnable tools left
                     last_content = next(
                         (
@@ -229,6 +219,8 @@ def step(
         msg = Message("user", inquiry, quiet=True)
         msg = _include_paths(msg, workspace)
         yield msg
+        if msg.content.startswith("/") and msg.role == "user":
+            return
         log = log.append(msg)
 
     # generate response and run tools

gptme/commands.py

@@ -60,11 +60,8 @@
 
 def execute_cmd(msg: Message, log: LogManager, confirm: ConfirmFunc) -> bool:
     """Executes any user-command, returns True if command was executed."""
-    assert msg.role == "user"
-
-    # if message starts with / treat as command
-    # when command has been run,
-    if msg.content[:1] in ["/"]:
+    # if message is from user and starts with / treat as command
+    if msg.role == "user" and msg.content.startswith("/"):
         for resp in handle_cmd(msg.content, log, confirm):
             log.append(resp)
         return True
@@ -156,19 +153,18 @@ def handle_cmd(
             # Export the chat
             export_chat_to_html(manager.name, manager.log, output_path)
             print(f"Exported conversation to {output_path}")
+        case "help":
+            # undo the '/help' command itself
+            manager.undo(1, quiet=True)
+            manager.write()
+            help()
         case _:
             # the case for python, shell, and other block_types supported by tools
             tooluse = ToolUse(name, [], full_args)
             if tooluse.is_runnable:
                 yield from tooluse.execute(confirm)
             else:
-                if manager.log[-1].content.strip() == "/help":
-                    # undo the '/help' command itself
-                    manager.undo(1, quiet=True)
-                    manager.write()
-                    help()
-                else:
-                    print("Unknown command")
+                print(f"Unknown command: {name}")
 
 
 def edit(manager: LogManager) -> Generator[Message, None, None]:  # pragma: no cover