Gahow Wang
7cb4cac56d
request_model values like qwen-plus matched no registered family, so resolve_model_family fell through to its "glm5" default and the formatter rendered canonical_prompt with the GLM-5 chat template and tokenized release blocks with the GLM-5 tokenizer. The fallback is silent, so nothing surfaced it. Register the family, ship Qwen3-plus tokenizer/chat_template (the template was embedded in tokenizer_config.json upstream and is extracted here), and add a QwenPlusTraceAdapter ahead of the GLM catch-all in get_raw_adapter -- the registry entry alone is not enough, since the adapter is what picks the template. The shared message/tool normalization is factored out of build_glm5_canonical_prompt so both builders use one copy. Measured against provider-reported usage.input_tokens on a 400-request sample, median tokenized/reported ratio goes 0.9449 -> 1.0000, and unique release block count on a 2190-request sample moves 5886 -> 5701. Note deepseek-v4-flash is still unregistered and still resolves to glm5. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
63 lines
2.7 KiB
Django/Jinja
63 lines
2.7 KiB
Django/Jinja
{%- if tools %}
|
|
{{- '<|im_start|>system\n' }}
|
|
{%- if messages[0]['role'] == 'system' %}
|
|
{{- messages[0]['content'] }}
|
|
{%- else %}
|
|
{{- '' }}
|
|
{%- endif %}
|
|
{{- "\n\n# Tools\n\nYou may call one or more functions to assist with the user query.\n\nYou are provided with function signatures within <tools></tools> XML tags:\n<tools>" }}
|
|
{%- for tool in tools %}
|
|
{{- "\n" }}
|
|
{{- tool | tojson }}
|
|
{%- endfor %}
|
|
{{- "\n</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\"name\": <function-name>, \"arguments\": <args-json-object>}\n</tool_call><|im_end|>\n" }}
|
|
{%- else %}
|
|
{%- if messages[0]['role'] == 'system' %}
|
|
{{- '<|im_start|>system\n' + messages[0]['content'] + '<|im_end|>\n' }}
|
|
{%- endif %}
|
|
{%- endif %}
|
|
{%- for message in messages %}
|
|
{%- if (message.role == "user") or (message.role == "system" and not loop.first) %}
|
|
{{- '<|im_start|>' + message.role + '\n' + message.content + '<|im_end|>' + '\n' }}
|
|
{%- elif message.role == "assistant" and not message.tool_calls %}
|
|
{%- set content = message.content %}
|
|
{%- if not loop.last %}
|
|
{%- set content = message.content.split('</think>')[-1].lstrip('\n') %}
|
|
{%- endif %}
|
|
{{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>' + '\n' }}
|
|
{%- elif message.role == "assistant" %}
|
|
{%- set content = message.content %}
|
|
{%- if not loop.last %}
|
|
{%- set content = message.content.split('</think>')[-1].lstrip('\n') %}
|
|
{%- endif %}
|
|
{{- '<|im_start|>' + message.role }}
|
|
{%- if message.content %}
|
|
{{- '\n' + content }}
|
|
{%- endif %}
|
|
{%- for tool_call in message.tool_calls %}
|
|
{%- if tool_call.function is defined %}
|
|
{%- set tool_call = tool_call.function %}
|
|
{%- endif %}
|
|
{{- '\n<tool_call>\n{"name": "' }}
|
|
{{- tool_call.name }}
|
|
{{- '", "arguments": ' }}
|
|
{{- tool_call.arguments | tojson }}
|
|
{{- '}\n</tool_call>' }}
|
|
{%- endfor %}
|
|
{{- '<|im_end|>\n' }}
|
|
{%- elif message.role == "tool" %}
|
|
{%- if (loop.index0 == 0) or (messages[loop.index0 - 1].role != "tool") %}
|
|
{{- '<|im_start|>user' }}
|
|
{%- endif %}
|
|
{{- '\n<tool_response>\n' }}
|
|
{{- message.content }}
|
|
{{- '\n</tool_response>' }}
|
|
{%- if loop.last or (messages[loop.index0 + 1].role != "tool") %}
|
|
{{- '<|im_end|>\n' }}
|
|
{%- endif %}
|
|
{%- endif %}
|
|
{%- endfor %}
|
|
{%- if add_generation_prompt %}
|
|
{{- '<|im_start|>assistant\n' }}
|
|
{%- endif %}
|