wip

aider/coder.py

@@ -7,7 +7,6 @@ import time
 from openai.error import RateLimitError
 
 from rich.console import Console
-from rich.prompt import Confirm, Prompt
 from rich.live import Live
 from rich.text import Text
 from rich.markdown import Markdown
@@ -563,13 +562,3 @@ class Coder:
         if not files:
             return 0
         return max(Path(path).stat().st_mtime for path in files)
-
-    def confirm_ask(self, question, default=None):
-        if self.yes:
-            return True
-        return Confirm.ask(question, console=self.console, default=default)
-
-    def prompt_ask(self, question, default=None):
-        if self.yes:
-            return True
-        return Prompt.ask(question, console=self.console, default=default)

aider/getinput.py

@@ -6,7 +6,7 @@ from pygments.util import ClassNotFound
 from prompt_toolkit import prompt
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.history import FileHistory
-from prompt_toolkit.shortcuts import CompleteStyle
+from prompt_toolkit.shortcuts import CompleteStyle, confirm
 from rich.console import Console
 import sys
 import time
@@ -38,9 +38,7 @@ class FileContentCompleter(Completer):
             if len(words) == 1 and not text[-1].isspace():
                 candidates = self.commands.get_commands()
             else:
-                for completion in self.commands.get_command_completions(
-                    words[0][1:], words[-1]
-                ):
+                for completion in self.commands.get_command_completions(words[0][1:], words[-1]):
                     yield completion
                 return
         else:
@@ -117,3 +115,15 @@ def get_input(history_file, fnames, commands):
 
     print()
     return inp
+
+
+def confirm_ask(question, default=None, yes=False):
+    if yes:
+        return True
+    return confirm(question, default=default)
+
+
+def prompt_ask(question, default=None, yes=False):
+    if yes:
+        return True
+    return prompt(question, default=default)