Merge branch 'main' into main

Author: minamorl

interpreter/core/computer/calendar/calendar.py

@@ -5,6 +5,21 @@
 from ..utils.run_applescript import run_applescript, run_applescript_capture
 
 
+makeDateFunction = """
+on makeDate(yr, mon, day, hour, min, sec)
+	set theDate to current date
+	tell theDate
+		set its year to yr
+		set its month to mon
+		set its day to day
+		set its hours to hour
+		set its minutes to min
+		set its seconds to sec
+	end tell
+	return theDate
+end makeDate
+"""
+
 class Calendar:
     def __init__(self, computer):
         self.computer = computer
@@ -18,23 +33,13 @@ def get_events(self, start_date=datetime.date.today(), end_date=None):
         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"
-        )
-        if end_date:
-            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"
-            )
-
+        if not end_date:
+            end_date = start_date
         # AppleScript command
         script = f"""
-        set theDate to date "{applescript_start_date}"
-        set endDate to date "{applescript_end_date}"
+        {makeDateFunction}
+        set theDate to makeDate({start_date.strftime("%Y, %m, %d, 0, 0, 0")})
+        set endDate to makeDate({end_date.strftime("%Y, %m, %d, 23, 59, 59")})
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
             if calendarIsRunning then
@@ -179,6 +184,9 @@ def create_event(
                 return "Can't find a default calendar. Please try again and specify a calendar name."
 
         script = f"""
+        {makeDateFunction}
+        set startDate to makeDate({start_date.strftime("%Y, %m, %d, %H, %M, %S")})
+        set endDate to makeDate({end_date.strftime("%Y, %m, %d, %H, %M, %S")})
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -192,8 +200,6 @@ def create_event(
         end tell
         tell application "{self.calendar_app}"
             tell calendar "{calendar}"
-                set startDate to date "{applescript_start_date}"
-                set endDate to date "{applescript_end_date}"
                 make new event at end with properties {{summary:"{title}", start date:startDate, end date:endDate, location:"{location}", description:"{notes}"}}
             end tell
             -- tell the Calendar app to refresh if it's running, so the new event shows up immediately
@@ -223,9 +229,9 @@ def delete_event(
             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"""
+        {makeDateFunction}
+        set eventStartDate to makeDate({start_date.strftime("%Y, %m, %d, %H, %M, %S")})
         -- Open and activate calendar first
         tell application "System Events"
             set calendarIsRunning to (name of processes) contains "{self.calendar_app}"
@@ -242,7 +248,6 @@ def delete_event(
             set myCalendar to calendar "{calendar}"
             
             -- Define the exact start date and name of the event to find and delete
-            set eventStartDate to date "{applescript_start_date}"
             set eventSummary to "{event_title}"
             
             -- Find the event by start date and summary

interpreter/core/computer/display/display.py

@@ -12,14 +12,14 @@
 import requests
 from ...utils.lazy_import import lazy_import
 from ..utils.recipient_utils import format_to_recipient
-import cv2
 from screeninfo import get_monitors # for getting info about connected monitors
 
 
 # Still experimenting with this
 # from utils.get_active_window import get_active_window
 
 # Lazy import of optional packages
+cv2 = lazy_import("cv2")
 pyautogui = lazy_import("pyautogui")
 np = lazy_import("numpy")
 plt = lazy_import("matplotlib.pyplot")

interpreter/core/default_system_message.py

@@ -18,7 +18,7 @@
 ```python
 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.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=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
 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")

interpreter/core/render_message.py

@@ -1,5 +1,4 @@
 import re
-import time
 
 
 def render_message(interpreter, message):
@@ -13,31 +12,19 @@ def render_message(interpreter, message):
     # Split the message into parts by {{ and }}, including multi-line strings
     parts = re.split(r"({{.*?}})", message, flags=re.DOTALL)
 
-    for i in range(len(parts)):
-        part = parts[i]
+    for i, part in enumerate(parts):
         # If the part is enclosed in {{ and }}
         if part.startswith("{{") and part.endswith("}}"):
             # Run the code inside the brackets
             output = interpreter.computer.run(
                 "python", part[2:-2].strip(), display=interpreter.verbose
             )
 
-            # Turn it into just a simple string
-            outputs = []
-            for line in output:
-                if interpreter.debug:
-                    print(line)
-                if line.get("format") == "output":
-                    if "IGNORE_ALL_ABOVE_THIS_LINE" in line["content"]:
-                        outputs.append(
-                            line["content"].split("IGNORE_ALL_ABOVE_THIS_LINE")[1]
-                        )
-                    else:
-                        outputs.append(line["content"])
-            output = "\n".join(outputs)
+            # Extract the output content
+            outputs = (line["content"] for line in output if line.get("format") == "output" and "IGNORE_ALL_ABOVE_THIS_LINE" not in line["content"])
 
             # Replace the part with the output
-            parts[i] = output
+            parts[i] = "\n".join(outputs)
 
     # Join the parts back into the message
     rendered_message = "".join(parts).strip()

interpreter/terminal_interface/profiles/defaults/01.py

@@ -69,7 +69,7 @@
 ```python
 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.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=datetime.datetime.now() + datetime.timedelta(hours=1), notes="Note", location="") # Creates a calendar event
 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
 phone_string = computer.contacts.get_phone_number("John Doe")
@@ -216,7 +216,7 @@ def get_function_info(file_path):
         print("Attempting to start OS control anyway...\n\n")
 
     for pip_name in ["pip", "pip3"]:
-        command = f"{pip_name} install 'open-interpreter[os]'"
+        command = f"{pip_name} install open-interpreter[os]"
 
         interpreter.computer.run("shell", command, display=True)
 

interpreter/terminal_interface/profiles/defaults/os.py

@@ -62,7 +62,7 @@
         print('''
 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.create_event(title="Meeting", start_date=datetime.datetime.now(), end_date=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
 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")
@@ -170,7 +170,7 @@
         print("Attempting to start OS control anyway...\n\n")
 
     for pip_name in ["pip", "pip3"]:
-        command = f"{pip_name} install 'open-interpreter[os]'"
+        command = f"{pip_name} install open-interpreter[os]"
 
         interpreter.computer.run("shell", command, display=True)
 

interpreter/terminal_interface/terminal_interface.py

@@ -88,6 +88,10 @@ def terminal_interface(interpreter, message):
             # This is for the terminal interface being used as a CLI — messages are strings.
             # This won't fire if they're in the python package, display=True, and they passed in an array of messages (for example).
 
+            if message == "":
+                # Ignore empty messages when user presses enter without typing anything
+                continue
+
             if message.startswith("%") and interactive:
                 handle_magic_command(interpreter, message)
                 continue