Fix typo in vllm command
#3
by
yuchenj - opened
- LICENSE +0 -202
- README.md +3 -3
- chat_template.jinja +0 -117
- qwen3coder_tool_parser.py +306 -320
- tokenizer_config.json +1 -1
LICENSE
DELETED
|
@@ -1,202 +0,0 @@
|
|
| 1 |
-
|
| 2 |
-
Apache License
|
| 3 |
-
Version 2.0, January 2004
|
| 4 |
-
http://www.apache.org/licenses/
|
| 5 |
-
|
| 6 |
-
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
| 7 |
-
|
| 8 |
-
1. Definitions.
|
| 9 |
-
|
| 10 |
-
"License" shall mean the terms and conditions for use, reproduction,
|
| 11 |
-
and distribution as defined by Sections 1 through 9 of this document.
|
| 12 |
-
|
| 13 |
-
"Licensor" shall mean the copyright owner or entity authorized by
|
| 14 |
-
the copyright owner that is granting the License.
|
| 15 |
-
|
| 16 |
-
"Legal Entity" shall mean the union of the acting entity and all
|
| 17 |
-
other entities that control, are controlled by, or are under common
|
| 18 |
-
control with that entity. For the purposes of this definition,
|
| 19 |
-
"control" means (i) the power, direct or indirect, to cause the
|
| 20 |
-
direction or management of such entity, whether by contract or
|
| 21 |
-
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
| 22 |
-
outstanding shares, or (iii) beneficial ownership of such entity.
|
| 23 |
-
|
| 24 |
-
"You" (or "Your") shall mean an individual or Legal Entity
|
| 25 |
-
exercising permissions granted by this License.
|
| 26 |
-
|
| 27 |
-
"Source" form shall mean the preferred form for making modifications,
|
| 28 |
-
including but not limited to software source code, documentation
|
| 29 |
-
source, and configuration files.
|
| 30 |
-
|
| 31 |
-
"Object" form shall mean any form resulting from mechanical
|
| 32 |
-
transformation or translation of a Source form, including but
|
| 33 |
-
not limited to compiled object code, generated documentation,
|
| 34 |
-
and conversions to other media types.
|
| 35 |
-
|
| 36 |
-
"Work" shall mean the work of authorship, whether in Source or
|
| 37 |
-
Object form, made available under the License, as indicated by a
|
| 38 |
-
copyright notice that is included in or attached to the work
|
| 39 |
-
(an example is provided in the Appendix below).
|
| 40 |
-
|
| 41 |
-
"Derivative Works" shall mean any work, whether in Source or Object
|
| 42 |
-
form, that is based on (or derived from) the Work and for which the
|
| 43 |
-
editorial revisions, annotations, elaborations, or other modifications
|
| 44 |
-
represent, as a whole, an original work of authorship. For the purposes
|
| 45 |
-
of this License, Derivative Works shall not include works that remain
|
| 46 |
-
separable from, or merely link (or bind by name) to the interfaces of,
|
| 47 |
-
the Work and Derivative Works thereof.
|
| 48 |
-
|
| 49 |
-
"Contribution" shall mean any work of authorship, including
|
| 50 |
-
the original version of the Work and any modifications or additions
|
| 51 |
-
to that Work or Derivative Works thereof, that is intentionally
|
| 52 |
-
submitted to Licensor for inclusion in the Work by the copyright owner
|
| 53 |
-
or by an individual or Legal Entity authorized to submit on behalf of
|
| 54 |
-
the copyright owner. For the purposes of this definition, "submitted"
|
| 55 |
-
means any form of electronic, verbal, or written communication sent
|
| 56 |
-
to the Licensor or its representatives, including but not limited to
|
| 57 |
-
communication on electronic mailing lists, source code control systems,
|
| 58 |
-
and issue tracking systems that are managed by, or on behalf of, the
|
| 59 |
-
Licensor for the purpose of discussing and improving the Work, but
|
| 60 |
-
excluding communication that is conspicuously marked or otherwise
|
| 61 |
-
designated in writing by the copyright owner as "Not a Contribution."
|
| 62 |
-
|
| 63 |
-
"Contributor" shall mean Licensor and any individual or Legal Entity
|
| 64 |
-
on behalf of whom a Contribution has been received by Licensor and
|
| 65 |
-
subsequently incorporated within the Work.
|
| 66 |
-
|
| 67 |
-
2. Grant of Copyright License. Subject to the terms and conditions of
|
| 68 |
-
this License, each Contributor hereby grants to You a perpetual,
|
| 69 |
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
| 70 |
-
copyright license to reproduce, prepare Derivative Works of,
|
| 71 |
-
publicly display, publicly perform, sublicense, and distribute the
|
| 72 |
-
Work and such Derivative Works in Source or Object form.
|
| 73 |
-
|
| 74 |
-
3. Grant of Patent License. Subject to the terms and conditions of
|
| 75 |
-
this License, each Contributor hereby grants to You a perpetual,
|
| 76 |
-
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
| 77 |
-
(except as stated in this section) patent license to make, have made,
|
| 78 |
-
use, offer to sell, sell, import, and otherwise transfer the Work,
|
| 79 |
-
where such license applies only to those patent claims licensable
|
| 80 |
-
by such Contributor that are necessarily infringed by their
|
| 81 |
-
Contribution(s) alone or by combination of their Contribution(s)
|
| 82 |
-
with the Work to which such Contribution(s) was submitted. If You
|
| 83 |
-
institute patent litigation against any entity (including a
|
| 84 |
-
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
| 85 |
-
or a Contribution incorporated within the Work constitutes direct
|
| 86 |
-
or contributory patent infringement, then any patent licenses
|
| 87 |
-
granted to You under this License for that Work shall terminate
|
| 88 |
-
as of the date such litigation is filed.
|
| 89 |
-
|
| 90 |
-
4. Redistribution. You may reproduce and distribute copies of the
|
| 91 |
-
Work or Derivative Works thereof in any medium, with or without
|
| 92 |
-
modifications, and in Source or Object form, provided that You
|
| 93 |
-
meet the following conditions:
|
| 94 |
-
|
| 95 |
-
(a) You must give any other recipients of the Work or
|
| 96 |
-
Derivative Works a copy of this License; and
|
| 97 |
-
|
| 98 |
-
(b) You must cause any modified files to carry prominent notices
|
| 99 |
-
stating that You changed the files; and
|
| 100 |
-
|
| 101 |
-
(c) You must retain, in the Source form of any Derivative Works
|
| 102 |
-
that You distribute, all copyright, patent, trademark, and
|
| 103 |
-
attribution notices from the Source form of the Work,
|
| 104 |
-
excluding those notices that do not pertain to any part of
|
| 105 |
-
the Derivative Works; and
|
| 106 |
-
|
| 107 |
-
(d) If the Work includes a "NOTICE" text file as part of its
|
| 108 |
-
distribution, then any Derivative Works that You distribute must
|
| 109 |
-
include a readable copy of the attribution notices contained
|
| 110 |
-
within such NOTICE file, excluding those notices that do not
|
| 111 |
-
pertain to any part of the Derivative Works, in at least one
|
| 112 |
-
of the following places: within a NOTICE text file distributed
|
| 113 |
-
as part of the Derivative Works; within the Source form or
|
| 114 |
-
documentation, if provided along with the Derivative Works; or,
|
| 115 |
-
within a display generated by the Derivative Works, if and
|
| 116 |
-
wherever such third-party notices normally appear. The contents
|
| 117 |
-
of the NOTICE file are for informational purposes only and
|
| 118 |
-
do not modify the License. You may add Your own attribution
|
| 119 |
-
notices within Derivative Works that You distribute, alongside
|
| 120 |
-
or as an addendum to the NOTICE text from the Work, provided
|
| 121 |
-
that such additional attribution notices cannot be construed
|
| 122 |
-
as modifying the License.
|
| 123 |
-
|
| 124 |
-
You may add Your own copyright statement to Your modifications and
|
| 125 |
-
may provide additional or different license terms and conditions
|
| 126 |
-
for use, reproduction, or distribution of Your modifications, or
|
| 127 |
-
for any such Derivative Works as a whole, provided Your use,
|
| 128 |
-
reproduction, and distribution of the Work otherwise complies with
|
| 129 |
-
the conditions stated in this License.
|
| 130 |
-
|
| 131 |
-
5. Submission of Contributions. Unless You explicitly state otherwise,
|
| 132 |
-
any Contribution intentionally submitted for inclusion in the Work
|
| 133 |
-
by You to the Licensor shall be under the terms and conditions of
|
| 134 |
-
this License, without any additional terms or conditions.
|
| 135 |
-
Notwithstanding the above, nothing herein shall supersede or modify
|
| 136 |
-
the terms of any separate license agreement you may have executed
|
| 137 |
-
with Licensor regarding such Contributions.
|
| 138 |
-
|
| 139 |
-
6. Trademarks. This License does not grant permission to use the trade
|
| 140 |
-
names, trademarks, service marks, or product names of the Licensor,
|
| 141 |
-
except as required for reasonable and customary use in describing the
|
| 142 |
-
origin of the Work and reproducing the content of the NOTICE file.
|
| 143 |
-
|
| 144 |
-
7. Disclaimer of Warranty. Unless required by applicable law or
|
| 145 |
-
agreed to in writing, Licensor provides the Work (and each
|
| 146 |
-
Contributor provides its Contributions) on an "AS IS" BASIS,
|
| 147 |
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
| 148 |
-
implied, including, without limitation, any warranties or conditions
|
| 149 |
-
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
| 150 |
-
PARTICULAR PURPOSE. You are solely responsible for determining the
|
| 151 |
-
appropriateness of using or redistributing the Work and assume any
|
| 152 |
-
risks associated with Your exercise of permissions under this License.
|
| 153 |
-
|
| 154 |
-
8. Limitation of Liability. In no event and under no legal theory,
|
| 155 |
-
whether in tort (including negligence), contract, or otherwise,
|
| 156 |
-
unless required by applicable law (such as deliberate and grossly
|
| 157 |
-
negligent acts) or agreed to in writing, shall any Contributor be
|
| 158 |
-
liable to You for damages, including any direct, indirect, special,
|
| 159 |
-
incidental, or consequential damages of any character arising as a
|
| 160 |
-
result of this License or out of the use or inability to use the
|
| 161 |
-
Work (including but not limited to damages for loss of goodwill,
|
| 162 |
-
work stoppage, computer failure or malfunction, or any and all
|
| 163 |
-
other commercial damages or losses), even if such Contributor
|
| 164 |
-
has been advised of the possibility of such damages.
|
| 165 |
-
|
| 166 |
-
9. Accepting Warranty or Additional Liability. While redistributing
|
| 167 |
-
the Work or Derivative Works thereof, You may choose to offer,
|
| 168 |
-
and charge a fee for, acceptance of support, warranty, indemnity,
|
| 169 |
-
or other liability obligations and/or rights consistent with this
|
| 170 |
-
License. However, in accepting such obligations, You may act only
|
| 171 |
-
on Your own behalf and on Your sole responsibility, not on behalf
|
| 172 |
-
of any other Contributor, and only if You agree to indemnify,
|
| 173 |
-
defend, and hold each Contributor harmless for any liability
|
| 174 |
-
incurred by, or claims asserted against, such Contributor by reason
|
| 175 |
-
of your accepting any such warranty or additional liability.
|
| 176 |
-
|
| 177 |
-
END OF TERMS AND CONDITIONS
|
| 178 |
-
|
| 179 |
-
APPENDIX: How to apply the Apache License to your work.
|
| 180 |
-
|
| 181 |
-
To apply the Apache License to your work, attach the following
|
| 182 |
-
boilerplate notice, with the fields enclosed by brackets "[]"
|
| 183 |
-
replaced with your own identifying information. (Don't include
|
| 184 |
-
the brackets!) The text should be enclosed in the appropriate
|
| 185 |
-
comment syntax for the file format. We also recommend that a
|
| 186 |
-
file or class name and description of purpose be included on the
|
| 187 |
-
same "printed page" as the copyright notice for easier
|
| 188 |
-
identification within third-party archives.
|
| 189 |
-
|
| 190 |
-
Copyright 2024 Alibaba Cloud
|
| 191 |
-
|
| 192 |
-
Licensed under the Apache License, Version 2.0 (the "License");
|
| 193 |
-
you may not use this file except in compliance with the License.
|
| 194 |
-
You may obtain a copy of the License at
|
| 195 |
-
|
| 196 |
-
http://www.apache.org/licenses/LICENSE-2.0
|
| 197 |
-
|
| 198 |
-
Unless required by applicable law or agreed to in writing, software
|
| 199 |
-
distributed under the License is distributed on an "AS IS" BASIS,
|
| 200 |
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
| 201 |
-
See the License for the specific language governing permissions and
|
| 202 |
-
limitations under the License.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
---
|
| 2 |
library_name: transformers
|
| 3 |
-
license: apache-2.0
|
| 4 |
license_link: https://huggingface.co/Qwen/Qwen3-Coder-480B-A35B-Instruct/blob/main/LICENSE
|
| 5 |
pipeline_tag: text-generation
|
| 6 |
---
|
|
@@ -16,7 +16,7 @@ Today, we're announcing **Qwen3-Coder**, our most agentic code model to date. **
|
|
| 16 |
|
| 17 |
- **Significant Performance** among open models on **Agentic Coding**, **Agentic Browser-Use**, and other foundational coding tasks, achieving results comparable to Claude Sonnet.
|
| 18 |
- **Long-context Capabilities** with native support for **256K** tokens, extendable up to **1M** tokens using Yarn, optimized for repository-scale understanding.
|
| 19 |
-
- **Agentic Coding** supporting for most
|
| 20 |
|
| 21 |

|
| 22 |
|
|
@@ -131,7 +131,7 @@ messages = [{'role': 'user', 'content': 'square the number 1024'}]
|
|
| 131 |
|
| 132 |
completion = client.chat.completions.create(
|
| 133 |
messages=messages,
|
| 134 |
-
model="Qwen3-
|
| 135 |
max_tokens=65536,
|
| 136 |
tools=tools,
|
| 137 |
)
|
|
|
|
| 1 |
---
|
| 2 |
library_name: transformers
|
| 3 |
+
license: apache-2.0
|
| 4 |
license_link: https://huggingface.co/Qwen/Qwen3-Coder-480B-A35B-Instruct/blob/main/LICENSE
|
| 5 |
pipeline_tag: text-generation
|
| 6 |
---
|
|
|
|
| 16 |
|
| 17 |
- **Significant Performance** among open models on **Agentic Coding**, **Agentic Browser-Use**, and other foundational coding tasks, achieving results comparable to Claude Sonnet.
|
| 18 |
- **Long-context Capabilities** with native support for **256K** tokens, extendable up to **1M** tokens using Yarn, optimized for repository-scale understanding.
|
| 19 |
+
- **Agentic Coding** supporting for most platfrom such as **Qwen Code**, **CLINE**, featuring a specially designed function call format.
|
| 20 |
|
| 21 |

|
| 22 |
|
|
|
|
| 131 |
|
| 132 |
completion = client.chat.completions.create(
|
| 133 |
messages=messages,
|
| 134 |
+
model="Qwen3-480B-A35B-Instruct",
|
| 135 |
max_tokens=65536,
|
| 136 |
tools=tools,
|
| 137 |
)
|
chat_template.jinja
DELETED
|
@@ -1,117 +0,0 @@
|
|
| 1 |
-
{% macro render_extra_keys(json_dict, handled_keys) %}
|
| 2 |
-
{%- if json_dict is mapping %}
|
| 3 |
-
{%- for json_key in json_dict if json_key not in handled_keys %}
|
| 4 |
-
{%- if json_dict[json_key] is mapping or (json_dict[json_key] is sequence and json_dict[json_key] is not string) %}
|
| 5 |
-
{{- '\n<' ~ json_key ~ '>' ~ (json_dict[json_key] | tojson | safe) ~ '</' ~ json_key ~ '>' }}
|
| 6 |
-
{%- else %}
|
| 7 |
-
{{-'\n<' ~ json_key ~ '>' ~ (json_dict[json_key] | string) ~ '</' ~ json_key ~ '>' }}
|
| 8 |
-
{%- endif %}
|
| 9 |
-
{%- endfor %}
|
| 10 |
-
{%- endif %}
|
| 11 |
-
{% endmacro %}
|
| 12 |
-
|
| 13 |
-
{%- if messages[0]["role"] == "system" %}
|
| 14 |
-
{%- set system_message = messages[0]["content"] %}
|
| 15 |
-
{%- set loop_messages = messages[1:] %}
|
| 16 |
-
{%- else %}
|
| 17 |
-
{%- set loop_messages = messages %}
|
| 18 |
-
{%- endif %}
|
| 19 |
-
|
| 20 |
-
{%- if not tools is defined %}
|
| 21 |
-
{%- set tools = [] %}
|
| 22 |
-
{%- endif %}
|
| 23 |
-
|
| 24 |
-
{%- if system_message is defined %}
|
| 25 |
-
{{- "<|im_start|>system\n" + system_message }}
|
| 26 |
-
{%- else %}
|
| 27 |
-
{%- if tools is iterable and tools | length > 0 %}
|
| 28 |
-
{{- "<|im_start|>system\nYou are Qwen, a helpful AI assistant that can interact with a computer to solve tasks." }}
|
| 29 |
-
{%- endif %}
|
| 30 |
-
{%- endif %}
|
| 31 |
-
{%- if tools is iterable and tools | length > 0 %}
|
| 32 |
-
{{- "\n\n# Tools\n\nYou have access to the following functions:\n\n" }}
|
| 33 |
-
{{- "<tools>" }}
|
| 34 |
-
{%- for tool in tools %}
|
| 35 |
-
{%- if tool.function is defined %}
|
| 36 |
-
{%- set tool = tool.function %}
|
| 37 |
-
{%- endif %}
|
| 38 |
-
{{- "\n<function>\n<name>" ~ tool.name ~ "</name>" }}
|
| 39 |
-
{%- if tool.description is defined %}
|
| 40 |
-
{{- '\n<description>' ~ (tool.description | trim) ~ '</description>' }}
|
| 41 |
-
{%- endif %}
|
| 42 |
-
{{- '\n<parameters>' }}
|
| 43 |
-
{%- if tool.parameters is defined and tool.parameters is mapping and tool.parameters.properties is defined and tool.parameters.properties is mapping %}
|
| 44 |
-
{%- for param_name, param_fields in tool.parameters.properties|items %}
|
| 45 |
-
{{- '\n<parameter>' }}
|
| 46 |
-
{{- '\n<name>' ~ param_name ~ '</name>' }}
|
| 47 |
-
{%- if param_fields.type is defined %}
|
| 48 |
-
{{- '\n<type>' ~ (param_fields.type | string) ~ '</type>' }}
|
| 49 |
-
{%- endif %}
|
| 50 |
-
{%- if param_fields.description is defined %}
|
| 51 |
-
{{- '\n<description>' ~ (param_fields.description | trim) ~ '</description>' }}
|
| 52 |
-
{%- endif %}
|
| 53 |
-
{%- set handled_keys = ['name', 'type', 'description'] %}
|
| 54 |
-
{{- render_extra_keys(param_fields, handled_keys) }}
|
| 55 |
-
{{- '\n</parameter>' }}
|
| 56 |
-
{%- endfor %}
|
| 57 |
-
{%- endif %}
|
| 58 |
-
{% set handled_keys = ['type', 'properties'] %}
|
| 59 |
-
{{- render_extra_keys(tool.parameters, handled_keys) }}
|
| 60 |
-
{{- '\n</parameters>' }}
|
| 61 |
-
{%- set handled_keys = ['type', 'name', 'description', 'parameters'] %}
|
| 62 |
-
{{- render_extra_keys(tool, handled_keys) }}
|
| 63 |
-
{{- '\n</function>' }}
|
| 64 |
-
{%- endfor %}
|
| 65 |
-
{{- "\n</tools>" }}
|
| 66 |
-
{{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n<tool_call>\n<function=example_function_name>\n<parameter=example_parameter_1>\nvalue_1\n</parameter>\n<parameter=example_parameter_2>\nThis is the value for the second parameter\nthat can span\nmultiple lines\n</parameter>\n</function>\n</tool_call>\n\n<IMPORTANT>\nReminder:\n- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags\n- Required parameters MUST be specified\n- You may provide optional reasoning for your function call in natural language BEFORE the function call, but NOT after\n- If there is no function call available, answer the question like normal with your current knowledge and do not tell the user about function calls\n</IMPORTANT>' }}
|
| 67 |
-
{%- endif %}
|
| 68 |
-
{%- if system_message is defined %}
|
| 69 |
-
{{- '<|im_end|>\n' }}
|
| 70 |
-
{%- else %}
|
| 71 |
-
{%- if tools is iterable and tools | length > 0 %}
|
| 72 |
-
{{- '<|im_end|>\n' }}
|
| 73 |
-
{%- endif %}
|
| 74 |
-
{%- endif %}
|
| 75 |
-
{%- for message in loop_messages %}
|
| 76 |
-
{%- if message.role == "assistant" and message.tool_calls is defined and message.tool_calls is iterable and message.tool_calls | length > 0 %}
|
| 77 |
-
{{- '<|im_start|>' + message.role }}
|
| 78 |
-
{%- if message.content is defined and message.content is string and message.content | trim | length > 0 %}
|
| 79 |
-
{{- '\n' + message.content | trim + '\n' }}
|
| 80 |
-
{%- endif %}
|
| 81 |
-
{%- for tool_call in message.tool_calls %}
|
| 82 |
-
{%- if tool_call.function is defined %}
|
| 83 |
-
{%- set tool_call = tool_call.function %}
|
| 84 |
-
{%- endif %}
|
| 85 |
-
{{- '\n<tool_call>\n<function=' + tool_call.name + '>\n' }}
|
| 86 |
-
{%- if tool_call.arguments is defined %}
|
| 87 |
-
{%- for args_name, args_value in tool_call.arguments|items %}
|
| 88 |
-
{{- '<parameter=' + args_name + '>\n' }}
|
| 89 |
-
{%- set args_value = args_value | tojson | safe if args_value is mapping or (args_value is sequence and args_value is not string) else args_value | string %}
|
| 90 |
-
{{- args_value }}
|
| 91 |
-
{{- '\n</parameter>\n' }}
|
| 92 |
-
{%- endfor %}
|
| 93 |
-
{%- endif %}
|
| 94 |
-
{{- '</function>\n</tool_call>' }}
|
| 95 |
-
{%- endfor %}
|
| 96 |
-
{{- '<|im_end|>\n' }}
|
| 97 |
-
{%- elif message.role == "user" or message.role == "system" or message.role == "assistant" %}
|
| 98 |
-
{{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>' + '\n' }}
|
| 99 |
-
{%- elif message.role == "tool" %}
|
| 100 |
-
{%- if loop.previtem and loop.previtem.role != "tool" %}
|
| 101 |
-
{{- '<|im_start|>user\n' }}
|
| 102 |
-
{%- endif %}
|
| 103 |
-
{{- '<tool_response>\n' }}
|
| 104 |
-
{{- message.content }}
|
| 105 |
-
{{- '\n</tool_response>\n' }}
|
| 106 |
-
{%- if not loop.last and loop.nextitem.role != "tool" %}
|
| 107 |
-
{{- '<|im_end|>\n' }}
|
| 108 |
-
{%- elif loop.last %}
|
| 109 |
-
{{- '<|im_end|>\n' }}
|
| 110 |
-
{%- endif %}
|
| 111 |
-
{%- else %}
|
| 112 |
-
{{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>\n' }}
|
| 113 |
-
{%- endif %}
|
| 114 |
-
{%- endfor %}
|
| 115 |
-
{%- if add_generation_prompt %}
|
| 116 |
-
{{- '<|im_start|>assistant\n' }}
|
| 117 |
-
{%- endif %}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
qwen3coder_tool_parser.py
CHANGED
|
@@ -1,30 +1,34 @@
|
|
| 1 |
# SPDX-License-Identifier: Apache-2.0
|
| 2 |
-
|
| 3 |
-
import ast
|
| 4 |
import json
|
|
|
|
| 5 |
import uuid
|
| 6 |
from collections.abc import Sequence
|
| 7 |
-
from typing import
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
|
|
|
|
|
|
|
|
|
| 17 |
from vllm.entrypoints.openai.tool_parsers.abstract_tool_parser import (
|
| 18 |
-
ToolParser,
|
|
|
|
|
|
|
| 19 |
from vllm.logger import init_logger
|
| 20 |
from vllm.transformers_utils.tokenizer import AnyTokenizer
|
| 21 |
|
| 22 |
logger = init_logger(__name__)
|
| 23 |
|
| 24 |
|
| 25 |
-
@ToolParserManager.register_module("
|
| 26 |
-
class
|
| 27 |
-
|
| 28 |
def __init__(self, tokenizer: AnyTokenizer):
|
| 29 |
super().__init__(tokenizer)
|
| 30 |
|
|
@@ -48,32 +52,34 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 48 |
|
| 49 |
# Regex patterns
|
| 50 |
self.tool_call_complete_regex = re.compile(
|
| 51 |
-
r"<tool_call>(.*?)</tool_call>", re.DOTALL
|
|
|
|
| 52 |
self.tool_call_regex = re.compile(
|
| 53 |
-
r"<tool_call>(.*?)</tool_call>|<tool_call>(.*?)$", re.DOTALL
|
|
|
|
| 54 |
self.tool_call_function_regex = re.compile(
|
| 55 |
-
r"<function=(.*?)</function>|<function=(.*)$", re.DOTALL
|
|
|
|
| 56 |
self.tool_call_parameter_regex = re.compile(
|
| 57 |
-
r"<parameter=(.*?)
|
| 58 |
-
|
| 59 |
|
| 60 |
if not self.model_tokenizer:
|
| 61 |
raise ValueError(
|
| 62 |
"The model tokenizer must be passed to the ToolParser "
|
| 63 |
-
"constructor during construction."
|
|
|
|
| 64 |
|
| 65 |
-
self.tool_call_start_token_id = self.vocab.get(
|
| 66 |
-
self.tool_call_start_token)
|
| 67 |
self.tool_call_end_token_id = self.vocab.get(self.tool_call_end_token)
|
| 68 |
|
| 69 |
if self.tool_call_start_token_id is None or self.tool_call_end_token_id is None:
|
| 70 |
raise RuntimeError(
|
| 71 |
"Qwen3 XML Tool parser could not locate tool call start/end "
|
| 72 |
-
"tokens in the tokenizer!"
|
|
|
|
| 73 |
|
| 74 |
-
logger.info(
|
| 75 |
-
f"vLLM Successfully import tool parser {self.__class__.__name__} !"
|
| 76 |
-
)
|
| 77 |
|
| 78 |
def _generate_tool_call_id(self) -> str:
|
| 79 |
"""Generate a unique tool call ID."""
|
|
@@ -94,130 +100,130 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 94 |
self.accumulated_text = ""
|
| 95 |
self.json_started = False
|
| 96 |
self.json_closed = False
|
| 97 |
-
|
| 98 |
-
|
| 99 |
-
self
|
| 100 |
-
|
| 101 |
-
|
| 102 |
-
|
| 103 |
-
|
| 104 |
-
|
| 105 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
return {}
|
| 107 |
-
for config in tools:
|
| 108 |
-
if not hasattr(config, "type") or not (hasattr(
|
| 109 |
-
config, "function") and hasattr(config.function, "name")):
|
| 110 |
-
continue
|
| 111 |
-
if config.type == "function" and config.function.name == func_name:
|
| 112 |
-
if not hasattr(config.function, "parameters"):
|
| 113 |
-
return {}
|
| 114 |
-
params = config.function.parameters
|
| 115 |
-
if isinstance(params, dict) and "properties" in params:
|
| 116 |
-
return params["properties"]
|
| 117 |
-
elif isinstance(params, dict):
|
| 118 |
-
return params
|
| 119 |
-
else:
|
| 120 |
-
return {}
|
| 121 |
-
logger.warning(f"Tool '{func_name}' is not defined in the tools list.")
|
| 122 |
-
return {}
|
| 123 |
-
|
| 124 |
-
def _convert_param_value(self, param_value: str, param_name: str,
|
| 125 |
-
param_config: dict, func_name: str) -> Any:
|
| 126 |
-
"""Convert parameter value based on its type in the schema."""
|
| 127 |
-
# Handle null value for any type
|
| 128 |
-
if param_value.lower() == "null":
|
| 129 |
-
return None
|
| 130 |
|
| 131 |
-
|
| 132 |
-
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
| 136 |
-
|
| 137 |
-
return param_value
|
| 138 |
|
| 139 |
-
|
| 140 |
-
|
| 141 |
-
|
| 142 |
-
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
| 146 |
-
|
| 147 |
-
|
| 148 |
-
|
| 149 |
-
|
| 150 |
-
|
| 151 |
-
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
|
| 155 |
-
|
| 156 |
-
|
| 157 |
-
|
| 158 |
-
|
| 159 |
-
|
| 160 |
-
|
| 161 |
-
|
| 162 |
-
|
| 163 |
-
logger.warning(
|
| 164 |
-
f"Parsed value '{param_value}' of parameter '{param_name}' is not a float in tool "
|
| 165 |
-
f"'{func_name}', degenerating to string.")
|
| 166 |
-
return param_value
|
| 167 |
-
elif param_type in ["boolean", "bool", "binary"]:
|
| 168 |
-
param_value = param_value.lower()
|
| 169 |
-
if param_value not in ["true", "false"]:
|
| 170 |
-
logger.warning(
|
| 171 |
-
f"Parsed value '{param_value}' of parameter '{param_name}' is not a boolean (`true` of `false`) in tool '{func_name}', degenerating to false."
|
| 172 |
-
)
|
| 173 |
-
return param_value == "true"
|
| 174 |
-
else:
|
| 175 |
-
if param_type in ["object", "array", "arr"
|
| 176 |
-
] or param_type.startswith(
|
| 177 |
-
"dict") or param_type.startswith("list"):
|
| 178 |
try:
|
| 179 |
-
param_value =
|
| 180 |
-
return param_value
|
| 181 |
except:
|
| 182 |
logger.warning(
|
| 183 |
-
f"Parsed value '{param_value}' of parameter '{param_name}'
|
| 184 |
-
f"'{func_name}',
|
| 185 |
-
|
| 186 |
-
|
| 187 |
-
|
| 188 |
-
|
| 189 |
-
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
|
| 193 |
-
|
| 194 |
-
|
| 195 |
-
|
| 196 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 197 |
|
| 198 |
# Extract function name
|
| 199 |
end_index = function_call_str.index(">")
|
| 200 |
function_name = function_call_str[:end_index]
|
| 201 |
-
param_config =
|
| 202 |
-
parameters = function_call_str[end_index + 1:]
|
| 203 |
param_dict = {}
|
| 204 |
-
for
|
|
|
|
| 205 |
idx = match_text.index(">")
|
| 206 |
param_name = match_text[:idx]
|
| 207 |
-
param_value = str(match_text[idx + 1:])
|
| 208 |
# Remove prefix and trailing \n
|
| 209 |
if param_value.startswith("\n"):
|
| 210 |
param_value = param_value[1:]
|
| 211 |
if param_value.endswith("\n"):
|
| 212 |
param_value = param_value[:-1]
|
| 213 |
|
| 214 |
-
param_dict[param_name] =
|
| 215 |
-
param_value, param_name, param_config, function_name
|
|
|
|
| 216 |
return ToolCall(
|
| 217 |
type="function",
|
| 218 |
-
function=FunctionCall(
|
| 219 |
-
|
| 220 |
-
|
| 221 |
)
|
| 222 |
|
| 223 |
def _get_function_calls(self, model_output: str) -> List[str]:
|
|
@@ -233,8 +239,7 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 233 |
|
| 234 |
raw_function_calls = []
|
| 235 |
for tool_call in raw_tool_calls:
|
| 236 |
-
raw_function_calls.extend(
|
| 237 |
-
self.tool_call_function_regex.findall(tool_call))
|
| 238 |
|
| 239 |
function_calls = [
|
| 240 |
match[0] if match[0] else match[1] for match in raw_function_calls
|
|
@@ -248,16 +253,16 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 248 |
) -> ExtractedToolCallInformation:
|
| 249 |
# Quick check to avoid unnecessary processing
|
| 250 |
if self.tool_call_prefix not in model_output:
|
| 251 |
-
return ExtractedToolCallInformation(
|
| 252 |
-
|
| 253 |
-
|
| 254 |
|
| 255 |
try:
|
| 256 |
function_calls = self._get_function_calls(model_output)
|
| 257 |
if len(function_calls) == 0:
|
| 258 |
-
return ExtractedToolCallInformation(
|
| 259 |
-
|
| 260 |
-
|
| 261 |
|
| 262 |
tool_calls = [
|
| 263 |
self._parse_xml_function_call(function_call_str, request.tools)
|
|
@@ -268,17 +273,20 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 268 |
self.prev_tool_call_arr.clear() # Clear previous calls
|
| 269 |
for tool_call in tool_calls:
|
| 270 |
if tool_call:
|
| 271 |
-
self.prev_tool_call_arr.append(
|
| 272 |
-
|
| 273 |
-
|
| 274 |
-
|
| 275 |
-
|
| 276 |
-
|
| 277 |
|
| 278 |
# Extract content before tool calls
|
| 279 |
content_index = model_output.find(self.tool_call_start_token)
|
| 280 |
-
content_index =
|
| 281 |
-
|
|
|
|
|
|
|
|
|
|
| 282 |
content = model_output[:content_index] # .rstrip()
|
| 283 |
|
| 284 |
return ExtractedToolCallInformation(
|
|
@@ -289,9 +297,9 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 289 |
|
| 290 |
except Exception:
|
| 291 |
logger.exception("Error in extracting tool call from response.")
|
| 292 |
-
return ExtractedToolCallInformation(
|
| 293 |
-
|
| 294 |
-
|
| 295 |
|
| 296 |
def extract_tool_calls_streaming(
|
| 297 |
self,
|
|
@@ -303,11 +311,6 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 303 |
delta_token_ids: Sequence[int],
|
| 304 |
request: ChatCompletionRequest,
|
| 305 |
) -> Union[DeltaMessage, None]:
|
| 306 |
-
# Store request for type conversion
|
| 307 |
-
if not previous_text:
|
| 308 |
-
self._reset_streaming_state()
|
| 309 |
-
self.streaming_request = request
|
| 310 |
-
|
| 311 |
# If no delta text, return None unless it's an EOS token after tool calls
|
| 312 |
if not delta_text:
|
| 313 |
# Check if this is an EOS token after all tool calls are complete
|
|
@@ -316,14 +319,15 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 316 |
if delta_token_ids and self.tool_call_end_token_id not in delta_token_ids:
|
| 317 |
# Count complete tool calls
|
| 318 |
complete_calls = len(
|
| 319 |
-
self.tool_call_complete_regex.findall(current_text)
|
|
|
|
| 320 |
|
| 321 |
# If we have completed tool calls and populated prev_tool_call_arr
|
| 322 |
if complete_calls > 0 and len(self.prev_tool_call_arr) > 0:
|
| 323 |
# Check if all tool calls are closed
|
| 324 |
open_calls = current_text.count(
|
| 325 |
-
self.tool_call_start_token
|
| 326 |
-
|
| 327 |
if open_calls == 0:
|
| 328 |
# Return empty delta message to allow finish_reason processing
|
| 329 |
return DeltaMessage(content="")
|
|
@@ -332,6 +336,10 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 332 |
return DeltaMessage(content="")
|
| 333 |
return None
|
| 334 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 335 |
# Update accumulated text
|
| 336 |
self.accumulated_text = current_text
|
| 337 |
|
|
@@ -346,7 +354,6 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 346 |
self.param_count = 0
|
| 347 |
self.json_started = False
|
| 348 |
self.json_closed = False
|
| 349 |
-
self.accumulated_params = {}
|
| 350 |
|
| 351 |
# Check if there are more tool calls
|
| 352 |
tool_starts = current_text.count(self.tool_call_start_token)
|
|
@@ -359,12 +366,16 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 359 |
# Handle normal content before tool calls
|
| 360 |
if not self.is_tool_call_started:
|
| 361 |
# Check if tool call is starting
|
| 362 |
-
if
|
|
|
|
|
|
|
|
|
|
| 363 |
self.is_tool_call_started = True
|
| 364 |
# Return any content before the tool call
|
| 365 |
if self.tool_call_start_token in delta_text:
|
| 366 |
-
content_before = delta_text[
|
| 367 |
-
self.tool_call_start_token)
|
|
|
|
| 368 |
if content_before:
|
| 369 |
return DeltaMessage(content=content_before)
|
| 370 |
return None
|
|
@@ -401,19 +412,20 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 401 |
|
| 402 |
tool_start_idx = tool_starts[self.current_tool_index]
|
| 403 |
# Find where this tool call ends (or current position if not ended yet)
|
| 404 |
-
tool_end_idx = current_text.find(self.tool_call_end_token,
|
| 405 |
-
tool_start_idx)
|
| 406 |
if tool_end_idx == -1:
|
| 407 |
tool_text = current_text[tool_start_idx:]
|
| 408 |
else:
|
| 409 |
-
tool_text = current_text[
|
| 410 |
-
|
|
|
|
| 411 |
|
| 412 |
# Looking for function header
|
| 413 |
if not self.header_sent:
|
| 414 |
if self.tool_call_prefix in tool_text:
|
| 415 |
func_start = tool_text.find(self.tool_call_prefix) + len(
|
| 416 |
-
self.tool_call_prefix
|
|
|
|
| 417 |
func_end = tool_text.find(">", func_start)
|
| 418 |
|
| 419 |
if func_end != -1:
|
|
@@ -427,37 +439,44 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 427 |
# This ensures finish_reason="tool_calls" even if parsing isn't complete
|
| 428 |
already_added = any(
|
| 429 |
tool.get("name") == self.current_function_name
|
| 430 |
-
for tool in self.prev_tool_call_arr
|
|
|
|
| 431 |
if not already_added:
|
| 432 |
-
self.prev_tool_call_arr.append(
|
| 433 |
-
|
| 434 |
-
|
| 435 |
-
|
| 436 |
-
|
|
|
|
| 437 |
|
| 438 |
# Send header with function info
|
| 439 |
-
return DeltaMessage(
|
| 440 |
-
|
| 441 |
-
|
| 442 |
-
|
| 443 |
-
|
| 444 |
-
|
| 445 |
-
|
| 446 |
-
|
| 447 |
-
|
|
|
|
|
|
|
|
|
|
| 448 |
return None
|
| 449 |
|
| 450 |
# We've sent header, now handle function body
|
| 451 |
if self.in_function:
|
| 452 |
# Send opening brace if not sent yet
|
| 453 |
-
if not self.json_started and self.parameter_prefix
|
| 454 |
self.json_started = True
|
| 455 |
-
return DeltaMessage(
|
| 456 |
-
|
| 457 |
-
|
| 458 |
-
|
| 459 |
-
|
| 460 |
-
|
|
|
|
|
|
|
| 461 |
|
| 462 |
# Make sure json_started is set if we're processing parameters
|
| 463 |
if not self.json_started:
|
|
@@ -471,54 +490,58 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 471 |
# Extract the complete tool call to update prev_tool_call_arr with final arguments
|
| 472 |
# Find the function content
|
| 473 |
func_start = tool_text.find(self.tool_call_prefix) + len(
|
| 474 |
-
self.tool_call_prefix
|
| 475 |
-
|
| 476 |
-
|
| 477 |
if func_content_end != -1:
|
| 478 |
func_content = tool_text[func_start:func_content_end]
|
| 479 |
# Parse to get the complete arguments
|
| 480 |
try:
|
| 481 |
parsed_tool = self._parse_xml_function_call(
|
| 482 |
-
func_content,
|
| 483 |
-
|
| 484 |
if parsed_tool:
|
| 485 |
# Update existing entry in prev_tool_call_arr with complete arguments
|
| 486 |
for i, tool in enumerate(self.prev_tool_call_arr):
|
| 487 |
-
if tool.get(
|
| 488 |
-
|
| 489 |
-
|
| 490 |
-
|
| 491 |
break
|
| 492 |
except Exception:
|
| 493 |
pass # Ignore parsing errors during streaming
|
| 494 |
|
| 495 |
-
result = DeltaMessage(
|
| 496 |
-
|
| 497 |
-
|
| 498 |
-
|
| 499 |
-
|
| 500 |
-
|
|
|
|
|
|
|
| 501 |
|
| 502 |
# Reset state for next tool
|
| 503 |
self.in_function = False
|
| 504 |
self.json_closed = True
|
| 505 |
-
self.accumulated_params = {}
|
| 506 |
|
| 507 |
return result
|
| 508 |
|
| 509 |
# Look for parameters
|
| 510 |
-
#
|
| 511 |
-
|
| 512 |
-
idx = 0
|
| 513 |
-
while True:
|
| 514 |
-
idx = tool_text.find(self.parameter_prefix, idx)
|
| 515 |
-
if idx == -1:
|
| 516 |
-
break
|
| 517 |
-
param_starts.append(idx)
|
| 518 |
-
idx += len(self.parameter_prefix)
|
| 519 |
|
| 520 |
# Check if we should start a new parameter
|
| 521 |
-
if not self.in_param and self.param_count <
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 522 |
|
| 523 |
if len(param_starts) > self.param_count:
|
| 524 |
# Process the next parameter
|
|
@@ -538,74 +561,45 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 538 |
value_text = value_text[1:]
|
| 539 |
|
| 540 |
# Find where this parameter ends
|
| 541 |
-
param_end_idx = value_text.find(
|
| 542 |
-
self.parameter_end_token)
|
| 543 |
-
if param_end_idx == -1:
|
| 544 |
-
# No closing tag, look for next parameter or function end
|
| 545 |
-
next_param_idx = value_text.find(
|
| 546 |
-
self.parameter_prefix)
|
| 547 |
-
func_end_idx = value_text.find(
|
| 548 |
-
self.function_end_token)
|
| 549 |
-
|
| 550 |
-
if next_param_idx != -1 and (func_end_idx == -1
|
| 551 |
-
or next_param_idx
|
| 552 |
-
< func_end_idx):
|
| 553 |
-
param_end_idx = next_param_idx
|
| 554 |
-
elif func_end_idx != -1:
|
| 555 |
-
param_end_idx = func_end_idx
|
| 556 |
-
else:
|
| 557 |
-
# Neither found, check if tool call is complete
|
| 558 |
-
if self.tool_call_end_token in tool_text:
|
| 559 |
-
# Tool call is complete, so parameter must be complete too
|
| 560 |
-
# Use all remaining text before function end as value
|
| 561 |
-
param_end_idx = len(value_text)
|
| 562 |
-
else:
|
| 563 |
-
# Still streaming, wait for more content
|
| 564 |
-
return None
|
| 565 |
-
|
| 566 |
if param_end_idx != -1:
|
| 567 |
# Complete parameter found
|
| 568 |
param_value = value_text[:param_end_idx]
|
| 569 |
if param_value.endswith("\n"):
|
| 570 |
param_value = param_value[:-1]
|
| 571 |
|
| 572 |
-
#
|
| 573 |
-
self.accumulated_params[
|
| 574 |
-
self.current_param_name] = param_value
|
| 575 |
-
|
| 576 |
-
# Get parameter configuration for type conversion
|
| 577 |
-
param_config = self._get_arguments_config(
|
| 578 |
-
self.current_function_name,
|
| 579 |
-
self.streaming_request.tools
|
| 580 |
-
if self.streaming_request else None)
|
| 581 |
-
|
| 582 |
-
# Convert the parameter value to the appropriate type
|
| 583 |
-
converted_value = self._convert_param_value(
|
| 584 |
-
param_value, self.current_param_name,
|
| 585 |
-
param_config, self.current_function_name)
|
| 586 |
-
|
| 587 |
-
# Build JSON fragment based on the converted type
|
| 588 |
-
# Use json.dumps to properly serialize the value
|
| 589 |
-
serialized_value = json.dumps(converted_value,
|
| 590 |
-
ensure_ascii=False)
|
| 591 |
-
|
| 592 |
if self.param_count == 0:
|
| 593 |
-
json_fragment =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 594 |
else:
|
| 595 |
-
json_fragment =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 596 |
|
| 597 |
self.param_count += 1
|
| 598 |
|
| 599 |
-
return DeltaMessage(
|
| 600 |
-
|
| 601 |
-
|
| 602 |
-
|
| 603 |
-
|
| 604 |
-
|
| 605 |
-
|
| 606 |
-
|
| 607 |
-
|
| 608 |
-
|
|
|
|
|
|
|
| 609 |
if self.in_param:
|
| 610 |
if self.parameter_end_token in delta_text:
|
| 611 |
# End of parameter
|
|
@@ -615,45 +609,34 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 615 |
# Skip past > if at start
|
| 616 |
if not self.current_param_value and ">" in value_chunk:
|
| 617 |
gt_idx = value_chunk.find(">")
|
| 618 |
-
value_chunk = value_chunk[gt_idx + 1:]
|
| 619 |
|
| 620 |
-
if not self.current_param_value and value_chunk.startswith(
|
| 621 |
-
"\n"):
|
| 622 |
value_chunk = value_chunk[1:]
|
| 623 |
|
| 624 |
-
#
|
| 625 |
full_value = self.current_param_value + value_chunk
|
| 626 |
-
|
| 627 |
-
self.
|
| 628 |
-
|
| 629 |
-
|
| 630 |
-
|
| 631 |
-
|
| 632 |
-
|
| 633 |
-
|
| 634 |
-
|
| 635 |
-
# Convert the parameter value to the appropriate type
|
| 636 |
-
converted_value = self._convert_param_value(
|
| 637 |
-
full_value, self.current_param_name, param_config,
|
| 638 |
-
self.current_function_name)
|
| 639 |
-
|
| 640 |
-
# Serialize the converted value
|
| 641 |
-
serialized_value = json.dumps(converted_value,
|
| 642 |
-
ensure_ascii=False)
|
| 643 |
-
|
| 644 |
-
# Since we've been streaming the quoted version, we need to close it properly
|
| 645 |
-
# This is complex - for now just complete the value
|
| 646 |
self.in_param = False
|
| 647 |
self.current_param_value = ""
|
| 648 |
|
| 649 |
-
|
| 650 |
-
|
| 651 |
-
|
| 652 |
-
|
| 653 |
-
|
| 654 |
-
|
| 655 |
-
|
| 656 |
-
|
|
|
|
|
|
|
| 657 |
else:
|
| 658 |
# Continue accumulating value
|
| 659 |
value_chunk = delta_text
|
|
@@ -661,29 +644,32 @@ class Qwen3CoderToolParser(ToolParser):
|
|
| 661 |
# Handle first chunk after param name
|
| 662 |
if not self.current_param_value and ">" in value_chunk:
|
| 663 |
gt_idx = value_chunk.find(">")
|
| 664 |
-
value_chunk = value_chunk[gt_idx + 1:]
|
| 665 |
|
| 666 |
-
if not self.current_param_value and value_chunk.startswith(
|
| 667 |
-
"\n"):
|
| 668 |
value_chunk = value_chunk[1:]
|
| 669 |
|
| 670 |
if value_chunk:
|
| 671 |
# Stream the escaped delta
|
| 672 |
-
prev_escaped =
|
| 673 |
-
self.current_param_value
|
| 674 |
-
|
|
|
|
|
|
|
| 675 |
self.current_param_value += value_chunk
|
| 676 |
-
full_escaped = json.dumps(self.current_param_value
|
| 677 |
-
|
| 678 |
-
delta_escaped = full_escaped[len(prev_escaped):]
|
| 679 |
|
| 680 |
if delta_escaped:
|
| 681 |
-
return DeltaMessage(
|
| 682 |
-
|
| 683 |
-
|
| 684 |
-
|
| 685 |
-
|
| 686 |
-
|
| 687 |
-
|
|
|
|
|
|
|
|
|
|
| 688 |
|
| 689 |
return None
|
|
|
|
| 1 |
# SPDX-License-Identifier: Apache-2.0
|
| 2 |
+
|
|
|
|
| 3 |
import json
|
| 4 |
+
import re
|
| 5 |
import uuid
|
| 6 |
from collections.abc import Sequence
|
| 7 |
+
from typing import Union, Optional, Any, List, Dict
|
| 8 |
+
from enum import Enum
|
| 9 |
+
|
| 10 |
+
from vllm.entrypoints.openai.protocol import (
|
| 11 |
+
ChatCompletionRequest,
|
| 12 |
+
ChatCompletionToolsParam,
|
| 13 |
+
DeltaMessage,
|
| 14 |
+
DeltaToolCall,
|
| 15 |
+
DeltaFunctionCall,
|
| 16 |
+
ExtractedToolCallInformation,
|
| 17 |
+
FunctionCall,
|
| 18 |
+
ToolCall,
|
| 19 |
+
)
|
| 20 |
from vllm.entrypoints.openai.tool_parsers.abstract_tool_parser import (
|
| 21 |
+
ToolParser,
|
| 22 |
+
ToolParserManager,
|
| 23 |
+
)
|
| 24 |
from vllm.logger import init_logger
|
| 25 |
from vllm.transformers_utils.tokenizer import AnyTokenizer
|
| 26 |
|
| 27 |
logger = init_logger(__name__)
|
| 28 |
|
| 29 |
|
| 30 |
+
@ToolParserManager.register_module("qwen3_xml")
|
| 31 |
+
class Qwen3XMLToolParser(ToolParser):
|
|
|
|
| 32 |
def __init__(self, tokenizer: AnyTokenizer):
|
| 33 |
super().__init__(tokenizer)
|
| 34 |
|
|
|
|
| 52 |
|
| 53 |
# Regex patterns
|
| 54 |
self.tool_call_complete_regex = re.compile(
|
| 55 |
+
r"<tool_call>(.*?)</tool_call>", re.DOTALL
|
| 56 |
+
)
|
| 57 |
self.tool_call_regex = re.compile(
|
| 58 |
+
r"<tool_call>(.*?)</tool_call>|<tool_call>(.*?)$", re.DOTALL
|
| 59 |
+
)
|
| 60 |
self.tool_call_function_regex = re.compile(
|
| 61 |
+
r"<function=(.*?)</function>|<function=(.*)$", re.DOTALL
|
| 62 |
+
)
|
| 63 |
self.tool_call_parameter_regex = re.compile(
|
| 64 |
+
r"<parameter=(.*?)</parameter>|<parameter=(.*?)$", re.DOTALL
|
| 65 |
+
)
|
| 66 |
|
| 67 |
if not self.model_tokenizer:
|
| 68 |
raise ValueError(
|
| 69 |
"The model tokenizer must be passed to the ToolParser "
|
| 70 |
+
"constructor during construction."
|
| 71 |
+
)
|
| 72 |
|
| 73 |
+
self.tool_call_start_token_id = self.vocab.get(self.tool_call_start_token)
|
|
|
|
| 74 |
self.tool_call_end_token_id = self.vocab.get(self.tool_call_end_token)
|
| 75 |
|
| 76 |
if self.tool_call_start_token_id is None or self.tool_call_end_token_id is None:
|
| 77 |
raise RuntimeError(
|
| 78 |
"Qwen3 XML Tool parser could not locate tool call start/end "
|
| 79 |
+
"tokens in the tokenizer!"
|
| 80 |
+
)
|
| 81 |
|
| 82 |
+
logger.info(f"vLLM Successfully import tool parser {self.__class__.__name__} !")
|
|
|
|
|
|
|
| 83 |
|
| 84 |
def _generate_tool_call_id(self) -> str:
|
| 85 |
"""Generate a unique tool call ID."""
|
|
|
|
| 100 |
self.accumulated_text = ""
|
| 101 |
self.json_started = False
|
| 102 |
self.json_closed = False
|
| 103 |
+
|
| 104 |
+
def _parse_xml_function_call(
|
| 105 |
+
self, function_call_str: str, tools: Optional[list[ChatCompletionToolsParam]]
|
| 106 |
+
) -> Optional[ToolCall]:
|
| 107 |
+
def get_arguments_config(func_name: str) -> dict:
|
| 108 |
+
if tools is None:
|
| 109 |
+
return {}
|
| 110 |
+
for config in tools:
|
| 111 |
+
if not hasattr(config, "type") or not (
|
| 112 |
+
hasattr(config, "function") and hasattr(config.function, "name")
|
| 113 |
+
):
|
| 114 |
+
continue
|
| 115 |
+
if config.type == "function" and config.function.name == func_name:
|
| 116 |
+
if not hasattr(config.function, "parameters"):
|
| 117 |
+
return {}
|
| 118 |
+
params = config.function.parameters
|
| 119 |
+
if isinstance(params, dict) and "properties" in params:
|
| 120 |
+
return params["properties"]
|
| 121 |
+
elif isinstance(params, dict):
|
| 122 |
+
return params
|
| 123 |
+
else:
|
| 124 |
+
return {}
|
| 125 |
+
logger.warning(f"Tool '{func_name}' is not defined in the tools list.")
|
| 126 |
return {}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 127 |
|
| 128 |
+
def convert_param_value(
|
| 129 |
+
param_value: str, param_name: str, param_config: dict, func_name: str
|
| 130 |
+
) -> Any:
|
| 131 |
+
# Handle null value for any type
|
| 132 |
+
if param_value.lower() == "null":
|
| 133 |
+
return None
|
|
|
|
| 134 |
|
| 135 |
+
if param_name not in param_config:
|
| 136 |
+
if param_config != {}:
|
| 137 |
+
logger.warning(
|
| 138 |
+
f"Parsed parameter '{param_name}' is not defined in the tool "
|
| 139 |
+
f"parameters for tool '{func_name}', directly returning the string value."
|
| 140 |
+
)
|
| 141 |
+
return param_value
|
| 142 |
+
|
| 143 |
+
if (
|
| 144 |
+
isinstance(param_config[param_name], dict)
|
| 145 |
+
and "type" in param_config[param_name]
|
| 146 |
+
):
|
| 147 |
+
param_type = str(param_config[param_name]["type"]).strip().lower()
|
| 148 |
+
else:
|
| 149 |
+
param_type = "string"
|
| 150 |
+
if param_type in ["string", "str", "text", "varchar", "char", "enum"]:
|
| 151 |
+
return param_value
|
| 152 |
+
elif (
|
| 153 |
+
param_type.startswith("int")
|
| 154 |
+
or param_type.startswith("uint")
|
| 155 |
+
or param_type.startswith("long")
|
| 156 |
+
or param_type.startswith("short")
|
| 157 |
+
or param_type.startswith("unsigned")
|
| 158 |
+
):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 159 |
try:
|
| 160 |
+
param_value = int(param_value)
|
|
|
|
| 161 |
except:
|
| 162 |
logger.warning(
|
| 163 |
+
f"Parsed value '{param_value}' of parameter '{param_name}' is not an integer in tool "
|
| 164 |
+
f"'{func_name}', degenerating to string."
|
| 165 |
+
)
|
| 166 |
+
return param_value
|
| 167 |
+
elif param_type.startswith("num") or param_type.startswith("float"):
|
| 168 |
+
try:
|
| 169 |
+
float_param_value = float(param_value)
|
| 170 |
+
param_value = float_param_value if float_param_value - int(float_param_value) != 0 else int(float_param_value)
|
| 171 |
+
except:
|
| 172 |
+
logger.warning(
|
| 173 |
+
f"Parsed value '{param_value}' of parameter '{param_name}' is not a float in tool "
|
| 174 |
+
f"'{func_name}', degenerating to string."
|
| 175 |
+
)
|
| 176 |
+
return param_value
|
| 177 |
+
elif param_type in ["boolean", "bool", "binary"]:
|
| 178 |
+
param_value = param_value.lower()
|
| 179 |
+
if param_value not in ["true", "false"]:
|
| 180 |
+
logger.warning(
|
| 181 |
+
f"Parsed value '{param_value}' of parameter '{param_name}' is not a boolean (`true` of `false`) in tool '{func_name}', degenerating to false."
|
| 182 |
+
)
|
| 183 |
+
return param_value == "true"
|
| 184 |
+
else:
|
| 185 |
+
if param_type == "object" or param_type.startswith("dict"):
|
| 186 |
+
try:
|
| 187 |
+
param_value = json.loads(param_value)
|
| 188 |
+
return param_value
|
| 189 |
+
except:
|
| 190 |
+
logger.warning(
|
| 191 |
+
f"Parsed value '{param_value}' of parameter '{param_name}' is not a valid JSON object in tool "
|
| 192 |
+
f"'{func_name}', will try other methods to parse it."
|
| 193 |
+
)
|
| 194 |
+
try:
|
| 195 |
+
param_value = eval(param_value)
|
| 196 |
+
except:
|
| 197 |
+
logger.warning(
|
| 198 |
+
f"Parsed value '{param_value}' of parameter '{param_name}' cannot be converted via Python `eval()` in tool '{func_name}', degenerating to string."
|
| 199 |
+
)
|
| 200 |
+
return param_value
|
| 201 |
|
| 202 |
# Extract function name
|
| 203 |
end_index = function_call_str.index(">")
|
| 204 |
function_name = function_call_str[:end_index]
|
| 205 |
+
param_config = get_arguments_config(function_name)
|
| 206 |
+
parameters = function_call_str[end_index + 1 :]
|
| 207 |
param_dict = {}
|
| 208 |
+
for match in self.tool_call_parameter_regex.findall(parameters):
|
| 209 |
+
match_text = match[0] if match[0] else match[1]
|
| 210 |
idx = match_text.index(">")
|
| 211 |
param_name = match_text[:idx]
|
| 212 |
+
param_value = str(match_text[idx + 1 :])
|
| 213 |
# Remove prefix and trailing \n
|
| 214 |
if param_value.startswith("\n"):
|
| 215 |
param_value = param_value[1:]
|
| 216 |
if param_value.endswith("\n"):
|
| 217 |
param_value = param_value[:-1]
|
| 218 |
|
| 219 |
+
param_dict[param_name] = convert_param_value(
|
| 220 |
+
param_value, param_name, param_config, function_name
|
| 221 |
+
)
|
| 222 |
return ToolCall(
|
| 223 |
type="function",
|
| 224 |
+
function=FunctionCall(
|
| 225 |
+
name=function_name, arguments=json.dumps(param_dict, ensure_ascii=False)
|
| 226 |
+
),
|
| 227 |
)
|
| 228 |
|
| 229 |
def _get_function_calls(self, model_output: str) -> List[str]:
|
|
|
|
| 239 |
|
| 240 |
raw_function_calls = []
|
| 241 |
for tool_call in raw_tool_calls:
|
| 242 |
+
raw_function_calls.extend(self.tool_call_function_regex.findall(tool_call))
|
|
|
|
| 243 |
|
| 244 |
function_calls = [
|
| 245 |
match[0] if match[0] else match[1] for match in raw_function_calls
|
|
|
|
| 253 |
) -> ExtractedToolCallInformation:
|
| 254 |
# Quick check to avoid unnecessary processing
|
| 255 |
if self.tool_call_prefix not in model_output:
|
| 256 |
+
return ExtractedToolCallInformation(
|
| 257 |
+
tools_called=False, tool_calls=[], content=model_output
|
| 258 |
+
)
|
| 259 |
|
| 260 |
try:
|
| 261 |
function_calls = self._get_function_calls(model_output)
|
| 262 |
if len(function_calls) == 0:
|
| 263 |
+
return ExtractedToolCallInformation(
|
| 264 |
+
tools_called=False, tool_calls=[], content=model_output
|
| 265 |
+
)
|
| 266 |
|
| 267 |
tool_calls = [
|
| 268 |
self._parse_xml_function_call(function_call_str, request.tools)
|
|
|
|
| 273 |
self.prev_tool_call_arr.clear() # Clear previous calls
|
| 274 |
for tool_call in tool_calls:
|
| 275 |
if tool_call:
|
| 276 |
+
self.prev_tool_call_arr.append(
|
| 277 |
+
{
|
| 278 |
+
"name": tool_call.function.name,
|
| 279 |
+
"arguments": tool_call.function.arguments,
|
| 280 |
+
}
|
| 281 |
+
)
|
| 282 |
|
| 283 |
# Extract content before tool calls
|
| 284 |
content_index = model_output.find(self.tool_call_start_token)
|
| 285 |
+
content_index = (
|
| 286 |
+
content_index
|
| 287 |
+
if content_index >= 0
|
| 288 |
+
else model_output.find(self.tool_call_prefix)
|
| 289 |
+
)
|
| 290 |
content = model_output[:content_index] # .rstrip()
|
| 291 |
|
| 292 |
return ExtractedToolCallInformation(
|
|
|
|
| 297 |
|
| 298 |
except Exception:
|
| 299 |
logger.exception("Error in extracting tool call from response.")
|
| 300 |
+
return ExtractedToolCallInformation(
|
| 301 |
+
tools_called=False, tool_calls=[], content=model_output
|
| 302 |
+
)
|
| 303 |
|
| 304 |
def extract_tool_calls_streaming(
|
| 305 |
self,
|
|
|
|
| 311 |
delta_token_ids: Sequence[int],
|
| 312 |
request: ChatCompletionRequest,
|
| 313 |
) -> Union[DeltaMessage, None]:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 314 |
# If no delta text, return None unless it's an EOS token after tool calls
|
| 315 |
if not delta_text:
|
| 316 |
# Check if this is an EOS token after all tool calls are complete
|
|
|
|
| 319 |
if delta_token_ids and self.tool_call_end_token_id not in delta_token_ids:
|
| 320 |
# Count complete tool calls
|
| 321 |
complete_calls = len(
|
| 322 |
+
self.tool_call_complete_regex.findall(current_text)
|
| 323 |
+
)
|
| 324 |
|
| 325 |
# If we have completed tool calls and populated prev_tool_call_arr
|
| 326 |
if complete_calls > 0 and len(self.prev_tool_call_arr) > 0:
|
| 327 |
# Check if all tool calls are closed
|
| 328 |
open_calls = current_text.count(
|
| 329 |
+
self.tool_call_start_token
|
| 330 |
+
) - current_text.count(self.tool_call_end_token)
|
| 331 |
if open_calls == 0:
|
| 332 |
# Return empty delta message to allow finish_reason processing
|
| 333 |
return DeltaMessage(content="")
|
|
|
|
| 336 |
return DeltaMessage(content="")
|
| 337 |
return None
|
| 338 |
|
| 339 |
+
# Check if this is the first call (reset state if needed)
|
| 340 |
+
if not previous_text:
|
| 341 |
+
self._reset_streaming_state()
|
| 342 |
+
|
| 343 |
# Update accumulated text
|
| 344 |
self.accumulated_text = current_text
|
| 345 |
|
|
|
|
| 354 |
self.param_count = 0
|
| 355 |
self.json_started = False
|
| 356 |
self.json_closed = False
|
|
|
|
| 357 |
|
| 358 |
# Check if there are more tool calls
|
| 359 |
tool_starts = current_text.count(self.tool_call_start_token)
|
|
|
|
| 366 |
# Handle normal content before tool calls
|
| 367 |
if not self.is_tool_call_started:
|
| 368 |
# Check if tool call is starting
|
| 369 |
+
if (
|
| 370 |
+
self.tool_call_start_token_id in delta_token_ids
|
| 371 |
+
or self.tool_call_start_token in delta_text
|
| 372 |
+
):
|
| 373 |
self.is_tool_call_started = True
|
| 374 |
# Return any content before the tool call
|
| 375 |
if self.tool_call_start_token in delta_text:
|
| 376 |
+
content_before = delta_text[
|
| 377 |
+
: delta_text.index(self.tool_call_start_token)
|
| 378 |
+
]
|
| 379 |
if content_before:
|
| 380 |
return DeltaMessage(content=content_before)
|
| 381 |
return None
|
|
|
|
| 412 |
|
| 413 |
tool_start_idx = tool_starts[self.current_tool_index]
|
| 414 |
# Find where this tool call ends (or current position if not ended yet)
|
| 415 |
+
tool_end_idx = current_text.find(self.tool_call_end_token, tool_start_idx)
|
|
|
|
| 416 |
if tool_end_idx == -1:
|
| 417 |
tool_text = current_text[tool_start_idx:]
|
| 418 |
else:
|
| 419 |
+
tool_text = current_text[
|
| 420 |
+
tool_start_idx : tool_end_idx + len(self.tool_call_end_token)
|
| 421 |
+
]
|
| 422 |
|
| 423 |
# Looking for function header
|
| 424 |
if not self.header_sent:
|
| 425 |
if self.tool_call_prefix in tool_text:
|
| 426 |
func_start = tool_text.find(self.tool_call_prefix) + len(
|
| 427 |
+
self.tool_call_prefix
|
| 428 |
+
)
|
| 429 |
func_end = tool_text.find(">", func_start)
|
| 430 |
|
| 431 |
if func_end != -1:
|
|
|
|
| 439 |
# This ensures finish_reason="tool_calls" even if parsing isn't complete
|
| 440 |
already_added = any(
|
| 441 |
tool.get("name") == self.current_function_name
|
| 442 |
+
for tool in self.prev_tool_call_arr
|
| 443 |
+
)
|
| 444 |
if not already_added:
|
| 445 |
+
self.prev_tool_call_arr.append(
|
| 446 |
+
{
|
| 447 |
+
"name": self.current_function_name,
|
| 448 |
+
"arguments": "{}", # Placeholder, will be updated later
|
| 449 |
+
}
|
| 450 |
+
)
|
| 451 |
|
| 452 |
# Send header with function info
|
| 453 |
+
return DeltaMessage(
|
| 454 |
+
tool_calls=[
|
| 455 |
+
DeltaToolCall(
|
| 456 |
+
index=self.current_tool_index,
|
| 457 |
+
id=self.current_tool_id,
|
| 458 |
+
function=DeltaFunctionCall(
|
| 459 |
+
name=self.current_function_name, arguments=""
|
| 460 |
+
),
|
| 461 |
+
type="function",
|
| 462 |
+
)
|
| 463 |
+
]
|
| 464 |
+
)
|
| 465 |
return None
|
| 466 |
|
| 467 |
# We've sent header, now handle function body
|
| 468 |
if self.in_function:
|
| 469 |
# Send opening brace if not sent yet
|
| 470 |
+
if not self.json_started and not self.parameter_prefix in delta_text:
|
| 471 |
self.json_started = True
|
| 472 |
+
return DeltaMessage(
|
| 473 |
+
tool_calls=[
|
| 474 |
+
DeltaToolCall(
|
| 475 |
+
index=self.current_tool_index,
|
| 476 |
+
function=DeltaFunctionCall(arguments="{"),
|
| 477 |
+
)
|
| 478 |
+
]
|
| 479 |
+
)
|
| 480 |
|
| 481 |
# Make sure json_started is set if we're processing parameters
|
| 482 |
if not self.json_started:
|
|
|
|
| 490 |
# Extract the complete tool call to update prev_tool_call_arr with final arguments
|
| 491 |
# Find the function content
|
| 492 |
func_start = tool_text.find(self.tool_call_prefix) + len(
|
| 493 |
+
self.tool_call_prefix
|
| 494 |
+
)
|
| 495 |
+
func_content_end = tool_text.find(self.function_end_token, func_start)
|
| 496 |
if func_content_end != -1:
|
| 497 |
func_content = tool_text[func_start:func_content_end]
|
| 498 |
# Parse to get the complete arguments
|
| 499 |
try:
|
| 500 |
parsed_tool = self._parse_xml_function_call(
|
| 501 |
+
func_content, request.tools if request else None
|
| 502 |
+
)
|
| 503 |
if parsed_tool:
|
| 504 |
# Update existing entry in prev_tool_call_arr with complete arguments
|
| 505 |
for i, tool in enumerate(self.prev_tool_call_arr):
|
| 506 |
+
if tool.get("name") == parsed_tool.function.name:
|
| 507 |
+
self.prev_tool_call_arr[i]["arguments"] = (
|
| 508 |
+
parsed_tool.function.arguments
|
| 509 |
+
)
|
| 510 |
break
|
| 511 |
except Exception:
|
| 512 |
pass # Ignore parsing errors during streaming
|
| 513 |
|
| 514 |
+
result = DeltaMessage(
|
| 515 |
+
tool_calls=[
|
| 516 |
+
DeltaToolCall(
|
| 517 |
+
index=self.current_tool_index,
|
| 518 |
+
function=DeltaFunctionCall(arguments="}"),
|
| 519 |
+
)
|
| 520 |
+
]
|
| 521 |
+
)
|
| 522 |
|
| 523 |
# Reset state for next tool
|
| 524 |
self.in_function = False
|
| 525 |
self.json_closed = True
|
|
|
|
| 526 |
|
| 527 |
return result
|
| 528 |
|
| 529 |
# Look for parameters
|
| 530 |
+
# Count how many complete parameters we have processed
|
| 531 |
+
complete_params = tool_text.count(self.parameter_end_token)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 532 |
|
| 533 |
# Check if we should start a new parameter
|
| 534 |
+
if not self.in_param and self.param_count < complete_params:
|
| 535 |
+
# Find the unprocessed parameter
|
| 536 |
+
# Count parameter starts
|
| 537 |
+
param_starts = []
|
| 538 |
+
idx = 0
|
| 539 |
+
while True:
|
| 540 |
+
idx = tool_text.find(self.parameter_prefix, idx)
|
| 541 |
+
if idx == -1:
|
| 542 |
+
break
|
| 543 |
+
param_starts.append(idx)
|
| 544 |
+
idx += len(self.parameter_prefix)
|
| 545 |
|
| 546 |
if len(param_starts) > self.param_count:
|
| 547 |
# Process the next parameter
|
|
|
|
| 561 |
value_text = value_text[1:]
|
| 562 |
|
| 563 |
# Find where this parameter ends
|
| 564 |
+
param_end_idx = value_text.find(self.parameter_end_token)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 565 |
if param_end_idx != -1:
|
| 566 |
# Complete parameter found
|
| 567 |
param_value = value_text[:param_end_idx]
|
| 568 |
if param_value.endswith("\n"):
|
| 569 |
param_value = param_value[:-1]
|
| 570 |
|
| 571 |
+
# Build complete JSON fragment for this parameter
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 572 |
if self.param_count == 0:
|
| 573 |
+
json_fragment = (
|
| 574 |
+
'"'
|
| 575 |
+
+ self.current_param_name
|
| 576 |
+
+ '": "'
|
| 577 |
+
+ json.dumps(param_value)[1:-1]
|
| 578 |
+
+ '"'
|
| 579 |
+
)
|
| 580 |
else:
|
| 581 |
+
json_fragment = (
|
| 582 |
+
', "'
|
| 583 |
+
+ self.current_param_name
|
| 584 |
+
+ '": "'
|
| 585 |
+
+ json.dumps(param_value)[1:-1]
|
| 586 |
+
+ '"'
|
| 587 |
+
)
|
| 588 |
|
| 589 |
self.param_count += 1
|
| 590 |
|
| 591 |
+
return DeltaMessage(
|
| 592 |
+
tool_calls=[
|
| 593 |
+
DeltaToolCall(
|
| 594 |
+
index=self.current_tool_index,
|
| 595 |
+
function=DeltaFunctionCall(
|
| 596 |
+
arguments=json_fragment
|
| 597 |
+
),
|
| 598 |
+
)
|
| 599 |
+
]
|
| 600 |
+
)
|
| 601 |
+
|
| 602 |
+
# Continue parameter value
|
| 603 |
if self.in_param:
|
| 604 |
if self.parameter_end_token in delta_text:
|
| 605 |
# End of parameter
|
|
|
|
| 609 |
# Skip past > if at start
|
| 610 |
if not self.current_param_value and ">" in value_chunk:
|
| 611 |
gt_idx = value_chunk.find(">")
|
| 612 |
+
value_chunk = value_chunk[gt_idx + 1 :]
|
| 613 |
|
| 614 |
+
if not self.current_param_value and value_chunk.startswith("\n"):
|
|
|
|
| 615 |
value_chunk = value_chunk[1:]
|
| 616 |
|
| 617 |
+
# Calculate incremental JSON
|
| 618 |
full_value = self.current_param_value + value_chunk
|
| 619 |
+
prev_escaped = (
|
| 620 |
+
json.dumps(self.current_param_value)[1:-1]
|
| 621 |
+
if self.current_param_value
|
| 622 |
+
else ""
|
| 623 |
+
)
|
| 624 |
+
full_escaped = json.dumps(full_value)[1:-1]
|
| 625 |
+
delta_escaped = full_escaped[len(prev_escaped) :]
|
| 626 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 627 |
self.in_param = False
|
| 628 |
self.current_param_value = ""
|
| 629 |
|
| 630 |
+
return DeltaMessage(
|
| 631 |
+
tool_calls=[
|
| 632 |
+
DeltaToolCall(
|
| 633 |
+
index=self.current_tool_index,
|
| 634 |
+
function=DeltaFunctionCall(
|
| 635 |
+
arguments=delta_escaped + '"'
|
| 636 |
+
),
|
| 637 |
+
)
|
| 638 |
+
]
|
| 639 |
+
)
|
| 640 |
else:
|
| 641 |
# Continue accumulating value
|
| 642 |
value_chunk = delta_text
|
|
|
|
| 644 |
# Handle first chunk after param name
|
| 645 |
if not self.current_param_value and ">" in value_chunk:
|
| 646 |
gt_idx = value_chunk.find(">")
|
| 647 |
+
value_chunk = value_chunk[gt_idx + 1 :]
|
| 648 |
|
| 649 |
+
if not self.current_param_value and value_chunk.startswith("\n"):
|
|
|
|
| 650 |
value_chunk = value_chunk[1:]
|
| 651 |
|
| 652 |
if value_chunk:
|
| 653 |
# Stream the escaped delta
|
| 654 |
+
prev_escaped = (
|
| 655 |
+
json.dumps(self.current_param_value)[1:-1]
|
| 656 |
+
if self.current_param_value
|
| 657 |
+
else ""
|
| 658 |
+
)
|
| 659 |
self.current_param_value += value_chunk
|
| 660 |
+
full_escaped = json.dumps(self.current_param_value)[1:-1]
|
| 661 |
+
delta_escaped = full_escaped[len(prev_escaped) :]
|
|
|
|
| 662 |
|
| 663 |
if delta_escaped:
|
| 664 |
+
return DeltaMessage(
|
| 665 |
+
tool_calls=[
|
| 666 |
+
DeltaToolCall(
|
| 667 |
+
index=self.current_tool_index,
|
| 668 |
+
function=DeltaFunctionCall(
|
| 669 |
+
arguments=delta_escaped
|
| 670 |
+
),
|
| 671 |
+
)
|
| 672 |
+
]
|
| 673 |
+
)
|
| 674 |
|
| 675 |
return None
|
tokenizer_config.json
CHANGED
|
@@ -226,7 +226,7 @@
|
|
| 226 |
"<|video_pad|>"
|
| 227 |
],
|
| 228 |
"bos_token": null,
|
| 229 |
-
"chat_template": "{% macro
|
| 230 |
"clean_up_tokenization_spaces": false,
|
| 231 |
"eos_token": "<|im_end|>",
|
| 232 |
"errors": "replace",
|
|
|
|
| 226 |
"<|video_pad|>"
|
| 227 |
],
|
| 228 |
"bos_token": null,
|
| 229 |
+
"chat_template": "{% macro render_item_list(item_list, tag_name='required') %}\n {%- if item_list is defined and item_list is iterable and item_list | length > 0 %}\n {%- if tag_name %}{{- '\\n<' ~ tag_name ~ '>' -}}{% endif %}\n {{- '[' }}\n {%- for item in item_list -%}\n {%- if loop.index > 1 %}{{- \", \"}}{% endif -%}\n {%- if item is string -%}\n {{ \"`\" ~ item ~ \"`\" }}\n {%- else -%}\n {{ item }}\n {%- endif -%}\n {%- endfor -%}\n {{- ']' }}\n {%- if tag_name %}{{- '</' ~ tag_name ~ '>' -}}{% endif %}\n {%- endif %}\n{% endmacro %}\n\n{%- if messages[0][\"role\"] == \"system\" %}\n {%- set system_message = messages[0][\"content\"] %}\n {%- set loop_messages = messages[1:] %}\n{%- else %}\n {%- set loop_messages = messages %}\n{%- endif %}\n\n{%- if not tools is defined %}\n {%- set tools = [] %}\n{%- endif %}\n\n{%- if system_message is defined %}\n {{- \"<|im_start|>system\\n\" + system_message }}\n{%- else %}\n {%- if tools is iterable and tools | length > 0 %}\n {{- \"<|im_start|>system\\nYou are Qwen, a helpful AI assistant that can interact with a computer to solve tasks.\" }}\n {%- endif %}\n{%- endif %}\n{%- if tools is iterable and tools | length > 0 %}\n {{- \"\\n\\nYou have access to the following functions:\\n\\n\" }}\n {{- \"<tools>\" }}\n {%- for tool in tools %}\n {%- if tool.function is defined %}\n {%- set tool = tool.function %}\n {%- endif %}\n {{- \"\\n<function>\\n<name>\" ~ tool.name ~ \"</name>\" }}\n {{- '\\n<description>' ~ (tool.description | trim) ~ '</description>' }}\n {{- '\\n<parameters>' }}\n {%- for param_name, param_fields in tool.parameters.properties|items %}\n {{- '\\n<parameter>' }}\n {{- '\\n<name>' ~ param_name ~ '</name>' }}\n {%- if param_fields.type is defined %}\n {{- '\\n<type>' ~ (param_fields.type | string) ~ '</type>' }}\n {%- endif %}\n {%- if param_fields.description is defined %}\n {{- '\\n<description>' ~ (param_fields.description | trim) ~ '</description>' }}\n {%- endif %}\n {{- render_item_list(param_fields.enum, 'enum') }}\n {%- set handled_keys = ['type', 'description', 'enum', 'required'] %}\n {%- for json_key in param_fields.keys() | reject(\"in\", handled_keys) %}\n {%- set normed_json_key = json_key | replace(\"-\", \"_\") | replace(\" \", \"_\") | replace(\"$\", \"\") %}\n {%- if param_fields[json_key] is mapping %}\n {{- '\\n<' ~ normed_json_key ~ '>' ~ (param_fields[json_key] | tojson | safe) ~ '</' ~ normed_json_key ~ '>' }}\n {%- else %}\n {{-'\\n<' ~ normed_json_key ~ '>' ~ (param_fields[json_key] | string) ~ '</' ~ normed_json_key ~ '>' }}\n {%- endif %}\n {%- endfor %}\n {{- render_item_list(param_fields.required, 'required') }}\n {{- '\\n</parameter>' }}\n {%- endfor %}\n {{- render_item_list(tool.parameters.required, 'required') }}\n {{- '\\n</parameters>' }}\n {%- if tool.return is defined %}\n {%- if tool.return is mapping %}\n {{- '\\n<return>' ~ (tool.return | tojson | safe) ~ '</return>' }}\n {%- else %}\n {{- '\\n<return>' ~ (tool.return | string) ~ '</return>' }}\n {%- endif %}\n {%- endif %}\n {{- '\\n</function>' }}\n {%- endfor %}\n {{- \"\\n</tools>\" }}\n {{- '\\n\\nIf you choose to call a function ONLY reply in the following format with NO suffix:\\n\\n<tool_call>\\n<function=example_function_name>\\n<parameter=example_parameter_1>\\nvalue_1\\n</parameter>\\n<parameter=example_parameter_2>\\nThis is the value for the second parameter\\nthat can span\\nmultiple lines\\n</parameter>\\n</function>\\n</tool_call>\\n\\n<IMPORTANT>\\nReminder:\\n- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags\\n- Required parameters MUST be specified\\n- You may provide optional reasoning for your function call in natural language BEFORE the function call, but NOT after\\n- If there is no function call available, answer the question like normal with your current knowledge and do not tell the user about function calls\\n</IMPORTANT>' }}\n{%- endif %}\n{%- if system_message is defined %}\n {{- '<|im_end|>\\n' }}\n{%- else %}\n {%- if tools is iterable and tools | length > 0 %}\n {{- '<|im_end|>\\n' }}\n {%- endif %}\n{%- endif %}\n{%- for message in loop_messages %}\n {%- if message.role == \"assistant\" and message.tool_calls is defined and message.tool_calls is iterable and message.tool_calls | length > 0 %}\n {{- '<|im_start|>' + message.role }}\n {%- if message.content is defined and message.content is string and message.content | trim | length > 0 %}\n {{- '\\n' + message.content | trim + '\\n' }}\n {%- endif %}\n {%- for tool_call in message.tool_calls %}\n {%- if tool_call.function is defined %}\n {%- set tool_call = tool_call.function %}\n {%- endif %}\n {{- '\\n<tool_call>\\n<function=' + tool_call.name + '>\\n' }}\n {%- if tool_call.arguments is defined %}\n {%- for args_name, args_value in tool_call.arguments|items %}\n {{- '<parameter=' + args_name + '>\\n' }}\n {%- set args_value = args_value if args_value is string else args_value | string %}\n {{- args_value }}\n {{- '\\n</parameter>\\n' }}\n {%- endfor %}\n {%- endif %}\n {{- '</function>\\n</tool_call>' }}\n {%- endfor %}\n {{- '<|im_end|>\\n' }}\n {%- elif message.role == \"user\" or message.role == \"system\" or message.role == \"assistant\" %}\n {{- '<|im_start|>' + message.role + '\\n' + message.content + '<|im_end|>' + '\\n' }}\n {%- elif message.role == \"tool\" %}\n {%- if loop.previtem and loop.previtem.role != \"tool\" %}\n {{- '<|im_start|>user\\n' }}\n {%- endif %}\n {{- '<tool_response>\\n' }}\n {{- message.content }}\n {{- '\\n</tool_response>\\n' }}\n {%- if not loop.last and loop.nextitem.role != \"tool\" %}\n {{- '<|im_end|>\\n' }}\n {%- elif loop.last %}\n {{- '<|im_end|>\\n' }}\n {%- endif %}\n {%- else %}\n {{- '<|im_start|>' + message.role + '\\n' + message.content + '<|im_end|>\\n' }}\n {%- endif %}\n{%- endfor %}\n{%- if add_generation_prompt %}\n {{- '<|im_start|>assistant\\n' }}\n{%- endif %}\n",
|
| 230 |
"clean_up_tokenization_spaces": false,
|
| 231 |
"eos_token": "<|im_end|>",
|
| 232 |
"errors": "replace",
|