Better profiles, script improvements

Author: KillianLucas

archive/wtf copy.py

@@ -85,8 +85,8 @@ def _profile_to_arg_params(profile: Profile) -> Dict[str, Dict[str, Any]]:
             "help": "Overwrite system message",
         },
         "custom_instructions": {
-            "flags": ["--custom-instructions"],
-            "default": profile.custom_instructions,
+            "flags": ["--instructions"],
+            "default": profile.instructions,
             "help": "Appended to default system message",
         },
         "max_budget": {
@@ -213,6 +213,9 @@ async def async_load():
             message = args["input_message"]
         else:
             message = sys.stdin.read().strip()
+            # print("---")
+            # print(message)
+            # print("---")
         interpreter.messages = [{"role": "user", "content": message}]
 
         # Run the generator until completion

interpreter_1/cli.py

@@ -7,7 +7,7 @@
 import traceback
 import uuid
 from datetime import datetime
-from typing import Any, List, Optional, cast
+from typing import Any, cast
 
 from prompt_toolkit import PromptSession
 from prompt_toolkit.formatted_text import HTML
@@ -24,20 +24,22 @@
 from urllib.parse import quote
 
 import litellm
-from anthropic import Anthropic, AnthropicBedrock, AnthropicVertex
+
+litellm.suppress_debug_info = True
+litellm.REPEATED_STREAMING_CHUNK_LIMIT = 99999999
+litellm.modify_params = True
+
+from anthropic import Anthropic
 from anthropic.types.beta import (
     BetaContentBlock,
     BetaContentBlockParam,
     BetaImageBlockParam,
     BetaMessage,
-    BetaMessageParam,
     BetaRawContentBlockDeltaEvent,
     BetaRawContentBlockStartEvent,
     BetaRawContentBlockStopEvent,
-    BetaTextBlock,
     BetaTextBlockParam,
     BetaToolResultBlockParam,
-    BetaToolUseBlockParam,
 )
 
 from .misc.spinner import SimpleSpinner
@@ -54,21 +56,6 @@
 # Initialize markdown renderer
 md = MarkdownRenderer()
 
-# System prompt with dynamic values
-SYSTEM_PROMPT = f"""<SYSTEM_CAPABILITY>
-* You are an AI assistant with access to a machine running on {"Mac OS" if platform.system() == "Darwin" else platform.system()} with internet access.
-* When using your computer function calls, they take a while to run and send back to you. Where possible/feasible, try to chain multiple of these calls all into one function calls request.
-* The current date is {datetime.today().strftime('%A, %B %d, %Y')}.
-* The user's cwd is {os.getcwd()} and username is {os.getlogin()}.
-</SYSTEM_CAPABILITY>"""
-
-# Update system prompt for Mac OS
-if platform.system() == "Darwin":
-    SYSTEM_PROMPT += """
-<IMPORTANT>
-* Open applications using Spotlight by using the computer tool to simulate pressing Command+Space, typing the application name, and pressing Enter.
-</IMPORTANT>"""
-
 
 # Helper function used in async_respond()
 def _make_api_tool_result(
@@ -216,16 +203,20 @@ async def async_respond(self):
             tools.append(ComputerTool())
 
         tool_collection = ToolCollection(*tools)
-        system = BetaTextBlockParam(
-            type="text",
-            text=SYSTEM_PROMPT,
-        )
 
         model_info = litellm.get_model_info(self.model)
         if self.provider == None:
             self.provider = model_info["litellm_provider"]
         max_tokens = model_info["max_tokens"]
 
+        system_message = self.system_message + "\n\n" + self.instructions
+        system_message = system_message.strip()
+
+        system = BetaTextBlockParam(
+            type="text",
+            text=system_message,
+        )
+
         while True:
             self._spinner.start()
 
@@ -493,7 +484,7 @@ async def async_respond(self):
 
                 params = {
                     "model": actual_model,
-                    "messages": [{"role": "system", "content": SYSTEM_PROMPT}]
+                    "messages": [{"role": "system", "content": system_message}]
                     + self.messages,
                     "stream": stream,
                     "api_base": api_base,

interpreter_1/interpreter.py

@@ -41,7 +41,7 @@ def help_message(u):
 {BLUE_COLOR}--auto-run{RESET_COLOR}, {BLUE_COLOR}-y{RESET_COLOR}       Auto-run suggested commands
 
 {BLUE_COLOR}--system-message{RESET_COLOR}     Override default system message
-{BLUE_COLOR}--instructions{RESET_COLOR}       Additional instructions to append
+{BLUE_COLOR}--instructions{RESET_COLOR}       Additional instructions in system message
 {BLUE_COLOR}--max-budget{RESET_COLOR}         Maximum spend allowed (-1 for unlimited)
 {BLUE_COLOR}--max-turns{RESET_COLOR}          Maximum conversation turns (-1 for unlimited)
 

interpreter_1/misc/help.py

@@ -1,5 +1,22 @@
 import json
 import os
+import platform
+from datetime import datetime
+
+# System prompt with dynamic values
+SYSTEM_PROMPT = f"""<SYSTEM_CAPABILITY>
+* You are an AI assistant with access to a machine running on {"Mac OS" if platform.system() == "Darwin" else platform.system()} with internet access.
+* When using your computer function calls, they take a while to run and send back to you. Where possible/feasible, try to chain multiple of these calls all into one function calls request.
+* The current date is {datetime.today().strftime('%A, %B %d, %Y')}.
+* The user's cwd is {os.getcwd()} and username is {os.getlogin()}.
+</SYSTEM_CAPABILITY>"""
+
+# Update system prompt for Mac OS
+if platform.system() == "Darwin":
+    SYSTEM_PROMPT += """
+<IMPORTANT>
+* Open applications using Spotlight by using the computer tool to simulate pressing Command+Space, typing the application name, and pressing Enter.
+</IMPORTANT>"""
 
 
 class Profile:
@@ -45,8 +62,8 @@ def __init__(self):
 
         # Conversation state
         self.messages = []  # List of conversation messages
-        self.system_message = None  # System prompt override
-        self.custom_instructions = None  # Additional model instructions
+        self.system_message = SYSTEM_PROMPT  # System prompt override
+        self.instructions = ""  # Additional model instructions
 
         # Available tools and settings
         self.tools = ["interpreter", "editor"]  # Enabled tool modules

interpreter_1/profiles.py

@@ -34,7 +34,10 @@ def __init__(self, style):
         self.rendered_content = ""
         self.spinner = SimpleSpinner("")
         self.is_spinning = False
-        self.terminal_width = os.get_terminal_size().columns
+        try:
+            self.terminal_width = os.get_terminal_size().columns
+        except:
+            self.terminal_width = 50
         self.safety_padding = 4  # Extra padding to prevent edge cases
         self.json_obj = None
 
@@ -328,10 +331,13 @@ def __init__(self, style):
         self.line_number = 1
         self.rendered_content = ""
         self.is_spinning = False
-        self.spinner = yaspin(Spinners.simpleDots, text="  ")
+        self.spinner = SimpleSpinner("")
         self.code_lang = "python"
         self.buffer = ""
-        self.terminal_width = os.get_terminal_size().columns
+        try:
+            self.terminal_width = os.get_terminal_size().columns
+        except:
+            self.terminal_width = 50
         self.prefix_width = 5  # "123 │ " = 6 characters
         self.safety_padding = 2  # Extra padding to prevent edge cases
         self.show_context = True
@@ -506,7 +512,10 @@ def __init__(self, style):
         self.rendered_content = ""
         self.line_number = 1
         self.code_lang = "python"
-        self.terminal_width = os.get_terminal_size().columns
+        try:
+            self.terminal_width = os.get_terminal_size().columns
+        except:
+            self.terminal_width = 50
         self.prefix_width = 6
         self.safety_padding = 4
         self.buffer = ""  # Add buffer for line-by-line processing
@@ -623,7 +632,10 @@ class SchemaRenderer:
 
     @staticmethod
     def print_separator(char="─", newline=True, line=True):
-        terminal_width = os.get_terminal_size().columns
+        try:
+            terminal_width = os.get_terminal_size().columns
+        except:
+            terminal_width = 50
         if newline:
             sys.stdout.write("\n")
         if line:

interpreter_1/ui/tool.py

@@ -29,10 +29,11 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-interpreter = "interpreter.terminal_interface.start_terminal_interface:main"
+i = "interpreter_1.cli:main"
+interpreter = "interpreter_1.cli:main"
+
 wtf = "scripts.wtf:main"
 interpreter-classic = "interpreter.terminal_interface.start_terminal_interface:main"
-i = "interpreter_1.cli:main"
 
 [tool.black]
 target-version = ['py311']

pyproject.toml

@@ -0,0 +1,138 @@
+"""
+Shell Integration Setup for Open Interpreter
+
+This script installs shell integration that:
+1. Maintains a transcript of terminal interactions (commands and their outputs)
+2. Captures both successful commands and their results
+3. Routes unknown commands to the interpreter with full terminal history as context
+4. Works with both zsh and bash shells
+
+The history is stored in ~/.shell_history_with_output in a chat-like format:
+user: <command>
+computer: <output>
+"""
+
+import os
+import re
+from pathlib import Path
+
+
+def get_shell_config():
+    """Determine user's shell and return the appropriate config file path."""
+    shell = os.environ.get("SHELL", "").lower()
+    home = str(Path.home())
+
+    if "zsh" in shell:
+        return os.path.join(home, ".zshrc"), "zsh"
+    elif "bash" in shell:
+        bash_rc = os.path.join(home, ".bashrc")
+        bash_profile = os.path.join(home, ".bash_profile")
+
+        if os.path.exists(bash_rc):
+            return bash_rc, "bash"
+        elif os.path.exists(bash_profile):
+            return bash_profile, "bash"
+
+    return None, None
+
+
+def get_shell_script(shell_type):
+    """Return the appropriate shell script based on shell type."""
+    base_script = """# Create log file if it doesn't exist
+touch ~/.shell_history_with_output
+
+# Function to capture terminal interaction
+function capture_output() {
+    local cmd=$1
+    echo "user: $cmd" >> ~/.shell_history_with_output
+    echo "computer:" >> ~/.shell_history_with_output
+    eval "$cmd" >> ~/.shell_history_with_output 2>&1
+}
+
+# Command not found handler that pipes context to interpreter
+command_not_found_handler() {
+    cat ~/.shell_history_with_output | interpreter
+    return 0
+}
+
+# Hook into preexec"""
+
+    if shell_type == "zsh":
+        return base_script + '\npreexec() {\n    capture_output "$1"\n}\n'
+    elif shell_type == "bash":
+        return (
+            base_script
+            + '\ntrap \'capture_output "$(HISTTIMEFORMAT= history 1 | sed "s/^[ ]*[0-9]*[ ]*//")" \' DEBUG\n'
+        )
+    return None
+
+
+def main():
+    """Install or reinstall the shell integration."""
+    print("Starting installation...")
+    config_path, shell_type = get_shell_config()
+
+    if not config_path or not shell_type:
+        print("Could not determine your shell configuration.")
+        print(
+            "Please visit docs.openinterpreter.com/shell for manual installation instructions."
+        )
+        return
+
+    # Clean up history file
+    history_file = os.path.expanduser("~/.shell_history_with_output")
+    if os.path.exists(history_file):
+        os.remove(history_file)
+
+    # Create fresh history file
+    with open(history_file, "w") as f:
+        f.write("")
+
+    # Read existing config
+    try:
+        with open(config_path, "r") as f:
+            content = f.read()
+    except FileNotFoundError:
+        content = ""
+
+    start_marker = "### <openinterpreter> ###"
+    end_marker = "### </openinterpreter> ###"
+
+    # Check if markers exist
+    if start_marker in content:
+        response = input(
+            "Open Interpreter shell integration appears to be already installed. Would you like to reinstall? (y/n): "
+        )
+        if response.lower() != "y":
+            print("Installation cancelled.")
+            return
+
+        # Remove existing installation
+        pattern = f"{start_marker}.*?{end_marker}"
+        content = re.sub(pattern, "", content, flags=re.DOTALL)
+
+    # Get appropriate shell script
+    shell_script = get_shell_script(shell_type)
+
+    # Create new content
+    new_content = (
+        f"{content.rstrip()}\n\n{start_marker}\n{shell_script}\n{end_marker}\n"
+    )
+
+    # Write back to config file
+    try:
+        with open(config_path, "w") as f:
+            f.write(new_content)
+        print(
+            f"Successfully installed Open Interpreter shell integration to {config_path}"
+        )
+        print("Please restart your shell or run 'source ~/.zshrc' to apply changes.")
+    except Exception as e:
+        print(f"Error writing to {config_path}: {e}")
+        print(
+            "Please visit docs.openinterpreter.com/shell for manual installation instructions."
+        )
+
+
+if __name__ == "__main__":
+    main()