Merge pull request #1549 from benxu3/development

add better request handling to openai-compatible server

Author: KillianLucas

interpreter/interpreter.py

@@ -215,7 +215,7 @@ def default_system_message(self):
         ):
             system_message = system_message.replace(
                 "</SYSTEM_CAPABILITY>",
-                "* For fast web searches (like up-to-date docs) curl https://api.openinterpreter.com/v0/browser/search?query=your+search+query\n</SYSTEM_CAPABILITY>",
+                "* For any web search requests, curl https://api.openinterpreter.com/v0/browser/search?query=your+search+query\n</SYSTEM_CAPABILITY>",
             )
 
         # Update system prompt for Mac OS, if computer tool is enabled

interpreter/server.py

@@ -8,6 +8,7 @@
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse, StreamingResponse
 from pydantic import BaseModel
+from asyncio import CancelledError, Task
 
 
 class ChatCompletionRequest(BaseModel):
@@ -35,14 +36,17 @@ def __init__(self, interpreter):
         # Setup routes
         self.app.post("/chat/completions")(self.chat_completion)
 
+
     async def chat_completion(self, request: Request):
         """Main chat completion endpoint"""
         body = await request.json()
+        if self.interpreter.debug:
+            print("Request body:", body)
         try:
             req = ChatCompletionRequest(**body)
         except Exception as e:
-            print("Validation error:", str(e))  # Debug print
-            print("Request body:", body)  # Print the request body
+            print("Validation error:", str(e))
+            print("Request body:", body)
             raise
 
         # Filter out system message
@@ -75,18 +79,6 @@ async def _stream_response(self):
                             delta["function_call"] = choice.delta.function_call
                         if choice.delta.tool_calls is not None:
                             pass
-                            # Convert tool_calls to dict representation
-                            # delta["tool_calls"] = [
-                            #     {
-                            #         "index": tool_call.index,
-                            #         "id": tool_call.id,
-                            #         "type": tool_call.type,
-                            #         "function": {
-                            #             "name": tool_call.function.name,
-                            #             "arguments": tool_call.function.arguments
-                            #         }
-                            #     } for tool_call in choice.delta.tool_calls
-                            # ]
 
                     choices.append(
                         {
@@ -108,11 +100,16 @@ async def _stream_response(self):
                     data["system_fingerprint"] = chunk.system_fingerprint
 
                 yield f"data: {json.dumps(data)}\n\n"
-        except asyncio.CancelledError:
-            # Set stop flag when stream is cancelled
-            self.interpreter._stop_flag = True
+
+        except CancelledError:
+            # Handle cancellation gracefully
+            print("Request cancelled - cleaning up...")
+
             raise
+        except Exception as e:
+            print(f"Error in stream: {str(e)}")
         finally:
+            # Always send DONE message and cleanup
             yield "data: [DONE]\n\n"
 
     def run(self):