Update main.py

main.py

@@ -496,7 +496,6 @@ async def search_gpt(q: str, request: Request, stream: bool = False, systempromp
         return JSONResponse(content=response_data)
 
 header_url = os.getenv('HEADER_URL')
-
 @app.post("/chat/completions")
 @app.post("/api/v1/chat/completions")
 async def get_completion(payload: Payload, request: Request, authenticated: bool = Depends(verify_api_key)):
@@ -516,16 +515,20 @@ async def get_completion(payload: Payload, request: Request, authenticated: bool
 
     usage_tracker.record_request(request=request, model=model_to_use, endpoint="/chat/completions")
 
-    payload_dict = payload.dict()
-    payload_dict["model"] = model_to_use
+    payload_dict = payload.dict(exclude_none=True) # Exclude keys with None values
 
-    # --- Start of the fix ---
+    # The payload.dict(exclude_none=True) already handles this.
+    # The following checks are now redundant but can be kept for explicit clarity.
     if payload.tools is not None:
         payload_dict["tools"] = payload.tools
+    
+    # Handle the tool_choice more robustly
     if payload.tool_choice is not None:
-        payload_dict["tool_choice"] = payload.tool_choice
-    # --- End of the fix ---
-
+        # Check if the value is valid before passing it on
+        if isinstance(payload.tool_choice, (str, dict)):
+            payload_dict["tool_choice"] = payload.tool_choice
+        else:
+            print(f"Warning: tool_choice received with invalid type: {type(payload.tool_choice)}. Skipping.")
 
     stream_enabled = payload_dict.get("stream", True)