@miller-tech/uap 1.216.0 → 1.217.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/llama-profiles/gemma4-26b-a4b-mtp.env +1 -1
- package/config/llama-profiles/qwen36-35b-a3b.env +52 -3
- package/config/llama-profiles/qwen38-27b-mtp.env +155 -0
- package/config/model-profiles/qwen35.json +2 -2
- package/config/model-profiles/qwen36.json +1 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/bin/llama-server-optimize.js +3 -3
- package/dist/bin/llama-server-optimize.js.map +1 -1
- package/dist/cli/tool-calls.d.ts.map +1 -1
- package/dist/cli/tool-calls.js +27 -3
- package/dist/cli/tool-calls.js.map +1 -1
- package/docs/INDEX.md +1 -0
- package/docs/design/PRODUCT_NAMING.md +106 -0
- package/docs/guides/QWEN36_LLAMACPP.md +139 -3
- package/package.json +1 -1
- package/src/policies/enforcers/__pycache__/_common.cpython-312.pyc +0 -0
- package/templates/hooks/__pycache__/deliver_autoroute.cpython-312.pyc +0 -0
- package/tools/agents/README.md +13 -3
- package/tools/agents/config/qwen-sharp.jinja +374 -0
- package/tools/agents/scripts/__pycache__/toolcall_path_normalizer.cpython-312.pyc +0 -0
- package/tools/agents/scripts/anthropic_proxy.py +2 -1
package/tools/agents/README.md
CHANGED
|
@@ -13,9 +13,19 @@ This directory contains tools and configurations for fixing Qwen3.5 tool calling
|
|
|
13
13
|
|
|
14
14
|
## Files
|
|
15
15
|
|
|
16
|
+
### `config/qwen-sharp.jinja`
|
|
17
|
+
|
|
18
|
+
The template every Qwen profile runs (Qwen 3.5 / 3.6 / 3.8), vendored verbatim from
|
|
19
|
+
[peculiar-ragdoll/Qwen-Sharp-Chat-Templates](https://huggingface.co/peculiar-ragdoll/Qwen-Sharp-Chat-Templates)
|
|
20
|
+
and sha256-pinned in `test/chat-template-system-message.test.ts`. See
|
|
21
|
+
[docs/guides/QWEN36_LLAMACPP.md](../../docs/guides/QWEN36_LLAMACPP.md#chat-template-qwen-sharpjinja-all-qwen-models)
|
|
22
|
+
for what it changes and what stays wire-compatible.
|
|
23
|
+
|
|
24
|
+
`uap tool-calls setup` installs it automatically under any `qwen*` profile.
|
|
25
|
+
|
|
16
26
|
### `config/chat_template.jinja`
|
|
17
27
|
|
|
18
|
-
The
|
|
28
|
+
The generic (non-Qwen) fallback: a patched Jinja2 template for Qwen3.5 that adds conditional wrappers around tool call argument iteration.
|
|
19
29
|
|
|
20
30
|
**Key Fix (line 138-144):**
|
|
21
31
|
|
|
@@ -142,7 +152,7 @@ cp tools/agents/scripts/*.py tools/agents/scripts/
|
|
|
142
152
|
```bash
|
|
143
153
|
./llama-server \
|
|
144
154
|
--model ~/models/Qwen3.5-35B-Instruct-Q4_K_M.gguf \
|
|
145
|
-
--chat-template-file tools/agents/config/
|
|
155
|
+
--chat-template-file tools/agents/config/qwen-sharp.jinja \
|
|
146
156
|
--jinja \
|
|
147
157
|
--port 8080 \
|
|
148
158
|
--ctx-size 262144 \
|
|
@@ -161,7 +171,7 @@ cp tools/agents/scripts/*.py tools/agents/scripts/
|
|
|
161
171
|
|
|
162
172
|
```bash
|
|
163
173
|
mkdir -p ~/.opencode/agent
|
|
164
|
-
cp tools/agents/config/
|
|
174
|
+
cp tools/agents/config/qwen-sharp.jinja ~/.opencode/agent/
|
|
165
175
|
```
|
|
166
176
|
|
|
167
177
|
**2. Update `.opencode/config.json`:**
|
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
{%- set template_version = "qwen3.8-froggeric-v22.1" %}
|
|
2
|
+
{%- set _tool_format = tool_call_format if tool_call_format is defined else 'xml' %}
|
|
3
|
+
{%- set image_count = namespace(value=0) %}
|
|
4
|
+
{%- set video_count = namespace(value=0) %}
|
|
5
|
+
{%- set add_vision_id = add_vision_id if add_vision_id is defined else false %}
|
|
6
|
+
{%- set enable_thinking = enable_thinking if enable_thinking is defined else true %}
|
|
7
|
+
{%- set auto_disable_thinking_with_tools = auto_disable_thinking_with_tools if auto_disable_thinking_with_tools is defined else false %}
|
|
8
|
+
{%- if preserve_reasoning is defined and preserve_reasoning is not none %}
|
|
9
|
+
{%- set _preserve_thinking = preserve_reasoning %}
|
|
10
|
+
{%- elif preserve_thinking is defined and preserve_thinking is not none %}
|
|
11
|
+
{%- set _preserve_thinking = preserve_thinking %}
|
|
12
|
+
{%- else %}
|
|
13
|
+
{%- set _preserve_thinking = true %}
|
|
14
|
+
{%- endif %}
|
|
15
|
+
{%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
|
|
16
|
+
{%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
|
|
17
|
+
{%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
|
|
18
|
+
{%- set _effort_raw = (reasoning_effort | string | lower) if reasoning_effort is defined and reasoning_effort is not none else 'medium' %}
|
|
19
|
+
{%- set _initial_thinking = enable_thinking %}
|
|
20
|
+
{%- set _initial_effort = 'medium' %}
|
|
21
|
+
{%- if _effort_raw == 'none' %}
|
|
22
|
+
{%- set _initial_thinking = false %}
|
|
23
|
+
{%- set _initial_effort = 'medium' %}
|
|
24
|
+
{%- elif _effort_raw == 'minimal' or _effort_raw == 'low' %}
|
|
25
|
+
{%- set _initial_effort = 'low' %}
|
|
26
|
+
{%- elif _effort_raw == 'high' or _effort_raw == 'xhigh' or _effort_raw == 'max' %}
|
|
27
|
+
{%- set _initial_effort = 'xhigh' %}
|
|
28
|
+
{%- else %}
|
|
29
|
+
{%- set _initial_effort = 'medium' %}
|
|
30
|
+
{%- endif %}
|
|
31
|
+
{%- set ns_state = namespace(thinking=_initial_thinking, effort=_initial_effort) %}
|
|
32
|
+
{%- if auto_disable_thinking_with_tools and _has_tools %}
|
|
33
|
+
{%- set ns_state.thinking = false %}
|
|
34
|
+
{%- endif %}
|
|
35
|
+
{%- for msg in messages %}
|
|
36
|
+
{%- if msg.role == 'system' or msg.role == 'developer' or msg.role == 'user' %}
|
|
37
|
+
{%- if msg.content is string %}
|
|
38
|
+
{%- if '<|think_off|>' in msg.content %}
|
|
39
|
+
{%- set ns_state.thinking = false %}
|
|
40
|
+
{%- elif '<|think_on|>' in msg.content %}
|
|
41
|
+
{%- set ns_state.thinking = true %}
|
|
42
|
+
{%- elif '<|think_xhigh|>' in msg.content or '<|think_high|>' in msg.content %}
|
|
43
|
+
{%- set ns_state.thinking = true %}
|
|
44
|
+
{%- set ns_state.effort = 'xhigh' %}
|
|
45
|
+
{%- elif '<|think_low|>' in msg.content or '<|think_minimal|>' in msg.content %}
|
|
46
|
+
{%- set ns_state.thinking = true %}
|
|
47
|
+
{%- set ns_state.effort = 'low' %}
|
|
48
|
+
{%- elif '<|think_medium|>' in msg.content %}
|
|
49
|
+
{%- set ns_state.thinking = true %}
|
|
50
|
+
{%- set ns_state.effort = 'medium' %}
|
|
51
|
+
{%- endif %}
|
|
52
|
+
{%- elif msg.content is iterable and msg.content is not mapping %}
|
|
53
|
+
{%- for item in msg.content %}
|
|
54
|
+
{%- if item is string %}
|
|
55
|
+
{%- set _item_text = item %}
|
|
56
|
+
{%- elif item is mapping and 'text' in item and item.text is string %}
|
|
57
|
+
{%- set _item_text = item.text %}
|
|
58
|
+
{%- else %}
|
|
59
|
+
{%- set _item_text = '' %}
|
|
60
|
+
{%- endif %}
|
|
61
|
+
{%- if _item_text %}
|
|
62
|
+
{%- if '<|think_off|>' in _item_text %}
|
|
63
|
+
{%- set ns_state.thinking = false %}
|
|
64
|
+
{%- elif '<|think_on|>' in _item_text %}
|
|
65
|
+
{%- set ns_state.thinking = true %}
|
|
66
|
+
{%- elif '<|think_xhigh|>' in _item_text or '<|think_high|>' in _item_text %}
|
|
67
|
+
{%- set ns_state.thinking = true %}
|
|
68
|
+
{%- set ns_state.effort = 'xhigh' %}
|
|
69
|
+
{%- elif '<|think_low|>' in _item_text or '<|think_minimal|>' in _item_text %}
|
|
70
|
+
{%- set ns_state.thinking = true %}
|
|
71
|
+
{%- set ns_state.effort = 'low' %}
|
|
72
|
+
{%- elif '<|think_medium|>' in _item_text %}
|
|
73
|
+
{%- set ns_state.thinking = true %}
|
|
74
|
+
{%- set ns_state.effort = 'medium' %}
|
|
75
|
+
{%- endif %}
|
|
76
|
+
{%- endif %}
|
|
77
|
+
{%- endfor %}
|
|
78
|
+
{%- endif %}
|
|
79
|
+
{%- endif %}
|
|
80
|
+
{%- endfor %}
|
|
81
|
+
{%- set reasoning_instructions = '' %}
|
|
82
|
+
{%- if ns_state.thinking %}
|
|
83
|
+
{%- if ns_state.effort == 'xhigh' %}
|
|
84
|
+
{%- set reasoning_instructions = 'Reasoning effort is set to xhigh. Please think carefully through the task, validate key assumptions, consider plausible alternatives, and prioritize correctness, consistency, and clarity in the final answer.' %}
|
|
85
|
+
{%- elif ns_state.effort == 'low' %}
|
|
86
|
+
{%- set reasoning_instructions = 'Reasoning effort is set to low. Keep your thinking brief and focused, moving directly to the conclusion without unnecessary elaboration.' %}
|
|
87
|
+
{%- endif %}
|
|
88
|
+
{%- endif %}
|
|
89
|
+
{%- macro render_content(content, do_vision_count, is_system_content=false) %}
|
|
90
|
+
{%- if content is string %}
|
|
91
|
+
{{- content }}
|
|
92
|
+
{%- elif content is iterable and content is not mapping %}
|
|
93
|
+
{%- for item in content %}
|
|
94
|
+
{%- if item is mapping %}
|
|
95
|
+
{%- if item.type == 'image' or 'image' in item or 'image_url' in item %}
|
|
96
|
+
{%- if is_system_content %}
|
|
97
|
+
{{- raise_exception('System message cannot contain images.') }}
|
|
98
|
+
{%- endif %}
|
|
99
|
+
{%- if do_vision_count %}
|
|
100
|
+
{%- set image_count.value = image_count.value + 1 %}
|
|
101
|
+
{%- endif %}
|
|
102
|
+
{%- if add_vision_id %}
|
|
103
|
+
{{- 'Picture ' ~ image_count.value ~ ': ' }}
|
|
104
|
+
{%- endif %}
|
|
105
|
+
{{- '<|vision_start|><|image_pad|><|vision_end|>' }}
|
|
106
|
+
{%- elif item.type == 'video' or 'video' in item %}
|
|
107
|
+
{%- if is_system_content %}
|
|
108
|
+
{{- raise_exception('System message cannot contain videos.') }}
|
|
109
|
+
{%- endif %}
|
|
110
|
+
{%- if do_vision_count %}
|
|
111
|
+
{%- set video_count.value = video_count.value + 1 %}
|
|
112
|
+
{%- endif %}
|
|
113
|
+
{%- if add_vision_id %}
|
|
114
|
+
{{- 'Video ' ~ video_count.value ~ ': ' }}
|
|
115
|
+
{%- endif %}
|
|
116
|
+
{{- '<|vision_start|><|video_pad|><|vision_end|>' }}
|
|
117
|
+
{%- elif 'text' in item %}
|
|
118
|
+
{{- item.text }}
|
|
119
|
+
{%- else %}
|
|
120
|
+
{{- raise_exception('Unexpected item type in content.') }}
|
|
121
|
+
{%- endif %}
|
|
122
|
+
{%- else %}
|
|
123
|
+
{{- item | string }}
|
|
124
|
+
{%- endif %}
|
|
125
|
+
{%- endfor %}
|
|
126
|
+
{%- elif content is none or content is undefined %}
|
|
127
|
+
{{- '' }}
|
|
128
|
+
{%- else %}
|
|
129
|
+
{{- raise_exception('Unexpected content type.') }}
|
|
130
|
+
{%- endif %}
|
|
131
|
+
{%- endmacro %}
|
|
132
|
+
{%- if not messages %}
|
|
133
|
+
{{- raise_exception('No messages provided.') }}
|
|
134
|
+
{%- endif %}
|
|
135
|
+
{%- set _first_role = messages[0].role %}
|
|
136
|
+
{%- if _first_role == 'system' or _first_role == 'developer' %}
|
|
137
|
+
{%- set _sys_msg = messages[0] %}
|
|
138
|
+
{%- set _msgs = messages[1:] %}
|
|
139
|
+
{%- else %}
|
|
140
|
+
{%- set _sys_msg = none %}
|
|
141
|
+
{%- set _msgs = messages %}
|
|
142
|
+
{%- endif %}
|
|
143
|
+
{%- set _sc = '' %}
|
|
144
|
+
{%- if _sys_msg is not none %}
|
|
145
|
+
{%- set _sc = render_content(_sys_msg.content, false, true) | trim %}
|
|
146
|
+
{%- if '<|think_off|>' in _sc %}{%- set _sc = _sc.split('<|think_off|>') | join('') | trim %}{%- endif %}
|
|
147
|
+
{%- if '<|think_on|>' in _sc %}{%- set _sc = _sc.split('<|think_on|>') | join('') | trim %}{%- endif %}
|
|
148
|
+
{%- if '<|think_xhigh|>' in _sc %}{%- set _sc = _sc.split('<|think_xhigh|>') | join('') | trim %}{%- endif %}
|
|
149
|
+
{%- if '<|think_high|>' in _sc %}{%- set _sc = _sc.split('<|think_high|>') | join('') | trim %}{%- endif %}
|
|
150
|
+
{%- if '<|think_medium|>' in _sc %}{%- set _sc = _sc.split('<|think_medium|>') | join('') | trim %}{%- endif %}
|
|
151
|
+
{%- if '<|think_low|>' in _sc %}{%- set _sc = _sc.split('<|think_low|>') | join('') | trim %}{%- endif %}
|
|
152
|
+
{%- if '<|think_minimal|>' in _sc %}{%- set _sc = _sc.split('<|think_minimal|>') | join('') | trim %}{%- endif %}
|
|
153
|
+
{%- endif %}
|
|
154
|
+
{%- set _terse %}
|
|
155
|
+
Answer directly, after thinking. Lead with the answer, then only what it needs to be correct and usable.
|
|
156
|
+
Never: open with preamble or pleasantries; restate the question; add filler transitions; hedge with niceties; or repeat a point you've already made.
|
|
157
|
+
Always: keep essential steps, caveats, uncertainties, and specifics — never drop correctness or a needed warning for brevity. Keep the final answer lean. Use the least structure that conveys it (plain prose when short; lists or code only when they earn their place). If genuinely uncertain, say so and explain why — never omit uncertainty for the sake of brevity.
|
|
158
|
+
If a user request is genuinely ambiguous, ask a sharp question, don't guess.
|
|
159
|
+
{%- endset %}
|
|
160
|
+
{%- if not _sc %}
|
|
161
|
+
{%- set _sc = _terse | trim %}
|
|
162
|
+
{%- else %}
|
|
163
|
+
{%- set _sc = (_sc | trim) ~ '\n\n' ~ (_terse | trim) %}
|
|
164
|
+
{%- endif %}
|
|
165
|
+
{%- if _has_tools %}
|
|
166
|
+
{{- '<|im_start|>system\n' }}
|
|
167
|
+
{%- if reasoning_instructions %}
|
|
168
|
+
{{- reasoning_instructions + '\n\n' }}
|
|
169
|
+
{%- endif %}
|
|
170
|
+
{{- '# Tools\n\nYou have access to the following functions:\n\n<tools>' }}
|
|
171
|
+
{%- for tool in tools %}
|
|
172
|
+
{{- '\n' }}
|
|
173
|
+
{{- tool | tojson }}
|
|
174
|
+
{%- endfor %}
|
|
175
|
+
{{- '\n</tools>' }}
|
|
176
|
+
{%- if _tool_format == 'json' %}
|
|
177
|
+
{{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n<think>\nBrief explanation of tool call\n</think>\n<tool_call>\n{"name": "example_function_name", "arguments": {"example_parameter_1": "value_1", "example_parameter_2": "This is the value for the second parameter"}}\n</tool_call>\n\n<IMPORTANT>\nReminder:\n- You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user.\n- ALL explanation and reasoning MUST be placed strictly inside the <think></think> block.\n- Function calls MUST follow the specified format: a single JSON object with "name" and "arguments" keys inside <tool_call></tool_call> XML tags.\n- If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after thinking, with NO conversational text before it.\n- The <tool_call> tag MUST be at the very beginning of a new line, with NO spaces or indentation before it.\n- To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks.\n- If you have all necessary data, provide your final answer directly to the user without any tool call.\n</IMPORTANT>' }}
|
|
178
|
+
{%- else %}
|
|
179
|
+
{{- '\n\nIf you choose to call a function ONLY reply in the following format with NO suffix:\n\n<think>\nBrief explanation of tool call\n</think>\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- You can use the <think></think> block to plan your next tool call OR to synthesize data and formulate your final response to the user.\n- ALL explanation and reasoning MUST be placed strictly inside the <think></think> block.\n- Function calls MUST follow the specified format: an inner <function=...></function> block must be nested within <tool_call></tool_call> XML tags.\n- If you choose to call a tool, you MUST output the <tool_call> block IMMEDIATELY after thinking, with NO conversational text before it.\n- The <tool_call> and <function> tags MUST be at the very beginning of a new line, with NO spaces or indentation before them.\n- To call multiple functions, output a separate, completely closed <tool_call></tool_call> block for EACH function. Do NOT nest <tool_call> blocks.\n- If you have all necessary data, provide your final answer directly to the user without any tool call.\n</IMPORTANT>' }}
|
|
180
|
+
{%- endif %}
|
|
181
|
+
{%- if _sc %}
|
|
182
|
+
{{- '\n\n' + _sc }}
|
|
183
|
+
{%- endif %}
|
|
184
|
+
{{- '<|im_end|>\n' }}
|
|
185
|
+
{%- else %}
|
|
186
|
+
{%- if _sc %}
|
|
187
|
+
{{- '<|im_start|>system\n' + (reasoning_instructions + '\n\n' if reasoning_instructions else '') + _sc + '<|im_end|>\n' }}
|
|
188
|
+
{%- elif reasoning_instructions %}
|
|
189
|
+
{{- '<|im_start|>system\n' + reasoning_instructions + '<|im_end|>\n' }}
|
|
190
|
+
{%- endif %}
|
|
191
|
+
{%- endif %}
|
|
192
|
+
{%- set _last_idx = _msgs | length - 1 %}
|
|
193
|
+
{%- set ns = namespace(multi_step_tool=true, last_query_index=_last_idx) %}
|
|
194
|
+
{%- for message in _msgs[::-1] %}
|
|
195
|
+
{%- set index = (_msgs | length - 1) - loop.index0 %}
|
|
196
|
+
{%- if ns.multi_step_tool and message.role == 'user' %}
|
|
197
|
+
{%- set _rc = render_content(message.content, false) | trim %}
|
|
198
|
+
{%- if not (_rc.startswith('<tool_response>') and _rc.endswith('</tool_response>')) %}
|
|
199
|
+
{%- set ns.multi_step_tool = false %}
|
|
200
|
+
{%- set ns.last_query_index = index %}
|
|
201
|
+
{%- endif %}
|
|
202
|
+
{%- endif %}
|
|
203
|
+
{%- endfor %}
|
|
204
|
+
{%- if ns.multi_step_tool %}
|
|
205
|
+
{%- if _last_idx > 50 %}
|
|
206
|
+
{%- set ns.last_query_index = _last_idx %}
|
|
207
|
+
{%- else %}
|
|
208
|
+
{%- set ns.last_query_index = 0 %}
|
|
209
|
+
{%- endif %}
|
|
210
|
+
{%- endif %}
|
|
211
|
+
{%- set ns2 = namespace(prev_role='', consecutive_failures=0) %}
|
|
212
|
+
{%- for message in _msgs %}
|
|
213
|
+
{%- set is_system = (message.role == "system" or message.role == "developer") %}
|
|
214
|
+
{%- set content = render_content(message.content, true, is_system) | trim %}
|
|
215
|
+
{%- if is_system or message.role == 'user' %}
|
|
216
|
+
{%- if '<|think_off|>' in content %}{%- set content = content.split('<|think_off|>') | join('') | trim %}{%- endif %}
|
|
217
|
+
{%- if '<|think_on|>' in content %}{%- set content = content.split('<|think_on|>') | join('') | trim %}{%- endif %}
|
|
218
|
+
{%- if '<|think_xhigh|>' in content %}{%- set content = content.split('<|think_xhigh|>') | join('') | trim %}{%- endif %}
|
|
219
|
+
{%- if '<|think_high|>' in content %}{%- set content = content.split('<|think_high|>') | join('') | trim %}{%- endif %}
|
|
220
|
+
{%- if '<|think_medium|>' in content %}{%- set content = content.split('<|think_medium|>') | join('') | trim %}{%- endif %}
|
|
221
|
+
{%- if '<|think_low|>' in content %}{%- set content = content.split('<|think_low|>') | join('') | trim %}{%- endif %}
|
|
222
|
+
{%- if '<|think_minimal|>' in content %}{%- set content = content.split('<|think_minimal|>') | join('') | trim %}{%- endif %}
|
|
223
|
+
{%- endif %}
|
|
224
|
+
{%- if is_system %}
|
|
225
|
+
{{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
|
|
226
|
+
{%- elif message.role == 'user' %}
|
|
227
|
+
{%- set ns2.consecutive_failures = 0 %}
|
|
228
|
+
{{- '<|im_start|>user\n' + content + '<|im_end|>\n' }}
|
|
229
|
+
{%- elif message.role == 'assistant' %}
|
|
230
|
+
{%- set reasoning_content = '' %}
|
|
231
|
+
{%- if message.reasoning_content is defined and message.reasoning_content is not none %}
|
|
232
|
+
{%- if message.reasoning_content is string %}
|
|
233
|
+
{%- set reasoning_content = message.reasoning_content %}
|
|
234
|
+
{%- else %}
|
|
235
|
+
{%- set reasoning_content = message.reasoning_content | string %}
|
|
236
|
+
{%- endif %}
|
|
237
|
+
{%- elif message.thinking is defined and message.thinking is not none %}
|
|
238
|
+
{%- if message.thinking is string %}
|
|
239
|
+
{%- set reasoning_content = message.thinking %}
|
|
240
|
+
{%- else %}
|
|
241
|
+
{%- set reasoning_content = message.thinking | string %}
|
|
242
|
+
{%- endif %}
|
|
243
|
+
{%- else %}
|
|
244
|
+
{%- set _think_end = '' %}
|
|
245
|
+
{%- if content.startswith('</think>') %}
|
|
246
|
+
{%- set _think_end = '</think>' %}
|
|
247
|
+
{%- elif content.startswith('</thinking>') %}
|
|
248
|
+
{%- set _think_end = '</thinking>' %}
|
|
249
|
+
{%- elif '\n</think>' in content %}
|
|
250
|
+
{%- set _think_end = '\n</think>' %}
|
|
251
|
+
{%- elif '\n</thinking>' in content %}
|
|
252
|
+
{%- set _think_end = '\n</thinking>' %}
|
|
253
|
+
{%- elif '\n</ think>' in content %}
|
|
254
|
+
{%- set _think_end = '\n</ think>' %}
|
|
255
|
+
{%- elif '\n</think >' in content %}
|
|
256
|
+
{%- set _think_end = '\n</think >' %}
|
|
257
|
+
{%- endif %}
|
|
258
|
+
{%- if _think_end %}
|
|
259
|
+
{%- if 'thinking' in _think_end %}
|
|
260
|
+
{%- set _think_start = '<thinking>' %}
|
|
261
|
+
{%- else %}
|
|
262
|
+
{%- set _think_start = '<think>' %}
|
|
263
|
+
{%- endif %}
|
|
264
|
+
{%- set reasoning_content = content.split(_think_end)[0].rstrip('\n') %}
|
|
265
|
+
{%- if _think_start in reasoning_content %}
|
|
266
|
+
{%- set reasoning_content = reasoning_content.split(_think_start)[-1].lstrip('\n') %}
|
|
267
|
+
{%- endif %}
|
|
268
|
+
{%- set content = content.split(_think_end)[-1].lstrip('\n') %}
|
|
269
|
+
{%- endif %}
|
|
270
|
+
{%- endif %}
|
|
271
|
+
{%- set reasoning_content = reasoning_content | trim %}
|
|
272
|
+
{%- if (_preserve_thinking or loop.index0 > ns.last_query_index) and reasoning_content %}
|
|
273
|
+
{{- '<|im_start|>assistant\n<think>\n' + reasoning_content + '\n</think>\n\n' + content }}
|
|
274
|
+
{%- else %}
|
|
275
|
+
{{- '<|im_start|>assistant\n' + content }}
|
|
276
|
+
{%- endif %}
|
|
277
|
+
{%- if message.tool_calls is defined and message.tool_calls and message.tool_calls is iterable and message.tool_calls is not mapping %}
|
|
278
|
+
{%- for tool_call in message.tool_calls %}
|
|
279
|
+
{%- if tool_call.function is defined and tool_call.function is not none %}
|
|
280
|
+
{%- set tc = tool_call.function %}
|
|
281
|
+
{%- else %}
|
|
282
|
+
{%- set tc = tool_call %}
|
|
283
|
+
{%- endif %}
|
|
284
|
+
{%- set tc_name = tc.name if (tc.name is defined and tc.name is not none) else '' %}
|
|
285
|
+
{%- if _tool_format == 'json' %}
|
|
286
|
+
{%- if not loop.first or content | trim %}
|
|
287
|
+
{{- '\n\n' }}
|
|
288
|
+
{%- endif %}
|
|
289
|
+
{%- set _args = '{}' %}
|
|
290
|
+
{%- if tc.arguments is defined and tc.arguments is not none %}
|
|
291
|
+
{%- if tc.arguments is mapping %}
|
|
292
|
+
{%- set _args = tc.arguments | tojson %}
|
|
293
|
+
{%- elif tc.arguments is string and tc.arguments %}
|
|
294
|
+
{%- set _args = tc.arguments %}
|
|
295
|
+
{%- endif %}
|
|
296
|
+
{%- endif %}
|
|
297
|
+
{{- '<tool_call>\n{"name": ' }}{{- tc_name | tojson }}{{- ', "arguments": ' }}{{- _args }}{{- '}\n</tool_call>' }}
|
|
298
|
+
{%- else %}
|
|
299
|
+
{%- if loop.first %}
|
|
300
|
+
{%- if content | trim %}
|
|
301
|
+
{{- '\n\n<tool_call>\n<function=' + tc_name + '>\n' }}
|
|
302
|
+
{%- else %}
|
|
303
|
+
{{- '<tool_call>\n<function=' + tc_name + '>\n' }}
|
|
304
|
+
{%- endif %}
|
|
305
|
+
{%- else %}
|
|
306
|
+
{{- '\n\n<tool_call>\n<function=' + tc_name + '>\n' }}
|
|
307
|
+
{%- endif %}
|
|
308
|
+
{%- if tc.arguments is defined and tc.arguments is not none %}
|
|
309
|
+
{%- if tc.arguments is mapping %}
|
|
310
|
+
{%- for args_name, args_value in tc.arguments.items() %}
|
|
311
|
+
{{- '<parameter=' + args_name + '>\n' }}
|
|
312
|
+
{%- if args_value is mapping or (args_value is sequence and args_value is not string) %}
|
|
313
|
+
{%- set _av = args_value | tojson %}
|
|
314
|
+
{%- else %}
|
|
315
|
+
{%- set _av = args_value | string %}
|
|
316
|
+
{%- endif %}
|
|
317
|
+
{%- if max_tool_arg_chars > 0 and _av | length > max_tool_arg_chars %}
|
|
318
|
+
{{- _av[:max_tool_arg_chars] + '\n[TRUNCATED - original length ' ~ (_av | length | string) ~ ' chars]' }}
|
|
319
|
+
{%- else %}
|
|
320
|
+
{{- _av }}
|
|
321
|
+
{%- endif %}
|
|
322
|
+
{{- '\n</parameter>\n' }}
|
|
323
|
+
{%- endfor %}
|
|
324
|
+
{%- elif tc.arguments is string and tc.arguments %}
|
|
325
|
+
{{- tc.arguments }}
|
|
326
|
+
{%- endif %}
|
|
327
|
+
{%- endif %}
|
|
328
|
+
{{- '</function>\n</tool_call>' }}
|
|
329
|
+
{%- endif %}
|
|
330
|
+
{%- endfor %}
|
|
331
|
+
{%- endif %}
|
|
332
|
+
{{- '<|im_end|>\n' }}
|
|
333
|
+
{%- elif message.role == 'tool' %}
|
|
334
|
+
{%- set _content_lower = content | lower %}
|
|
335
|
+
{%- set _content_head = _content_lower[:80] %}
|
|
336
|
+
{%- if content | length < 500 and '$ ' not in content and 'took ' not in _content_lower and ('"error":' in _content_head or 'error:' in _content_head or 'err!' in _content_head or 'fatal:' in _content_head or 'exception:' in _content_head or 'traceback' in _content_head or 'command not found' in _content_head or 'invalid syntax' in _content_head or 'failed to' in _content_head) %}
|
|
337
|
+
{%- set ns2.consecutive_failures = ns2.consecutive_failures + 1 %}
|
|
338
|
+
{%- else %}
|
|
339
|
+
{%- set ns2.consecutive_failures = 0 %}
|
|
340
|
+
{%- endif %}
|
|
341
|
+
{%- if ns2.prev_role != 'tool' %}
|
|
342
|
+
{{- '<|im_start|>user' }}
|
|
343
|
+
{%- endif %}
|
|
344
|
+
{%- if max_tool_response_chars > 0 and content | length > max_tool_response_chars %}
|
|
345
|
+
{%- set content = content[:max_tool_response_chars] + '\n[TRUNCATED - original length ' ~ (content | length | string) ~ ' chars]' %}
|
|
346
|
+
{%- endif %}
|
|
347
|
+
{{- '\n<tool_response>\n' + content }}
|
|
348
|
+
{%- if ns2.consecutive_failures >= 2 %}
|
|
349
|
+
{{- '\n\n⚠️ SYSTEM WARNING: ' ~ ns2.consecutive_failures ~ ' consecutive tool errors detected. Your previous approach is incorrect. You MUST use a fundamentally different approach or corrected arguments.' }}
|
|
350
|
+
{%- elif ns2.consecutive_failures == 1 %}
|
|
351
|
+
{{- '\n\n⚠️ SYSTEM WARNING: The previous tool call returned an error. Diagnose the failure and retry with completely corrected arguments.' }}
|
|
352
|
+
{%- endif %}
|
|
353
|
+
{{- '\n</tool_response>' }}
|
|
354
|
+
{%- if loop.last %}
|
|
355
|
+
{{- '<|im_end|>\n' }}
|
|
356
|
+
{%- else %}
|
|
357
|
+
{%- set _next_role = _msgs[loop.index0 + 1].role %}
|
|
358
|
+
{%- if _next_role != 'tool' %}
|
|
359
|
+
{{- '<|im_end|>\n' }}
|
|
360
|
+
{%- endif %}
|
|
361
|
+
{%- endif %}
|
|
362
|
+
{%- else %}
|
|
363
|
+
{{- '<|im_start|>user\n[' + message.role + ']: ' + content + '<|im_end|>\n' }}
|
|
364
|
+
{%- endif %}
|
|
365
|
+
{%- set ns2.prev_role = message.role %}
|
|
366
|
+
{%- endfor %}
|
|
367
|
+
{%- if add_generation_prompt %}
|
|
368
|
+
{{- '<|im_start|>assistant\n' }}
|
|
369
|
+
{%- if not ns_state.thinking %}
|
|
370
|
+
{{- '<think>\n\n</think>\n\n' }}
|
|
371
|
+
{%- else %}
|
|
372
|
+
{{- '<think>\n' }}
|
|
373
|
+
{%- endif %}
|
|
374
|
+
{%- endif %}
|
|
Binary file
|
|
@@ -7574,7 +7574,8 @@ def build_openai_request(
|
|
|
7574
7574
|
|
|
7575
7575
|
_apply_json_response_grammar(openai_body, anthropic_body)
|
|
7576
7576
|
|
|
7577
|
-
# qwen3.5-enhanced.jinja
|
|
7577
|
+
# qwen-sharp.jinja (and qwen3.5-enhanced.jinja before it, which this
|
|
7578
|
+
# workaround was written against) rejects an assistant
|
|
7578
7579
|
# PREFILL (trailing assistant message) unless thinking is disabled VIA
|
|
7579
7580
|
# chat_template_kwargs — the top-level `enable_thinking` flag is not read by
|
|
7580
7581
|
# this template, so a prefill otherwise 400s ("Assistant response prefill is
|