Skip to content

Update tool_chat_template_deepseekv31.jinja#9895

Merged
JustinTong0323 merged 1 commit intosgl-project:mainfrom
WangJianQ-0118:patch-1
Sep 3, 2025
Merged

Update tool_chat_template_deepseekv31.jinja#9895
JustinTong0323 merged 1 commit intosgl-project:mainfrom
WangJianQ-0118:patch-1

Conversation

@WangJianQ-0118
Copy link
Copy Markdown
Contributor

增加tojson,解决多轮工具调用报错的问题:
#9891

Motivation

Modifications

Accuracy Tests

Benchmarking and Profiling

Checklist

增加tojson,解决多轮工具调用报错的问题:
sgl-project#9891
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @WangJianQ-0118, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

此拉取请求旨在修复 DeepSeekV3.1 聊天模板中与工具调用相关的问题。通过确保工具参数的正确 JSON 序列化,它解决了在多轮交互中可能发生的错误,从而提高了工具调用的稳定性和可靠性。

Highlights

  • 工具调用参数序列化: 在 tool_chat_template_deepseekv31.jinja 模板中,为 tool['function']['arguments'] 添加了 |tojson 过滤器,以确保工具参数被正确地序列化为 JSON 格式。
  • 解决多轮工具调用问题: 此更改旨在解决在多轮工具调用场景中可能出现的错误,具体参考了 GitHub issue #9891
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

本次变更通过在 Jinja 模板中为 tool['function']['arguments'] 添加 |tojson 过滤器,正确地修复了多轮工具调用中参数序列化的问题。这是一个重要的修复,可以防止因参数格式不正确而导致的错误。此外,我还提出了一项重构建议,以提高模板代码的可读性和可维护性。

Comment on lines 43 to 54
{%- for tool in message['tool_calls'] %}
{%- if not ns.is_first %}
{%- if message['content'] is none %}
{{'<|tool▁calls▁begin|><|tool▁call▁begin|>'+ tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments'] + '<|tool▁call▁end|>'}}
{{'<|tool▁calls▁begin|><|tool▁call▁begin|>'+ tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments']|tojson + '<|tool▁call▁end|>'}}
{%- else %}
{{message['content'] + '<|tool▁calls▁begin|><|tool▁call▁begin|>' + tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments'] + '<|tool▁call▁end|>'}}
{{message['content'] + '<|tool▁calls▁begin|><|tool▁call▁begin|>' + tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments']|tojson + '<|tool▁call▁end|>'}}
{%- endif %}
{%- set ns.is_first = true -%}
{%- else %}
{{'<|tool▁call▁begin|>'+ tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments'] + '<|tool▁call▁end|>'}}
{{'<|tool▁call▁begin|>'+ tool['function']['name'] + '<|tool▁sep|>' + tool['function']['arguments']|tojson + '<|tool▁call▁end|>'}}
{%- endif %}
{%- endfor %}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

感谢您修复此问题!添加 |tojson 过滤器是正确的,可以确保工具调用的参数被正确序列化为 JSON 字符串。

另外,为了提高代码的可读性和可维护性,我建议重构这部分逻辑以消除重复。当前的实现中,构建工具调用字符串的逻辑在多个地方重复出现。通过使用 Jinja 的 loop.first 变量和定义一个局部变量,可以使模板更简洁、更易于理解。

您可以考虑应用以下建议的重构:

    {%- for tool in message['tool_calls'] %}
      {%- set tool_call_str = '<|tool call begin|>' + tool['function']['name'] + '<|tool sep|>' + (tool['function']['arguments']|tojson) + '<|tool call end|>' -%}
      {%- if loop.first %}
        {%- if message['content'] is not none -%}
          {{- message['content'] -}}
        {%- endif -%}
        {{- '<|tool calls begin|>' -}}
      {%- endif -%}
      {{- tool_call_str -}}
    {%- endfor %}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, looks reasonable

@JustinTong0323 JustinTong0323 merged commit cc9a31c into sgl-project:main Sep 3, 2025
19 checks passed
MahmoudAshraf97 pushed a commit to MahmoudAshraf97/sglang that referenced this pull request Sep 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants