Faster

KillianLucas · KillianLucas · commit 4a957944166f · 2024-06-01T13:13:23.000-07:00
diff --git a/interpreter/core/computer/computer.py b/interpreter/core/computer/computer.py
@@ -57,6 +57,30 @@ def __init__(self, interpreter):
             self.interpreter.max_output
         )  # Should mirror interpreter.max_output
 
+        self.system_message = """
+
+# THE COMPUTER API
+
+A python `computer` module is ALREADY IMPORTED, and can be used for many tasks:
+
+```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_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")
+computer.contacts.get_email_address("John Doe")
+computer.mail.send("john@email.com", "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
+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.
+
+    """.strip()
+
     # Shortcut for computer.terminal.languages
     @property
     def languages(self):
diff --git a/interpreter/core/default_system_message.py b/interpreter/core/default_system_message.py
@@ -1,45 +1,19 @@
-default_system_message = r"""
+import getpass
+import platform
+
+default_system_message = f"""
 
 You are Open Interpreter, a world-class programmer that can complete any goal by executing code.
 First, write a plan. **Always recap the plan between each code block** (you have extreme short-term memory loss, so you need to recap the plan between each message block to retain it).
 When you execute code, it will be executed **on the user's machine**. The user has given you **full and complete permission** to execute any code necessary to complete the task. Execute the code.
-If you want to send data between programming languages, save the data to a txt or json.
 You can access the internet. Run **any code** to achieve the goal, and if at first you don't succeed, try again and again.
 You can install new packages.
 When a user refers to a filename, they're likely referring to an existing file in the directory you're currently executing code in.
 Write messages to the user in Markdown.
 In general, try to **make plans** with as few steps as possible. As for actually executing code to carry out that plan, for *stateful* languages (like python, javascript, shell, but NOT for html which starts from 0 every time) **it's critical not to try to do everything in one code block.** You should try something, print information about it, then continue from there in tiny, informed steps. You will never get it on the first try, and attempting it in one go will often lead to errors you cant see.
 You are capable of **any** task.
 
-# THE COMPUTER API
-
-A python `computer` module is ALREADY IMPORTED, and can be used for many tasks:
-
-```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_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")
-computer.contacts.get_email_address("John Doe")
-computer.mail.send("john@email.com", "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
-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.
-
-User Info{{import getpass
-import os
-import platform
-
-print(f"Name: {getpass.getuser()}")
-print(f"CWD: {os.getcwd()}")
-print(f"SHELL: {os.environ.get('SHELL')}")
-print(f"OS: {platform.system()}")
-
-}}
+User's Name: {getpass.getuser()}
+User's OS: {platform.system()}
 
 """.strip()
diff --git a/interpreter/core/llm/llm.py b/interpreter/core/llm/llm.py
@@ -1,4 +1,9 @@
 import litellm
+
+litellm.suppress_debug_info = True
+import time
+import uuid
+
 import tokentrim as tt
 
 from ...terminal_interface.utils.display_markdown_message import (
@@ -8,9 +13,6 @@
 from .run_text_llm import run_text_llm
 from .utils.convert_to_openai_messages import convert_to_openai_messages
 
-litellm.suppress_debug_info = True
-import time
-
 
 class Llm:
     """
@@ -64,10 +66,20 @@ def run(self, messages):
                 msg["role"] != "system"
             ), "No message after the first can have the role 'system'"
 
+        model = self.model
+        # Setup our model endpoint
+        if model == "i":
+            model = "openai/i"
+            if not hasattr(self.interpreter, "conversation_id"):  # Only do this once
+                self.context_window = 7000
+                self.max_tokens = 1000
+                self.api_base = "https://api.openinterpreter.com/v0"
+                self.interpreter.conversation_id = str(uuid.uuid4())
+
         # Detect function support
         if self.supports_functions == None:
             try:
-                if litellm.supports_function_calling(self.model):
+                if litellm.supports_function_calling(model):
                     self.supports_functions = True
                 else:
                     self.supports_functions = False
@@ -77,20 +89,13 @@ def run(self, messages):
         # Detect vision support
         if self.supports_vision == None:
             try:
-                if litellm.supports_vision(self.model):
+                if litellm.supports_vision(model):
                     self.supports_vision = True
                 else:
                     self.supports_vision = False
             except:
                 self.supports_vision = False
 
-        # Setup our model endpoint
-        if self.model == "i":
-            self.model = "openai/i"
-            self.context_window = 7000
-            self.max_tokens = 1000
-            self.api_base = "https://api.openinterpreter.com/v0"
-
         # Trim image messages if they're there
         image_messages = [msg for msg in messages if msg["type"] == "image"]
         if self.supports_vision:
@@ -154,7 +159,7 @@ def run(self, messages):
             else:
                 try:
                     messages = tt.trim(
-                        messages, system_message=system_message, model=self.model
+                        messages, system_message=system_message, model=model
                     )
                 except:
                     if len(messages) == 1:
@@ -196,7 +201,7 @@ def run(self, messages):
         ## Start forming the request
 
         params = {
-            "model": self.model,
+            "model": model,
             "messages": messages,
             "stream": True,
         }
@@ -212,6 +217,8 @@ def run(self, messages):
             params["max_tokens"] = self.max_tokens
         if self.temperature:
             params["temperature"] = self.temperature
+        if hasattr(self.interpreter, "conversation_id"):
+            params["conversation_id"] = self.interpreter.conversation_id
 
         # Set some params directly on LiteLLM
         if self.max_budget:
@@ -243,9 +250,16 @@ def fixed_litellm_completions(**params):
     """
 
     if "local" in params.get("model"):
-        # Kinda hacky, but this helps
+        # Kinda hacky, but this helps sometimes
         params["stop"] = ["<|assistant|>", "<|end|>", "<|eot_id|>"]
 
+    if params.get("model") == "i" and "conversation_id" in params:
+        litellm.drop_params = (
+            False  # If we don't do this, litellm will drop this param!
+        )
+    else:
+        litellm.drop_params = True
+
     # Run completion
     first_error = None
     try:
diff --git a/interpreter/core/respond.py b/interpreter/core/respond.py
@@ -31,6 +31,13 @@ def respond(interpreter):
         if interpreter.custom_instructions:
             system_message += "\n\n" + interpreter.custom_instructions
 
+        # Add computer API system message
+        if interpreter.computer.import_computer_api:
+            if interpreter.computer.system_message not in system_message:
+                system_message = (
+                    system_message + "\n\n" + interpreter.computer.system_message
+                )
+
         # Storing the messages so they're accessible in the interpreter's computer
         if interpreter.sync_computer:
             output = interpreter.computer.run(
diff --git a/interpreter/core/utils/telemetry.py b/interpreter/core/utils/telemetry.py
@@ -10,17 +10,14 @@
 """
 
 import contextlib
+import json
 import os
+import threading
 import uuid
 
 import pkg_resources
-from posthog import Posthog
 import requests
 
-posthog = Posthog(
-    "phc_6cmXy4MEbLfNGezqGjuUTY8abLu0sAwtGzZFpQW97lc", host="https://app.posthog.com"
-)
-
 
 def get_or_create_uuid():
     try:
@@ -49,17 +46,23 @@ def get_or_create_uuid():
 
 def send_telemetry(event_name, properties=None):
     try:
-        if properties == None:
+        if properties is None:
             properties = {}
         properties["oi_version"] = pkg_resources.get_distribution(
             "open-interpreter"
         ).version
         with open(os.devnull, "w") as f, contextlib.redirect_stdout(
             f
         ), contextlib.redirect_stderr(f):
-            posthog.capture(user_id, event_name, properties)
+            url = "https://app.posthog.com/capture"
+            headers = {"Content-Type": "application/json"}
+            data = {
+                "api_key": "phc_6cmXy4MEbLfNGezqGjuUTY8abLu0sAwtGzZFpQW97lc",
+                "event": event_name,
+                "properties": properties,
+                "distinct_id": user_id,
+            }
+            response = requests.post(url, headers=headers, data=json.dumps(data))
     except:
         # Non blocking
         pass
-
-
diff --git a/interpreter/terminal_interface/contributing_conversations.py b/interpreter/terminal_interface/contributing_conversations.py
@@ -46,8 +46,9 @@ def send_past_conversations(interpreter):
             "We are about to send all previous conversations to Open Interpreter for training an open-source language model. Please make sure these don't contain any private information. Run `interpreter --conversations` to browse them."
         )
         print()
+        time.sleep(2)
         uh = input(
-            "Do we have your permission to send all previous conversations to Open Interpreter? y/n"
+            "Do we have your permission to send all previous conversations to Open Interpreter? (y/n): "
         )
         print()
         if uh == "y":
@@ -165,14 +166,21 @@ def is_list_of_lists(l):
     return isinstance(l, list) and all([isinstance(e, list) for e in l])
 
 
-def contribute_conversations(conversations: List[List]):
+def contribute_conversations(
+    conversations: List[List], feedback=None, conversation_id=None
+):
     if len(conversations) == 0 or len(conversations[0]) == 0:
         return None
 
-    url = "https://api.openinterpreter.com/v0/conversations/contribute/"
+    url = "https://api.openinterpreter.com/v0/contribute/"
     version = pkg_resources.get_distribution("open-interpreter").version
 
-    payload = {"conversations": conversations, "oi_version": version}
+    payload = {
+        "conversation_id": conversation_id,
+        "conversations": conversations,
+        "oi_version": version,
+        "feedback": feedback,
+    }
 
     assert is_list_of_lists(
         payload["conversations"]
diff --git a/interpreter/terminal_interface/start_terminal_interface.py b/interpreter/terminal_interface/start_terminal_interface.py
@@ -499,7 +499,44 @@ def main():
     except KeyboardInterrupt:
         pass
     finally:
-        if interpreter.will_contribute:
-            contribute_conversations([interpreter.messages])
-            print("Thank you for contributing to our training data!")
-        interpreter.computer.terminate()
+        try:
+            interpreter.computer.terminate()
+
+            if not interpreter.offline and not interpreter.disable_telemetry:
+                feedback = None
+                if len(interpreter.messages) > 3:
+                    feedback = (
+                        input("\n\nWas Open Interpreter helpful? (y/n): ")
+                        .strip()
+                        .lower()
+                    )
+                    if feedback == "y":
+                        feedback = True
+                    elif feedback == "n":
+                        feedback = False
+                    else:
+                        feedback = None
+                    if feedback != None and not interpreter.contribute_conversation:
+                        contribute = (
+                            input(
+                                "\nThanks for your feedback! Would you like to send us this chat so we can improve? (y/n): "
+                            )
+                            .strip()
+                            .lower()
+                        )
+                        if contribute == "y":
+                            interpreter.contribute_conversation = True
+                            print("Thank you for contributing!")
+
+                if interpreter.contribute_conversation and interpreter.messages != []:
+                    conversation_id = (
+                        interpreter.conversation_id
+                        if hasattr(interpreter, "conversation_id")
+                        else None
+                    )
+                    contribute_conversations(
+                        [interpreter.messages], feedback, conversation_id
+                    )
+
+        except KeyboardInterrupt:
+            pass
diff --git a/interpreter/terminal_interface/validate_llm_settings.py b/interpreter/terminal_interface/validate_llm_settings.py
@@ -32,7 +32,12 @@ def validate_llm_settings(interpreter):
             # Ensure API keys are set as environment variables
 
             # OpenAI
-            if interpreter.llm.model in litellm.open_ai_chat_completion_models:
+            if interpreter.llm.model in [
+                "gpt-4",
+                "gpt-3.5-turbo",
+                "gpt-40",
+                "gpt-4-turbo",
+            ]:
                 if (
                     not os.environ.get("OPENAI_API_KEY")
                     and not interpreter.llm.api_key
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
