From 4d5692b6cd80aca2f42eca6cac3346652a206de9 Mon Sep 17 00:00:00 2001 From: ai-jz <156989844+ai-jz@users.noreply.github.com> Date: Mon, 12 Oct 2026 20:41:50 -0700 Subject: [PATCH] fix(openai): honor tool_choice=none in DeepSeek encoders (#43006) Co-authored-by: ai-jz Co-authored-by: Xinyuan Tong <115166877+JustinTong0323@users.noreply.github.com> --- .../srt/entrypoints/openai/serving_chat.py | 8 +++-- .../entrypoints/openai/test_serving_chat.py | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/python/sglang/srt/entrypoints/openai/serving_chat.py b/python/sglang/srt/entrypoints/openai/serving_chat.py index 6c19793192..d3b15a4205 100644 --- a/python/sglang/srt/entrypoints/openai/serving_chat.py +++ b/python/sglang/srt/entrypoints/openai/serving_chat.py @@ -1590,18 +1590,20 @@ class OpenAIServingChat(OpenAIServingBase): messages, request ) + request_tools = request.tools if tools else None + # An empty system message hosts the request tools; dsv41 renders a # system token for it, so it only gets one when tools need the host. - if messages[0]["role"] != "system" and (request.tools or not is_dsv41): + if messages[0]["role"] != "system" and (request_tools or not is_dsv41): messages.insert(0, {"role": "system", "content": ""}) - if request.tools: + if request_tools: messages[0]["tools"] = [ ( chat_encoding.dsv41_tool_payload(tool) if is_dsv41 else tool.model_dump() ) - for tool in request.tools + for tool in request_tools ] # Default encoding (dsv4/dsv41/dsv32) diff --git a/test/registered/unit/entrypoints/openai/test_serving_chat.py b/test/registered/unit/entrypoints/openai/test_serving_chat.py index 4af33653a5..768f6e7f54 100644 --- a/test/registered/unit/entrypoints/openai/test_serving_chat.py +++ b/test/registered/unit/entrypoints/openai/test_serving_chat.py @@ -1422,6 +1422,38 @@ class ServingChatTestCase(CustomTestCase): self.assertIsNone(result.stop) + def test_dsv_tool_choice_none_omits_tools_from_prompt(self): + self.template_manager.chat_template_name = None + self.template_manager.jinja_template_content_format = "string" + self.chat._dsv4_reasoning_effort_profile = "preview" + tool = { + "type": "function", + "function": { + "name": "calculator", + "parameters": {"type": "object"}, + }, + } + + for chat_encoding_spec in ("dsv4", "dsv32", "dsv41"): + for tool_choice, expects_tools in (("none", False), ("auto", True)): + with self.subTest( + chat_encoding_spec=chat_encoding_spec, + tool_choice=tool_choice, + ): + self.chat.chat_encoding_spec = chat_encoding_spec + self.tm.tokenizer.encode.reset_mock() + request = ChatCompletionRequest( + model="x", + messages=[{"role": "user", "content": "Solve 100 / 7."}], + tools=[tool], + tool_choice=tool_choice, + ) + + self.chat._process_messages(request, is_multimodal=False) + + prompt = self.tm.tokenizer.encode.call_args.args[0] + self.assertEqual("calculator" in prompt, expects_tools) + def test_kimi_k3_encoder_receives_wire_request_fields(self): self.template_manager.chat_template_name = None self.chat.chat_encoding_spec = "kimi_k3"