Fixed terminal width errors, restored placeholder

KillianLucas · KillianLucas · commit 99701b9e05fc · 2024-11-21T20:33:59.000-08:00
diff --git a/interpreter_1/cli.py b/interpreter_1/cli.py
@@ -19,7 +19,7 @@
 import threading
 from typing import Any, Dict
 
-from .misc.get_input import get_input
+from .misc.get_input import async_get_input
 from .misc.spinner import SimpleSpinner
 from .profiles import Profile
 
@@ -214,7 +214,7 @@ def load_interpreter_thread(args):
         thread.start()
 
         # Get user input
-        message = await get_input()
+        message = await async_get_input()
 
         # Wait for the thread to finish
         thread.join()
diff --git a/interpreter_1/interpreter.py b/interpreter_1/interpreter.py
@@ -858,7 +858,7 @@ def chat(self):
         try:
             message_count = 0
             while True:
-                user_input = input("> ")
+                user_input = get_input()
                 print("")
 
                 message_count += 1  # Increment counter after each message
diff --git a/interpreter_1/misc/get_input.py b/interpreter_1/misc/get_input.py
@@ -1,7 +1,106 @@
-import readline
+from typing import Optional
 
+from prompt_toolkit import PromptSession
+from prompt_toolkit.formatted_text import HTML
+from prompt_toolkit.history import InMemoryHistory
+from prompt_toolkit.key_binding import KeyBindings
 
-async def get_input(
-    placeholder_text=None, placeholder_color: str = "gray", multiline_support=True
+
+async def async_get_input(
+    placeholder_text: Optional[str] = None,
+    placeholder_color: str = "gray",
+    multiline_support: bool = True,
+) -> str:
+    placeholder_text = "Describe command"
+    history = InMemoryHistory()
+    session = PromptSession(
+        history=history,
+        enable_open_in_editor=False,
+        enable_history_search=False,
+        auto_suggest=None,
+        multiline=True,
+    )
+    kb = KeyBindings()
+    multiline = [False]
+
+    @kb.add("enter")
+    def _(event):
+        current_line = event.current_buffer.document.current_line.rstrip()
+
+        if current_line == '"""':
+            multiline[0] = not multiline[0]
+            event.current_buffer.insert_text("\n")
+            if not multiline[0]:  # If exiting multiline mode, submit
+                event.current_buffer.validate_and_handle()
+            return
+
+        if multiline[0]:
+            event.current_buffer.insert_text("\n")
+        else:
+            event.current_buffer.validate_and_handle()
+
+    result = await session.prompt_async(
+        "> ",
+        placeholder=HTML(f'<style fg="{placeholder_color}">{placeholder_text}</style>')
+        if placeholder_text
+        else None,
+        key_bindings=kb,
+        complete_while_typing=False,
+        enable_suspend=False,
+        search_ignore_case=True,
+        include_default_pygments_style=False,
+        input_processors=[],
+        enable_system_prompt=False,
+        wrap_lines=False,
+    )
+    return result
+
+
+def get_input(
+    placeholder_text: Optional[str] = None,
+    placeholder_color: str = "gray",
+    multiline_support: bool = True,
 ) -> str:
-    return input("> ")
+    placeholder_text = "Describe command"
+    history = InMemoryHistory()
+    session = PromptSession(
+        history=history,
+        enable_open_in_editor=False,
+        enable_history_search=False,
+        auto_suggest=None,
+        multiline=True,
+    )
+    kb = KeyBindings()
+    multiline = [False]
+
+    @kb.add("enter")
+    def _(event):
+        current_line = event.current_buffer.document.current_line.rstrip()
+
+        if current_line == '"""':
+            multiline[0] = not multiline[0]
+            event.current_buffer.insert_text("\n")
+            if not multiline[0]:  # If exiting multiline mode, submit
+                event.current_buffer.validate_and_handle()
+            return
+
+        if multiline[0]:
+            event.current_buffer.insert_text("\n")
+        else:
+            event.current_buffer.validate_and_handle()
+
+    result = session.prompt(
+        "> ",
+        placeholder=HTML(f'<style fg="{placeholder_color}">{placeholder_text}</style>')
+        if placeholder_text
+        else None,
+        key_bindings=kb,
+        complete_while_typing=False,
+        enable_suspend=False,
+        search_ignore_case=True,
+        include_default_pygments_style=False,
+        input_processors=[],
+        enable_system_prompt=False,
+        wrap_lines=False,
+    )
+    return result
diff --git a/interpreter_1/misc/welcome copy.py b/interpreter_1/misc/welcome copy.py
@@ -7,10 +7,6 @@
 
 
 def welcome_message(args):
-    try:
-        terminal_width = os.get_terminal_size().columns
-    except:
-        terminal_width = 80
     print()
     renderer = MarkdownRenderer()
 
diff --git a/interpreter_1/ui/markdown.py b/interpreter_1/ui/markdown.py
@@ -164,7 +164,10 @@ def feed(self, text: str):
                         # First newline after ``` - this line contains the language
                         self.code_lang = self.current_code_line
                         self.collecting_lang = False
-                        terminal_width = os.get_terminal_size().columns
+                        try:
+                            terminal_width = os.get_terminal_size().columns
+                        except:
+                            terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
                         sys.stdout.write(
                             "\033[38;5;240m\n────┬" + "─" * (terminal_width - 5) + "\n"
                         )  # Top line
@@ -188,7 +191,10 @@ def feed(self, text: str):
                             style=os.getenv("INTERPRETER_CODE_STYLE", "monokai")
                         )
 
-                        terminal_width = os.get_terminal_size().columns
+                        try:
+                            terminal_width = os.get_terminal_size().columns
+                        except:
+                            terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
                         line_prefix = (
                             f"\033[38;5;240m{str(self.line_number).rjust(3)} │ "
                         )
@@ -258,7 +264,10 @@ def feed(self, text: str):
                         sys.stdout.write(
                             f"{str(self.line_number).rjust(4)} │ {formatted}\n"
                         )
-                    terminal_width = os.get_terminal_size().columns
+                    try:
+                        terminal_width = os.get_terminal_size().columns
+                    except:
+                        terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
                     sys.stdout.write(
                         "\033[38;5;240m────┴" + "─" * (terminal_width - 5) + "\033[0m\n"
                     )
diff --git a/interpreter_1/ui/tool.py b/interpreter_1/ui/tool.py
@@ -37,7 +37,7 @@ def __init__(self, style):
         try:
             self.terminal_width = os.get_terminal_size().columns
         except:
-            self.terminal_width = 50
+            self.terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
         self.safety_padding = 4  # Extra padding to prevent edge cases
         self.json_obj = None
 
@@ -338,7 +338,7 @@ def __init__(self, style):
         try:
             self.terminal_width = os.get_terminal_size().columns
         except:
-            self.terminal_width = 50
+            self.terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
         self.prefix_width = 5  # "123 │ " = 6 characters
         self.safety_padding = 2  # Extra padding to prevent edge cases
         self.show_context = True
@@ -515,7 +515,7 @@ def __init__(self, style):
         try:
             self.terminal_width = os.get_terminal_size().columns
         except:
-            self.terminal_width = 50
+            self.terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
         self.prefix_width = 6
         self.safety_padding = 4
         self.buffer = ""  # Add buffer for line-by-line processing
@@ -633,9 +633,9 @@ class SchemaRenderer:
     @staticmethod
     def print_separator(char="─", newline=True, line=True):
         try:
-            terminal_width = os.get_terminal_size().columns
+            self.terminal_width = os.get_terminal_size().columns
         except:
-            terminal_width = 50
+            self.terminal_width = int(os.environ.get("TERMINAL_WIDTH", "50"))
         if newline:
             sys.stdout.write("\n")
         if line:
