[Bugfix] ensure tool_choice is popped when tool_choice:null is passed in json payload (#19679)

Signed-off-by: Guillaume Calmettes <[email protected]>

Author: gcalmettes

vllm/entrypoints/openai/protocol.py

@@ -841,7 +841,7 @@ def check_tool_usage(cls, data):
             return data
 
         # if "tool_choice" is specified -- validation
-        if "tool_choice" in data:
+        if "tool_choice" in data and data["tool_choice"] is not None:
 
             # ensure that if "tool choice" is specified, tools are present
             if "tools" not in data or data["tools"] is None:
@@ -853,7 +853,7 @@ def check_tool_usage(cls, data):
             if data["tool_choice"] not in [
                     "auto", "required"
             ] and not isinstance(data["tool_choice"], dict):
-                raise NotImplementedError(
+                raise ValueError(
                     f'Invalid value for `tool_choice`: {data["tool_choice"]}! '\
                     'Only named tools, "none", "auto" or "required" '\
                     'are supported.'