Default to importing the computer API

Author: KillianLucas

interpreter/core/computer/terminal/terminal.py

@@ -1,20 +1,32 @@
 import json
+import os
 import time
 
 from ..utils.recipient_utils import parse_for_recipient
 from .languages.applescript import AppleScript
 from .languages.html import HTML
+from .languages.java import Java
 from .languages.javascript import JavaScript
 from .languages.powershell import PowerShell
 from .languages.python import Python
 from .languages.r import R
 from .languages.react import React
 from .languages.ruby import Ruby
 from .languages.shell import Shell
-from .languages.java import Java
 
 # Should this be renamed to OS or System?
 
+import_computer_api_code = """
+import os
+os.environ["INTERPRETER_COMPUTER_API"] = "False" # To prevent infinite recurring import of the computer API
+
+import time
+import datetime
+from interpreter import interpreter
+
+computer = interpreter.computer
+""".strip()
+
 
 class Terminal:
     def __init__(self, computer):
@@ -48,13 +60,14 @@ def run(self, language, code, stream=False, display=False):
                 self.computer.import_computer_api
                 and not self.computer._has_imported_computer_api
                 and "computer" in code
+                and os.getenv("INTERPRETER_COMPUTER_API", "True") != "False"
             ):
                 self.computer._has_imported_computer_api = True
                 # Give it access to the computer via Python
                 time.sleep(0.5)
                 self.computer.run(
                     language="python",
-                    code="import time\nimport datetime\nfrom interpreter import interpreter\ncomputer = interpreter.computer",  # We ask it to use time, so
+                    code=import_computer_api_code,
                     display=self.computer.verbose,
                 )
 

interpreter/terminal_interface/profiles/defaults/os.py

@@ -39,6 +39,7 @@
 # Note: There are NO other browser functions — use regular `webbrowser` and `computer.display.view()` commands to view/control a real browser.
 
 computer.display.view() # Shows you what's on the screen (primary display by default), returns a `pil_image` `in case you need it (rarely). To get a specific display, use the parameter screen=DISPLAY_NUMBER (0 for primary monitor 1 and above for secondary monitors). **You almost always want to do this first!**
+# NOTE: YOU MUST NEVER RUN image.show() AFTER computer.display.view. IT WILL AUTOMATICALLY SHOW YOU THE IMAGE. DO NOT RUN image.show().
 
 computer.keyboard.hotkey(" ", "command") # Opens spotlight (very useful)
 computer.keyboard.write("hello")