Robuster Server

Author: KillianLucas

interpreter/core/async_core.py

@@ -122,7 +122,7 @@ def respond(self, run_code=None):
                 if self.stop_event.is_set():
                     return
 
-                if self.print or self.debug:
+                if self.print:
                     if "start" in chunk:
                         print("\n")
                     if chunk["type"] in ["code", "console"] and "format" in chunk:
@@ -140,12 +140,15 @@ def respond(self, run_code=None):
                             )
                             print(content, end="", flush=True)
 
+                if self.debug:
+                    print("Interpreter produced this chunk:", chunk)
+
                 self.output_queue.sync_q.put(chunk)
 
             self.output_queue.sync_q.put(complete_message)
 
             if self.print or self.debug:
-                print("Server response complete.")
+                print("\nServer response complete.\n")
 
         except Exception as e:
             error = traceback.format_exc() + "\n" + str(e)
@@ -464,17 +467,23 @@ async def send_output():
                         # First, try to send any unsent messages
                         while async_interpreter.unsent_messages:
                             output = async_interpreter.unsent_messages[0]
-                            try:
-                                await send_message(output)
+                            if async_interpreter.debug:
+                                print("This was unsent, sending it again:", output)
+
+                            success = await send_message(output)
+                            if success:
                                 async_interpreter.unsent_messages.popleft()
-                            except Exception:
-                                # If we can't send, break and try again later
-                                break
 
                         # If we've sent all unsent messages, get a new output
                         if not async_interpreter.unsent_messages:
                             output = await async_interpreter.output()
-                            await send_message(output)
+                            success = await send_message(output)
+                            if not success:
+                                async_interpreter.unsent_messages.append(output)
+                                if async_interpreter.debug:
+                                    print(
+                                        f"Added message to unsent_messages queue after failed attempts: {output}"
+                                    )
 
                     except Exception as e:
                         error = traceback.format_exc() + "\n" + str(e)
@@ -506,16 +515,19 @@ async def send_message(output):
                     # time.sleep(0.5)
 
                     if websocket.client_state != WebSocketState.CONNECTED:
-                        break
+                        return False
 
                     try:
                         # print("sending:", output)
 
                         if isinstance(output, bytes):
                             await websocket.send_bytes(output)
+                            return True  # Haven't set up ack for this
                         else:
                             if async_interpreter.require_acknowledge:
                                 output["id"] = id
+                            if async_interpreter.debug:
+                                print("Sending this over the websocket:", output)
                             await websocket.send_text(json.dumps(output))
 
                         if async_interpreter.require_acknowledge:
@@ -524,31 +536,38 @@ async def send_message(output):
                                 if id in async_interpreter.acknowledged_outputs:
                                     async_interpreter.acknowledged_outputs.remove(id)
                                     acknowledged = True
+                                    if async_interpreter.debug:
+                                        print("This output was acknowledged:", output)
                                     break
                                 await asyncio.sleep(0.0001)
 
                             if acknowledged:
-                                return
+                                return True
                             else:
-                                raise Exception("Acknowledgement not received.")
+                                if async_interpreter.debug:
+                                    print("Acknowledgement not received for:", output)
+                                return False
                         else:
-                            return
+                            return True
 
                     except Exception as e:
                         print(
                             f"Failed to send output on attempt number: {attempt + 1}. Output was: {output}"
                         )
                         print(f"Error: {str(e)}")
-                        await asyncio.sleep(0.05)
+                        traceback.print_exc()
+                        await asyncio.sleep(0.01)
 
                 # If we've reached this point, we've failed to send after 100 attempts
                 if output not in async_interpreter.unsent_messages:
-                    async_interpreter.unsent_messages.append(output)
+                    print("Failed to send message:", output)
+                else:
                     print(
-                        f"Added message to unsent_messages queue after failed attempts: {output}"
+                        "Failed to send message, also it was already in unsent queue???:",
+                        output,
                     )
-                else:
-                    print("Why was this already in unsent_messages?", output)
+
+                return False
 
             await asyncio.gather(receive_input(), send_output())
 
@@ -577,7 +596,8 @@ async def post_input(payload: Dict[str, Any]):
     @router.post("/settings")
     async def set_settings(payload: Dict[str, Any]):
         for key, value in payload.items():
-            print(f"Updating settings: {key} = {value}")
+            print("Updating settings...")
+            # print(f"Updating settings: {key} = {value}")
             if key in ["llm", "computer"] and isinstance(value, dict):
                 if key == "auto_run":
                     return {

interpreter/core/llm/llm.py

@@ -279,8 +279,10 @@ def run(self, messages):
         if self.interpreter.verbose:
             litellm.set_verbose = True
 
-        if self.interpreter.debug:
-            print("\n\n\nOPENAI COMPATIBLE MESSAGES\n\n\n")
+        if (
+            self.interpreter.debug == True
+        ):  # debug will equal "server" if we're debugging the server specifically
+            print("\n\n\nOPENAI COMPATIBLE MESSAGES:\n\n\n")
             for message in messages:
                 if len(str(message)) > 5000:
                     print(str(message)[:200] + "...")
@@ -400,6 +402,8 @@ def fixed_litellm_completions(**params):
     attempts = 4
     first_error = None
 
+    params["num_retries"] = 0
+
     for attempt in range(attempts):
         try:
             yield from litellm.completion(**params)

interpreter/core/llm/utils/convert_to_openai_messages.py

@@ -83,6 +83,10 @@ def convert_to_openai_messages(
                 new_message["name"] = "execute"
                 if "content" not in message:
                     print("What is this??", content)
+                if type(message["content"]) != str:
+                    if interpreter.debug:
+                        print("\n\n\nStrange chunk found:", message, "\n\n\n")
+                    message["content"] = str(message["content"])
                 if message["content"].strip() == "":
                     new_message[
                         "content"

interpreter/core/render_message.py

@@ -21,15 +21,22 @@ def render_message(interpreter, message):
             )
 
             # 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"])
+            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] = "\n".join(outputs)
 
     # Join the parts back into the message
     rendered_message = "".join(parts).strip()
 
-    if interpreter.debug:
+    if (
+        interpreter.debug == True
+    ):  # debug will equal "server" if we're debugging the server specifically
         print("\n\n\nSYSTEM MESSAGE\n\n\n")
         print(rendered_message)
         print("\n\n\n")