Merge branch 'OpenInterpreter:main' into py-alias

Author: CyanideByte

interpreter/core/computer/computer.py

@@ -7,6 +7,7 @@
 from .contacts.contacts import Contacts
 from .display.display import Display
 from .docs.docs import Docs
+from .files.files import Files
 from .keyboard.keyboard import Keyboard
 from .mail.mail import Mail
 from .mouse.mouse import Mouse
@@ -39,12 +40,13 @@ def __init__(self, interpreter):
         self.skills = Skills(self)
         self.docs = Docs(self)
         self.ai = Ai(self)
+        self.files = Files(self)
 
         self.emit_images = True
         self.api_base = "https://api.openinterpreter.com/v0"
         self.save_skills = True
 
-        self.import_computer_api = True
+        self.import_computer_api = False  # Defaults to false
         self._has_imported_computer_api = False  # Because we only want to do this once
 
     # Shortcut for computer.terminal.languages

interpreter/core/computer/skills/skills.py

@@ -49,7 +49,7 @@ def import_skills(self):
 
         output = self.computer.run("python", code_to_run)
 
-        if "traceback" in output.lower():
+        if type(output) == str and "traceback" in output.lower():
             # Import them individually
             for file in glob.glob(os.path.join(self.path, "*.py")):
                 with open(file, "r") as f:
@@ -60,7 +60,7 @@ def import_skills(self):
 
                 output = self.computer.run("python", code_to_run)
 
-                if "traceback" in output.lower():
+                if type(output) == str and "traceback" in output.lower():
                     print(
                         f"Skill at {file} might be broken— it produces a traceback when run."
                     )

interpreter/core/core.py

@@ -69,7 +69,7 @@ def __init__(
         custom_instructions="",
         computer=None,
         sync_computer=True,
-        import_computer_api=True,
+        import_computer_api=False,
         skills_path=None,
         import_skills=True,
         multi_line=False,

interpreter/core/llm/utils/convert_to_openai_messages.py

@@ -170,7 +170,8 @@ def convert_to_openai_messages(
         else:
             raise Exception(f"Unable to convert this message type: {message}")
 
-        new_message["content"] = new_message["content"].strip()
+        if isinstance(new_message["content"], str):
+            new_message["content"] = new_message["content"].strip()
 
         new_messages.append(new_message)
 

interpreter/terminal_interface/start_terminal_interface.py

@@ -357,15 +357,15 @@ def start_terminal_interface(interpreter):
 
     ### Set some helpful settings we know are likely to be true
 
-    if interpreter.llm.model == "gpt-4-1106-preview":
+    if interpreter.llm.model.startswith("gpt-4") or interpreter.llm.model.startswith("openai/gpt-4"):
         if interpreter.llm.context_window is None:
             interpreter.llm.context_window = 128000
         if interpreter.llm.max_tokens is None:
             interpreter.llm.max_tokens = 4096
         if interpreter.llm.supports_functions is None:
-            interpreter.llm.supports_functions = True
+            interpreter.llm.supports_functions = False if "vision" in interpreter.llm.model else True
 
-    if interpreter.llm.model == "gpt-3.5-turbo-1106":
+    if interpreter.llm.model.startswith("gpt-3.5-turbo") or interpreter.llm.model.startswith("openai/gpt-3.5-turbo"):
         if interpreter.llm.context_window is None:
             interpreter.llm.context_window = 16000
         if interpreter.llm.max_tokens is None:
@@ -432,7 +432,7 @@ def set_attributes(args, arguments):
 
 
 def main():
-    interpreter = OpenInterpreter()
+    interpreter = OpenInterpreter(import_computer_api=True)
     try:
         start_terminal_interface(interpreter)
     except KeyboardInterrupt: