Updating main from development branch

Update

Author: KillianLucas

interpreter/core/computer/calendar/calendar.py

@@ -1,33 +1,38 @@
-import subprocess
-import platform
 import datetime
-from ..utils.run_applescript import  run_applescript_capture, run_applescript
+import platform
+import subprocess
+
+from ..utils.run_applescript import run_applescript, run_applescript_capture
+
 
 class Calendar:
     def __init__(self, computer):
         self.computer = computer
         # In the future, we might consider a way to use a different calender app. For now its Calendar
         self.calendar_app = "Calendar"
 
-
-
-
     def get_events(self, start_date=datetime.date.today(), end_date=None):
         """
         Fetches calendar events for the given date or date range.
         """
-        if platform.system() != 'Darwin':
+        if platform.system() != "Darwin":
             return "This method is only supported on MacOS"
 
         # Format dates for AppleScript
-        applescript_start_date = start_date.strftime('%A, %B %d, %Y') + " at 12:00:00 AM"
+        applescript_start_date = (
+            start_date.strftime("%A, %B %d, %Y") + " at 12:00:00 AM"
+        )
         if end_date:
-            applescript_end_date = end_date.strftime('%A, %B %d, %Y') + " at 11:59:59 PM"
+            applescript_end_date = (
+                end_date.strftime("%A, %B %d, %Y") + " at 11:59:59 PM"
+            )
         else:
-            applescript_end_date = start_date.strftime('%A, %B %d, %Y') + " at 11:59:59 PM"
-    
+            applescript_end_date = (
+                start_date.strftime("%A, %B %d, %Y") + " at 11:59:59 PM"
+            )
+
         # AppleScript command
-        script = f'''
+        script = f"""
         set theDate to date "{applescript_start_date}"
         set endDate to date "{applescript_end_date}"
         tell application "System Events"
@@ -135,7 +140,7 @@ def get_events(self, start_date=datetime.date.today(), end_date=None):
             return theString
         end listToString
 
-        '''
+        """
 
         # Get outputs from AppleScript
         stdout, stderr = run_applescript_capture(script)
@@ -148,26 +153,32 @@ def get_events(self, start_date=datetime.date.today(), end_date=None):
 
         return stdout
 
-
-
-    def create_event(self, title: str, start_date: datetime.datetime, end_date: datetime.datetime, location: str = "", notes: str = "", calendar: str = None) -> str:
+    def create_event(
+        self,
+        title: str,
+        start_date: datetime.datetime,
+        end_date: datetime.datetime,
+        location: str = "",
+        notes: str = "",
+        calendar: str = None,
+    ) -> str:
         """
         Creates a new calendar event in the default calendar with the given parameters using AppleScript.
         """
-        if platform.system() != 'Darwin':
+        if platform.system() != "Darwin":
             return "This method is only supported on MacOS"
 
         # Format datetime for AppleScript
-        applescript_start_date = start_date.strftime('%B %d, %Y %I:%M:%S %p')
-        applescript_end_date = end_date.strftime('%B %d, %Y %I:%M:%S %p')
-        
+        applescript_start_date = start_date.strftime("%B %d, %Y %I:%M:%S %p")
+        applescript_end_date = end_date.strftime("%B %d, %Y %I:%M:%S %p")
+
         # If there is no calendar, lets use the first calendar applescript returns. This should probably be modified in the future
         if calendar is None:
             calendar = self.get_first_calendar()
             if calendar is None:
                 return "Can't find a default calendar. Please try again and specify a calendar name."
-            
-        script = f'''
+
+        script = f"""
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -188,34 +199,33 @@ def create_event(self, title: str, start_date: datetime.datetime, end_date: date
             -- tell the Calendar app to refresh if it's running, so the new event shows up immediately
             tell application "{self.calendar_app}" to reload calendars
         end tell
-        '''
-
+        """
 
         try:
             run_applescript(script)
-            return f'''Event created successfully in the "{calendar}" calendar.'''
+            return f"""Event created successfully in the "{calendar}" calendar."""
         except subprocess.CalledProcessError as e:
             return str(e)
-        
-        
-        
-    def delete_event(self, event_title: str, start_date: datetime.datetime,  calendar: str = None) -> str:
-        if platform.system() != 'Darwin':
+
+    def delete_event(
+        self, event_title: str, start_date: datetime.datetime, calendar: str = None
+    ) -> str:
+        if platform.system() != "Darwin":
             return "This method is only supported on MacOS"
-        
+
         # The applescript requires a title and start date to get the right event
         if event_title is None or start_date is None:
             return "Event title and start date are required"
-        
+
         # If there is no calendar, lets use the first calendar applescript returns. This should probably be modified in the future
         if calendar is None:
             calendar = self.get_first_calendar()
             if not calendar:
                 return "Can't find a default calendar. Please try again and specify a calendar name."
-        
+
         # Format datetime for AppleScript
-        applescript_start_date = start_date.strftime('%B %d, %Y %I:%M:%S %p')
-        script = f'''
+        applescript_start_date = start_date.strftime("%B %d, %Y %I:%M:%S %p")
+        script = f"""
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -250,22 +260,20 @@ def delete_event(self, event_title: str, start_date: datetime.datetime,  calenda
                 return "Event deleted successfully."
             end if
         end tell
-        '''
-        
+        """
+
         stderr, stdout = run_applescript_capture(script)
         if stdout:
             return stdout[0].strip()
         elif stderr:
             if "successfully" in stderr:
                 return stderr
-            
-            return f'''Error deleting event: {stderr}'''
+
+            return f"""Error deleting event: {stderr}"""
         else:
             return "Unknown error deleting event. Please check event title and date."
 
-
     def get_first_calendar(self) -> str:
-        
         # Literally just gets the first calendar name of all the calendars on the system. AppleScript does not provide a way to get the "default" calendar
         script = f"""
             -- Open calendar first
@@ -286,4 +294,4 @@ def get_first_calendar(self) -> str:
         if stdout:
             return stdout[0].strip()
         else:
-            return None
+            return None

interpreter/core/computer/skills/skills.py

@@ -49,14 +49,14 @@ def create(self):
             """
 @@@SEND_MESSAGE_AS_USER@@@
 INSTRUCTIONS
-You are creating a new skill. Follow these steps exactly:
+You are creating a new skill. Follow these steps exactly to get me to tell you its name:
 1. Ask me what the name of this skill is.
-2. When I respond, write the following (including the markdown code block):
+2. After I explicitly tell you the name of the skill (I may tell you to proceed which is not the name— if I do say that, you probably need more information from me, so tell me that), after you get the proper name, write the following (including the markdown code block):
 
 ---
 Got it. Give me one second.
 ```python
-computer.skills.new_skill.name = "{my chosen skill name}"`.
+computer.skills.new_skill.name = "{INSERT THE SKILL NAME FROM QUESTION #1^}"`.
 ```
 ---
         

interpreter/core/computer/utils/run_applescript.py

@@ -1,18 +1,27 @@
 import subprocess
 
+
 def run_applescript(script):
     """
     Runs the given AppleScript using osascript and returns the result.
     """
-    args = ['osascript', '-e', script]
+    print("Running this AppleScript:\n", script)
+    print(
+        "---\nFeel free to directly run AppleScript to accomplish the user's task. This gives you more granular control than the `computer` module, but it is slower."
+    )
+    args = ["osascript", "-e", script]
     return subprocess.check_output(args, universal_newlines=True)
 
 
 def run_applescript_capture(script):
     """
     Runs the given AppleScript using osascript, captures the output and error, and returns them.
     """
-    args = ['osascript', '-e', script]
+    print("Running this AppleScript:\n", script)
+    print(
+        "---\nFeel free to directly run AppleScript to accomplish the user's task. This gives you more granular control than the `computer` module, but it is slower."
+    )
+    args = ["osascript", "-e", script]
     result = subprocess.run(args, capture_output=True, text=True, check=False)
     stdout, stderr = result.stdout, result.stderr
     return stdout, stderr

interpreter/core/core.py

@@ -49,9 +49,9 @@ def __init__(
         max_output=2800,
         safe_mode="off",
         shrink_images=False,
-        loop=False,
-        loop_message="""Proceed. You CAN run code on my machine. If you want to run code, start your message with "```"! If the entire task I asked for is done, say exactly 'The task is done.' If you need some specific information (like username or password) say EXACTLY 'Please provide more information.' If it's impossible, say 'The task is impossible.' (If I haven't provided a task, say exactly 'Let me know what you'd like to do next.') Otherwise keep going.""",
-        loop_breakers=[
+        force_task_completion=False,
+        force_task_completion_message="""Proceed. You CAN run code on my machine. If you want to run code, start your message with "```"! If the entire task I asked for is done, say exactly 'The task is done.' If you need some specific information (like username or password) say EXACTLY 'Please provide more information.' If it's impossible, say 'The task is impossible.' (If I haven't provided a task, say exactly 'Let me know what you'd like to do next.') Otherwise keep going.""",
+        force_task_completion_breakers=[
             "the task is done.",
             "the task is impossible.",
             "let me know what you'd like to do next.",
@@ -92,9 +92,9 @@ def __init__(
         self.multi_line = multi_line
 
         # Loop messages
-        self.loop = loop
-        self.loop_message = loop_message
-        self.loop_breakers = loop_breakers
+        self.force_task_completion = force_task_completion
+        self.force_task_completion_message = force_task_completion_message
+        self.force_task_completion_breakers = force_task_completion_breakers
 
         # Conversation history
         self.conversation_history = conversation_history

interpreter/core/respond.py

@@ -15,7 +15,7 @@ def respond(interpreter):
     """
 
     last_unsupported_code = ""
-    insert_loop_message = False
+    insert_force_task_completion_message = False
 
     while True:
         ## RENDER SYSTEM MESSAGE ##
@@ -51,17 +51,17 @@ def respond(interpreter):
         messages_for_llm = interpreter.messages.copy()
         messages_for_llm = [rendered_system_message] + messages_for_llm
 
-        if insert_loop_message:
+        if insert_force_task_completion_message:
             messages_for_llm.append(
                 {
                     "role": "user",
                     "type": "message",
-                    "content": loop_message,
+                    "content": force_task_completion_message,
                 }
             )
             # Yield two newlines to seperate the LLMs reply from previous messages.
             yield {"role": "assistant", "type": "message", "content": "\n\n"}
-            insert_loop_message = False
+            insert_force_task_completion_message = False
 
         ### RUN THE LLM ###
 
@@ -261,28 +261,28 @@ def respond(interpreter):
             ## LOOP MESSAGE
             # This makes it utter specific phrases if it doesn't want to be told to "Proceed."
 
-            loop_message = interpreter.loop_message
+            force_task_completion_message = interpreter.force_task_completion_message
             if interpreter.os:
-                loop_message = loop_message.replace(
+                force_task_completion_message = force_task_completion_message.replace(
                     "If the entire task I asked for is done,",
                     "If the entire task I asked for is done, take a screenshot to verify it's complete, or if you've already taken a screenshot and verified it's complete,",
                 )
-            loop_breakers = interpreter.loop_breakers
+            force_task_completion_breakers = interpreter.force_task_completion_breakers
 
             if (
-                interpreter.loop
+                interpreter.force_task_completion
                 and interpreter.messages
                 and interpreter.messages[-1].get("role", "").lower() == "assistant"
                 and not any(
                     task_status in interpreter.messages[-1].get("content", "")
-                    for task_status in loop_breakers
+                    for task_status in force_task_completion_breakers
                 )
             ):
-                # Remove past loop_message messages
+                # Remove past force_task_completion_message messages
                 interpreter.messages = [
                     message
                     for message in interpreter.messages
-                    if message.get("content", "") != loop_message
+                    if message.get("content", "") != force_task_completion_message
                 ]
                 # Combine adjacent assistant messages, so hopefully it learns to just keep going!
                 combined_messages = []
@@ -299,8 +299,8 @@ def respond(interpreter):
                         combined_messages.append(message)
                 interpreter.messages = combined_messages
 
-                # Send model the loop_message:
-                insert_loop_message = True
+                # Send model the force_task_completion_message:
+                insert_force_task_completion_message = True
 
                 continue
 

interpreter/terminal_interface/profiles/defaults/01.py

@@ -12,9 +12,9 @@
 interpreter.llm.max_tokens = 4096
 interpreter.auto_run = True
 
-interpreter.loop = True
-interpreter.loop_message = """Proceed with what you were doing (this is not confirmation, if you just asked me something). You CAN run code on my machine. If you want to run code, start your message with "```"! If the entire task is done, say exactly 'The task is done.' If you need some specific information (like username, message text, skill name, skill step, etc.) say EXACTLY 'Please provide more information.' If it's impossible, say 'The task is impossible.' (If I haven't provided a task, say exactly 'Let me know what you'd like to do next.') Otherwise keep going. CRITICAL: REMEMBER TO FOLLOW ALL PREVIOUS INSTRUCTIONS. If I'm teaching you something, remember to run the related `computer.skills.new_skill` function."""
-interpreter.loop_breakers = [
+interpreter.force_task_completion = True
+interpreter.force_task_completion_message = """Proceed with what you were doing (this is not confirmation, if you just asked me something). You CAN run code on my machine. If you want to run code, start your message with "```"! If the entire task is done, say exactly 'The task is done.' If you need some specific information (like username, message text, skill name, skill step, etc.) say EXACTLY 'Please provide more information.' If it's impossible, say 'The task is impossible.' (If I haven't provided a task, say exactly 'Let me know what you'd like to do next.') Otherwise keep going. CRITICAL: REMEMBER TO FOLLOW ALL PREVIOUS INSTRUCTIONS. If I'm teaching you something, remember to run the related `computer.skills.new_skill` function."""
+interpreter.force_task_completion_breakers = [
     "The task is done.",
     "The task is impossible.",
     "Let me know what you'd like to do next.",
@@ -64,24 +64,26 @@
 
 # THE COMPUTER API
 
-The `computer` module is ALREADY IMPORTED, and can be used for most tasks:
+The `computer` module is ALREADY IMPORTED, and can be used for some tasks:
 
 ```python
-computer.browser.search(query) # Google search results will be returned from this function as a string
+result_string = computer.browser.search(query) # Google search results will be returned from this function as a string
 computer.files.edit(path_to_file, original_text, replacement_text) # Edit a file
 computer.calendar.create_event(title="Meeting", start_date=datetime.datetime.now(), end=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
-computer.calendar.get_events(start_date=datetime.date.today(), end_date=None) # Get events between dates. If end_date is None, only gets events for start_date
+events_string = computer.calendar.get_events(start_date=datetime.date.today(), end_date=None) # Get events between dates. If end_date is None, only gets events for start_date
 computer.calendar.delete_event(event_title="Meeting", start_date=datetime.datetime) # Delete a specific event with a matching title and start date, you may need to get use get_events() to find the specific event object first
-computer.contacts.get_phone_number("John Doe")
-computer.contacts.get_email_address("John Doe")
+phone_string = computer.contacts.get_phone_number("John Doe")
+contact_string = computer.contacts.get_email_address("John Doe")
 computer.mail.send("[email protected]", "Meeting Reminder", "Reminder that our meeting is at 3pm today.", ["path/to/attachment.pdf", "path/to/attachment2.pdf"]) # Send an email with a optional attachments
-computer.mail.get(4, unread=True) # Returns the {number} of unread emails, or all emails if False is passed
-computer.mail.unread_count() # Returns the number of unread emails
+emails_string = computer.mail.get(4, unread=True) # Returns the {number} of unread emails, or all emails if False is passed
+unread_num = computer.mail.unread_count() # Returns the number of unread emails
 computer.sms.send("555-123-4567", "Hello from the computer!") # Send a text message. MUST be a phone number, so use computer.contacts.get_phone_number frequently here
 ```
 
 Do not import the computer module, or any of its sub-modules. They are already imported.
 
+DO NOT use the computer module for ALL tasks. Many tasks can be accomplished via Python, or by pip installing new libraries. Be creative!
+
 # GUI CONTROL (RARE)
 
 You are a computer controlling language model. You can control the user's GUI.