Merge branch 'OpenInterpreter:main' into main

Author: imapersonman

interpreter/core/llm/llm.py

@@ -59,12 +59,14 @@ def run(self, messages):
             ), "No message after the first can have the role 'system'"
 
         # Detect function support
-        if self.supports_functions != None:
-            supports_functions = self.supports_functions
-        elif litellm.supports_function_calling(self.model):
-            supports_functions = True
-        else:
-            supports_functions = False
+        if self.supports_functions == None:
+            try:
+                if litellm.supports_function_calling(self.model):
+                    self.supports_functions = True
+                else:
+                    self.supports_functions = False
+            except:
+                self.supports_functions = False
 
         # Trim image messages if they're there
         if self.supports_vision:
@@ -89,7 +91,7 @@ def run(self, messages):
         # Convert to OpenAI messages format
         messages = convert_to_openai_messages(
             messages,
-            function_calling=supports_functions,
+            function_calling=self.supports_functions,
             vision=self.supports_vision,
             shrink_images=self.interpreter.shrink_images,
         )
@@ -193,7 +195,7 @@ def run(self, messages):
         if self.interpreter.verbose:
             litellm.set_verbose = True
 
-        if supports_functions:
+        if self.supports_functions:
             yield from run_function_calling_llm(self, params)
         else:
             yield from run_text_llm(self, params)

interpreter/terminal_interface/profiles/defaults/local.py

@@ -214,7 +214,7 @@ def download_model(models_dir, models, interpreter):
 
 """
     )
-
+    interpreter.llm.supports_functions = False
     interpreter.llm.api_base = "http://localhost:1234/v1"
     interpreter.llm.api_key = "x"
 

interpreter/terminal_interface/profiles/profiles.py

@@ -155,7 +155,7 @@ def apply_profile(interpreter, profile, profile_path):
             "We have updated our profile file format. Would you like to migrate your profile file to the new format? No data will be lost."
         )
         print("")
-        message = input("(y/n): ")
+        message = input("(y/n) ")
         print("")
         if message.lower() == "y":
             migrate_user_app_directory()
@@ -164,7 +164,9 @@ def apply_profile(interpreter, profile, profile_path):
             if profile_path.endswith("default.yaml"):
                 with open(profile_path, "r") as file:
                     text = file.read()
-                text = text.replace("version: " + str(profile["version"]), f"version: {OI_VERSION}")
+                text = text.replace(
+                    "version: " + str(profile["version"]), f"version: {OI_VERSION}"
+                )
 
                 try:
                     if profile["llm"]["model"] == "gpt-4":
@@ -175,7 +177,7 @@ def apply_profile(interpreter, profile, profile_path):
                         profile["llm"]["model"] = "gpt-4-turbo"
                 except:
                     raise
-                    pass # fine
+                    pass  # fine
 
                 with open(profile_path, "w") as file:
                     file.write(text)
@@ -566,7 +568,7 @@ def apply_profile_to_object(obj, profile):
 
 def open_storage_dir(directory):
     dir = os.path.join(oi_dir, directory)
-    
+
     print(f"Opening {directory} directory ({dir})...")
 
     if platform.system() == "Windows":
@@ -580,6 +582,7 @@ def open_storage_dir(directory):
             subprocess.call(["open", dir])
     return
 
+
 def reset_profile(specific_default_profile=None):
     if (
         specific_default_profile
@@ -628,9 +631,7 @@ def reset_profile(specific_default_profile=None):
             with open(target_file, "r") as file:
                 current_profile = file.read()
             if current_profile not in historical_profiles:
-                user_input = input(
-                    f"Would you like to reset/update {filename}? (y/n): "
-                )
+                user_input = input(f"Would you like to reset/update {filename}? (y/n) ")
                 if user_input.lower() == "y":
                     send2trash.send2trash(
                         target_file