Better --plain

Author: KillianLucas

interpreter/core/core.py

@@ -435,7 +435,10 @@ def reset(self):
 
     def display_message(self, markdown):
         # This is just handy for start_script in profiles.
-        display_markdown_message(markdown)
+        if self.plain_text_display:
+            print(markdown)
+        else:
+            display_markdown_message(markdown)
 
     def get_oi_dir(self):
         # Again, just handy for start_script in profiles.

interpreter/core/llm/llm.py

@@ -17,9 +17,6 @@
 import requests
 import tokentrim as tt
 
-from ...terminal_interface.utils.display_markdown_message import (
-    display_markdown_message,
-)
 from .run_text_llm import run_text_llm
 
 # from .run_function_calling_llm import run_function_calling_llm
@@ -232,7 +229,7 @@ def run(self, messages):
                 except:
                     if len(messages) == 1:
                         if self.interpreter.in_terminal_interface:
-                            display_markdown_message(
+                            self.interpreter.display_message(
                                 """
 **We were unable to determine the context window of this model.** Defaulting to 8000.
 
@@ -242,7 +239,7 @@ def run(self, messages):
                             """
                             )
                         else:
-                            display_markdown_message(
+                            self.interpreter.display_message(
                                 """
 **We were unable to determine the context window of this model.** Defaulting to 8000.
 

interpreter/core/respond.py

@@ -7,7 +7,6 @@
 os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
 import litellm
 
-from ..terminal_interface.utils.display_markdown_message import display_markdown_message
 from .render_message import render_message
 
 
@@ -88,7 +87,7 @@ def respond(interpreter):
                     yield {"role": "assistant", **chunk}
 
             except litellm.exceptions.BudgetExceededError:
-                display_markdown_message(
+                interpreter.display_message(
                     f"""> Max budget exceeded
 
                     **Session spend:** ${litellm._current_cost}
@@ -136,8 +135,8 @@ def respond(interpreter):
 
                     if response.strip().lower() == "y":
                         interpreter.llm.model = "i"
-                        display_markdown_message(f"> Model set to `i`")
-                        display_markdown_message(
+                        interpreter.display_message(f"> Model set to `i`")
+                        interpreter.display_message(
                             "***Note:*** *Conversations with this model will be used to train our open-source model.*\n"
                         )
 

interpreter/terminal_interface/conversation_navigator.py

@@ -10,7 +10,6 @@
 import inquirer
 
 from .render_past_conversation import render_past_conversation
-from .utils.display_markdown_message import display_markdown_message
 from .utils.local_storage_path import get_storage_path
 
 
@@ -19,7 +18,7 @@ def conversation_navigator(interpreter):
 
     conversations_dir = get_storage_path("conversations")
 
-    display_markdown_message(
+    interpreter.display_message(
         f"""> Conversations are stored in "`{conversations_dir}`".
     
     Select a conversation to resume.

interpreter/terminal_interface/magic_commands.py

@@ -7,7 +7,6 @@
 
 from ..core.utils.system_debug_info import system_info
 from .utils.count_tokens import count_messages_tokens
-from .utils.display_markdown_message import display_markdown_message
 from .utils.export_to_markdown import export_to_markdown
 
 
@@ -36,11 +35,11 @@ def handle_undo(self, arguments):
     # Print out a preview of what messages were removed.
     for message in removed_messages:
         if "content" in message and message["content"] != None:
-            display_markdown_message(
+            self.display_message(
                 f"**Removed message:** `\"{message['content'][:30]}...\"`"
             )
         elif "function_call" in message:
-            display_markdown_message(
+            self.display_message(
                 f"**Removed codeblock**"
             )  # TODO: Could add preview of code removed here.
 
@@ -75,12 +74,12 @@ def handle_help(self, arguments):
     # Combine the base message with the additional info
     full_message = base_message + additional_info
 
-    display_markdown_message("".join(full_message))
+    self.display_message("".join(full_message))
 
 
 def handle_verbose(self, arguments=None):
     if arguments == "" or arguments == "true":
-        display_markdown_message("> Entered verbose mode")
+        self.display_message("> Entered verbose mode")
         print("\n\nCurrent messages:\n")
         for message in self.messages:
             message = message.copy()
@@ -95,15 +94,15 @@ def handle_verbose(self, arguments=None):
         print("\n")
         self.verbose = True
     elif arguments == "false":
-        display_markdown_message("> Exited verbose mode")
+        self.display_message("> Exited verbose mode")
         self.verbose = False
     else:
-        display_markdown_message("> Unknown argument to verbose command.")
+        self.display_message("> Unknown argument to verbose command.")
 
 
 def handle_debug(self, arguments=None):
     if arguments == "" or arguments == "true":
-        display_markdown_message("> Entered debug mode")
+        self.display_message("> Entered debug mode")
         print("\n\nCurrent messages:\n")
         for message in self.messages:
             message = message.copy()
@@ -118,21 +117,21 @@ def handle_debug(self, arguments=None):
         print("\n")
         self.debug = True
     elif arguments == "false":
-        display_markdown_message("> Exited verbose mode")
+        self.display_message("> Exited verbose mode")
         self.debug = False
     else:
-        display_markdown_message("> Unknown argument to debug command.")
+        self.display_message("> Unknown argument to debug command.")
 
 
 def handle_auto_run(self, arguments=None):
     if arguments == "" or arguments == "true":
-        display_markdown_message("> Entered auto_run mode")
+        self.display_message("> Entered auto_run mode")
         self.auto_run = True
     elif arguments == "false":
-        display_markdown_message("> Exited auto_run mode")
+        self.display_message("> Exited auto_run mode")
         self.auto_run = False
     else:
-        display_markdown_message("> Unknown argument to auto_run command.")
+        self.display_message("> Unknown argument to auto_run command.")
 
 
 def handle_info(self, arguments):
@@ -141,11 +140,11 @@ def handle_info(self, arguments):
 
 def handle_reset(self, arguments):
     self.reset()
-    display_markdown_message("> Reset Done")
+    self.display_message("> Reset Done")
 
 
 def default_handle(self, arguments):
-    display_markdown_message("> Unknown command")
+    self.display_message("> Unknown command")
     handle_help(self, arguments)
 
 
@@ -157,7 +156,7 @@ def handle_save_message(self, json_path):
     with open(json_path, "w") as f:
         json.dump(self.messages, f, indent=2)
 
-    display_markdown_message(f"> messages json export to {os.path.abspath(json_path)}")
+    self.display_message(f"> messages json export to {os.path.abspath(json_path)}")
 
 
 def handle_load_message(self, json_path):
@@ -168,9 +167,7 @@ def handle_load_message(self, json_path):
     with open(json_path, "r") as f:
         self.messages = json.load(f)
 
-    display_markdown_message(
-        f"> messages json loaded from {os.path.abspath(json_path)}"
-    )
+    self.display_message(f"> messages json loaded from {os.path.abspath(json_path)}")
 
 
 def handle_count_tokens(self, prompt):
@@ -212,7 +209,7 @@ def handle_count_tokens(self, prompt):
         f"**Note**: This functionality is currently experimental and may not be accurate. Please report any issues you find to the [Open Interpreter GitHub repository](https://github.com/KillianLucas/open-interpreter)."
     )
 
-    display_markdown_message("\n".join(outputs))
+    self.display_message("\n".join(outputs))
 
 
 def get_downloads_path():
@@ -295,7 +292,7 @@ def jupyter(self, arguments):
         nbformat.write(nb, f)
 
     print("")
-    display_markdown_message(
+    self.display_message(
         f"Jupyter notebook file exported to {os.path.abspath(notebook_path)}"
     )
 

interpreter/terminal_interface/profiles/profiles.py

@@ -13,7 +13,6 @@
 import send2trash
 import yaml
 
-from ..utils.display_markdown_message import display_markdown_message
 from ..utils.oi_dir import oi_dir
 from .historical_profiles import historical_profiles
 
@@ -194,11 +193,11 @@ def apply_profile(interpreter, profile, profile_path):
             return interpreter
 
     if "system_message" in profile:
-        display_markdown_message(
+        interpreter.display_message(
             "\n**FYI:** A `system_message` was found in your profile.\n\nBecause we frequently improve our default system message, we highly recommend removing the `system_message` parameter in your profile (which overrides the default system message) or simply resetting your profile.\n\n**To reset your profile, run `interpreter --reset_profile`.**\n"
         )
         time.sleep(2)
-        display_markdown_message("---")
+        interpreter.display_message("---")
 
     if "computer" in profile and "languages" in profile["computer"]:
         # this is handled specially

interpreter/terminal_interface/start_terminal_interface.py

@@ -13,7 +13,6 @@
 from .conversation_navigator import conversation_navigator
 from .profiles.profiles import open_storage_dir, profile, reset_profile
 from .utils.check_for_update import check_for_update
-from .utils.display_markdown_message import display_markdown_message
 from .validate_llm_settings import validate_llm_settings
 
 
@@ -45,7 +44,7 @@ def start_terminal_interface(interpreter):
         },
         {
             "name": "system_message",
-            "nickname": "s",
+            "nickname": "sm",
             "help_text": "(we don't recommend changing this) base prompt for the language model",
             "type": str,
             "attribute": {"object": interpreter, "attr_name": "system_message"},
@@ -174,7 +173,7 @@ def start_terminal_interface(interpreter):
         },
         {
             "name": "speak_messages",
-            "nickname": "sm",
+            "nickname": "sp",
             "help_text": "(Mac only, experimental) use the applescript `say` command to read messages aloud",
             "type": bool,
             "attribute": {"object": interpreter, "attr_name": "speak_messages"},
@@ -296,11 +295,15 @@ def start_terminal_interface(interpreter):
         },
         {
             "name": "stdin",
+            "nickname": "s",
             "help_text": "Run OI in stdin mode",
             "type": bool,
         },
     ]
 
+    if "--stdin" in sys.argv and "--plain" not in sys.argv:
+        sys.argv += ["--plain"]
+
     # i shortcut
     if len(sys.argv) > 1 and not sys.argv[1].startswith("-"):
         message = " ".join(sys.argv[1:])
@@ -516,7 +519,7 @@ def print_help(self, *args, **kwargs):
         if not interpreter.offline and not args.stdin:
             # This message should actually be pushed into the utility
             if check_for_update():
-                display_markdown_message(
+                interpreter.display_message(
                     "> **A new version of Open Interpreter is available.**\n>Please run: `pip install --upgrade open-interpreter`\n\n---"
                 )
     except:

interpreter/terminal_interface/terminal_interface.py

@@ -24,7 +24,6 @@
 from .magic_commands import handle_magic_command
 from .utils.check_for_package import check_for_package
 from .utils.cli_input import cli_input
-from .utils.display_markdown_message import display_markdown_message
 from .utils.display_output import display_output
 from .utils.find_image_path import find_image_path
 
@@ -66,9 +65,12 @@ def terminal_interface(interpreter, message):
         else:
             interpreter_intro_message.append("Use `interpreter -y` to bypass this.")
 
-        interpreter_intro_message.append("Press `CTRL-C` to exit.")
+        if (
+            not interpreter.plain_text_display
+        ):  # A proxy/heuristic for standard in mode, which isn't tracked (but prob should be)
+            interpreter_intro_message.append("Press `CTRL-C` to exit.")
 
-        display_markdown_message("\n\n".join(interpreter_intro_message) + "\n")
+        interpreter.display_message("\n\n".join(interpreter_intro_message) + "\n")
 
     if message:
         interactive = False
@@ -264,12 +266,12 @@ def terminal_interface(interpreter, message):
                 # Plain text mode
                 if interpreter.plain_text_display:
                     if "start" in chunk or "end" in chunk:
-                        print("\n")
+                        print("")
                     if chunk["type"] in ["code", "console"] and "format" in chunk:
                         if "start" in chunk:
-                            print("\n---\n\n```" + chunk["format"], flush=True)
+                            print("```" + chunk["format"], flush=True)
                         if "end" in chunk:
-                            print("\n```\n\n---\n\n", flush=True)
+                            print("```", flush=True)
                     if chunk.get("format") != "active_line":
                         print(chunk.get("content", ""), end="", flush=True)
                     continue

interpreter/terminal_interface/validate_llm_settings.py

@@ -15,8 +15,6 @@
     contribute_conversation_launch_logic,
 )
 
-from .utils.display_markdown_message import display_markdown_message
-
 
 def validate_llm_settings(interpreter):
     """
@@ -48,7 +46,7 @@ def validate_llm_settings(interpreter):
                 ):
                     display_welcome_message_once()
 
-                    display_markdown_message(
+                    interpreter.display_message(
                         """---
                     > OpenAI API key not found
 
@@ -68,7 +66,7 @@ def validate_llm_settings(interpreter):
                         )
                         exit()
 
-                    display_markdown_message(
+                    interpreter.display_message(
                         """
 
                     **Tip:** To save this key for later, run one of the following and then restart your terminal. 
@@ -96,10 +94,10 @@ def validate_llm_settings(interpreter):
         and not interpreter.offline
         and not (len(interpreter.messages) == 1)
     ):
-        display_markdown_message(f"> Model set to `{interpreter.llm.model}`")
+        interpreter.display_message(f"> Model set to `{interpreter.llm.model}`")
     if len(interpreter.messages) == 1:
         # Special message for "i {command}" usage
-        # display_markdown_message(f"\n*{interpreter.llm.model} via Open Interpreter:*")
+        # interpreter.display_message(f"\n*{interpreter.llm.model} via Open Interpreter:*")
         pass
 
     if interpreter.llm.model == "i":
@@ -118,7 +116,7 @@ def display_welcome_message_once():
     (Uses an internal attribute `_displayed` to track its state.)
     """
     if not hasattr(display_welcome_message_once, "_displayed"):
-        display_markdown_message(
+        interpreter.display_message(
             """
         ●