Server fixes

Author: KillianLucas

Dockerfile

@@ -8,7 +8,7 @@ FROM python:3.11.8
 # Set environment variables
 # ENV OPENAI_API_KEY ...
 
-ENV HOST 0.0.0.0 
+ENV HOST 0.0.0.0
 # ^ Sets the server host to 0.0.0.0, Required for the server to be accessible outside the container
 
 # Copy required files into container

interpreter/core/async_core.py

@@ -1,7 +1,9 @@
 import asyncio
 import json
 import os
+import socket
 import threading
+import time
 import traceback
 from datetime import datetime
 from typing import Any, Dict
@@ -35,6 +37,8 @@ async def input(self, chunk):
         When it hits an "end" flag, calls interpreter.respond().
         """
 
+        print("Received:", chunk)
+
         if "start" in chunk:
             # If the user is starting something, the interpreter should stop.
             if self.respond_thread is not None and self.respond_thread.is_alive():
@@ -79,13 +83,17 @@ def respond(self, run_code=None):
             if run_code == None:
                 run_code = self.auto_run
 
-            for chunk in self._respond_and_store():
-                # To preserve confirmation chunks, we add this to the bottom instead
-                # if chunk["type"] == "confirmation":
-                #     if run_code:
-                #         continue
-                #     else:
-                #         break
+            for chunk_og in self._respond_and_store():
+                chunk = (
+                    chunk_og.copy()
+                )  # This fixes weird double token chunks. Probably a deeper problem?
+
+                if chunk["type"] == "confirmation":
+                    if run_code:
+                        run_code = False
+                        continue
+                    else:
+                        break
 
                 if self.stop_event.is_set():
                     return
@@ -102,20 +110,20 @@ def respond(self, run_code=None):
 
                 self.output_queue.sync_q.put(chunk)
 
-                if chunk["type"] == "confirmation":
-                    if not run_code:
-                        break
-
             self.output_queue.sync_q.put(
                 {"role": "server", "type": "status", "content": "complete"}
             )
         except Exception as e:
+            error = traceback.format_exc() + "\n" + str(e)
             error_message = {
                 "role": "server",
                 "type": "error",
                 "content": traceback.format_exc() + "\n" + str(e),
             }
             self.output_queue.sync_q.put(error_message)
+            print("\n\n--- SENT ERROR: ---\n\n")
+            print(error)
+            print("\n\n--- (ERROR ABOVE WAS SENT) ---\n\n")
 
     def accumulate(self, chunk):
         """
@@ -163,52 +171,61 @@ async def receive_input():
                         if data.get("type") == "websocket.receive" and "text" in data:
                             data = json.loads(data["text"])
                             await async_interpreter.input(data)
-                        elif (
-                            data.get("type") == "websocket.disconnect"
-                            and data.get("code") == 1000
-                        ):
+                        elif data.get("type") == "websocket.disconnect":
                             print("Disconnecting.")
                             return
                         else:
                             print("Invalid data:", data)
                             continue
 
                     except Exception as e:
+                        error = traceback.format_exc() + "\n" + str(e)
                         error_message = {
                             "role": "server",
                             "type": "error",
                             "content": traceback.format_exc() + "\n" + str(e),
                         }
                         await websocket.send_text(json.dumps(error_message))
+                        print("\n\n--- SENT ERROR: ---\n\n")
+                        print(error)
+                        print("\n\n--- (ERROR ABOVE WAS SENT) ---\n\n")
 
             async def send_output():
                 while True:
                     try:
                         output = await async_interpreter.output()
 
+                        print("SENDING", output)
+
                         if isinstance(output, bytes):
                             await websocket.send_bytes(output)
                         else:
                             await websocket.send_text(json.dumps(output))
                     except Exception as e:
-                        traceback.print_exc()
+                        error = traceback.format_exc() + "\n" + str(e)
                         error_message = {
                             "role": "server",
                             "type": "error",
                             "content": traceback.format_exc() + "\n" + str(e),
                         }
                         await websocket.send_text(json.dumps(error_message))
+                        print("\n\n--- SENT ERROR: ---\n\n")
+                        print(error)
+                        print("\n\n--- (ERROR ABOVE WAS SENT) ---\n\n")
 
             await asyncio.gather(receive_input(), send_output())
         except Exception as e:
-            traceback.print_exc()
             try:
+                error = traceback.format_exc() + "\n" + str(e)
                 error_message = {
                     "role": "server",
                     "type": "error",
                     "content": traceback.format_exc() + "\n" + str(e),
                 }
                 await websocket.send_text(json.dumps(error_message))
+                print("\n\n--- SENT ERROR: ---\n\n")
+                print(error)
+                print("\n\n--- (ERROR ABOVE WAS SENT) ---\n\n")
             except:
                 # If we can't send it, that's fine.
                 pass
@@ -279,9 +296,12 @@ async def get_setting(setting: str):
 
 host = os.getenv(
     "HOST", "127.0.0.1"
-)  # IP address for localhost, used for local testing
+)  # IP address for localhost, used for local testing. To expose to local network, use 0.0.0.0
 port = int(os.getenv("PORT", 8000))  # Default port is 8000
 
+# FOR TESTING ONLY
+# host = "0.0.0.0"
+
 
 class Server:
     def __init__(self, async_interpreter, host=host, port=port):
@@ -296,6 +316,21 @@ def __init__(self, async_interpreter, host=host, port=port):
 
     def run(self, retries=5, *args, **kwargs):
         print("SERVER STARTING")
+
+        if "host" in kwargs:
+            host = kwargs["host"]
+        else:
+            host = self.host
+
+        if host == "0.0.0.0":
+            print(
+                "Warning: Using host `0.0.0.0` will expose Open Interpreter over your local network."
+            )
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            s.connect(("8.8.8.8", 80))  # Google's public DNS server
+            print(f"Server is running at http://{s.getsockname()[0]}:{self.port}")
+            s.close()
+
         for _ in range(retries):
             try:
                 self.uvicorn_server.run(*args, **kwargs)

interpreter/core/llm/utils/convert_to_openai_messages.py

@@ -80,6 +80,8 @@ def convert_to_openai_messages(
             if function_calling:
                 new_message["role"] = "function"
                 new_message["name"] = "execute"
+                if "content" not in message:
+                    print("What is this??", content)
                 if message["content"].strip() == "":
                     new_message[
                         "content"

interpreter/core/respond.py

@@ -238,7 +238,9 @@ def respond(interpreter):
                     break
 
                 # They may have edited the code! Grab it again
-                code = interpreter.messages[-1]["content"]
+                code = [m for m in interpreter.messages if m["type"] == "code"][-1][
+                    "content"
+                ]
 
                 # don't let it import computer — we handle that!
                 if interpreter.computer.import_computer_api and language == "python":