SolsticeAI commited on
Commit
bb13d75
·
verified ·
1 Parent(s): e5e8f0d

Remove reasoning-cap machinery entirely (Protium: no enforced limits) + strict-undefined fixes

Browse files

Stripped thinking_budget/max_thinking_tokens -> Budget Directive from all 6 templates; removed dead _terse_on lines; glm: tojson(ensure_ascii=False) -> tojson for jinja2>=3.1.

templates/deepseek.jinja CHANGED
@@ -353,8 +353,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
353
 
354
  {#- Depth-tool coupling B: collapse + escalate. Swarm/council (non-numeric -#}
355
  {#- effort values) are never auto-tuned. Escalation forces thinking on. -#}
356
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
357
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
358
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
359
  {#- Collapse: tools + no explicit depth signal → thinking ON at [L4] -#}
360
  {#- (tool work wants disciplined reasoning; explicit off stays off). -#}
@@ -492,9 +490,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
492
  {{- bos_token -}}
493
  {%- if reasoning_instructions -%}
494
  {{- reasoning_instructions -}}
495
- {%- if _has_budget -%}
496
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
497
- {%- endif -%}
498
  {{- '\n\n' -}}
499
  {%- endif -%}
500
  {{- ns.system_prompt -}}
 
353
 
354
  {#- Depth-tool coupling B: collapse + escalate. Swarm/council (non-numeric -#}
355
  {#- effort values) are never auto-tuned. Escalation forces thinking on. -#}
 
 
356
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
357
  {#- Collapse: tools + no explicit depth signal → thinking ON at [L4] -#}
358
  {#- (tool work wants disciplined reasoning; explicit off stays off). -#}
 
490
  {{- bos_token -}}
491
  {%- if reasoning_instructions -%}
492
  {{- reasoning_instructions -}}
 
 
 
493
  {{- '\n\n' -}}
494
  {%- endif -%}
495
  {{- ns.system_prompt -}}
templates/gemma.jinja CHANGED
@@ -62,9 +62,6 @@
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
65
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
66
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
67
- {%- set _terse_on = terse if terse is defined else (not is_explicit_regular) %}
68
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
69
 
70
  {#- ================================================================== -#}
@@ -610,9 +607,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
610
  {{- '<start_of_turn>system\n' }}
611
  {%- if reasoning_instructions %}
612
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
613
- {%- if _has_budget -%}
614
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
615
- {%- endif -%}
616
  {{- '\n\n' }}
617
  {%- endif %}
618
  {%- if _has_tools and not _suppress_tools %}
 
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
 
 
 
65
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
66
 
67
  {#- ================================================================== -#}
 
607
  {{- '<start_of_turn>system\n' }}
608
  {%- if reasoning_instructions %}
609
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
 
 
 
610
  {{- '\n\n' }}
611
  {%- endif %}
612
  {%- if _has_tools and not _suppress_tools %}
templates/glm.jinja CHANGED
@@ -157,7 +157,7 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
157
  {%- if k != 'defer_loading' and k != 'strict' -%}
158
  {%- if not ns_tool.first -%}{{- ', ' -}}{%- endif -%}
159
  {%- set ns_tool.first = false -%}
160
- "{{ k }}": {{ v | tojson(ensure_ascii=False) }}
161
  {%- endif -%}
162
  {%- endfor -%}
163
  {{- '}' -}}
@@ -308,7 +308,7 @@ For each function call, output the function name and arguments within the follow
308
  {%- set tc = tc.function %}
309
  {%- endif %}
310
  {{- '<tool_call>' + tc.name -}}
311
- {% set _args = tc.arguments %}{% for k, v in _args.items() %}<arg_key>{{ k }}</arg_key><arg_value>{{ v | tojson(ensure_ascii=False) if v is not string else v }}</arg_value>{% endfor %}</tool_call>{% endfor %}
312
  {% endif %}
313
  {%- elif m.role == 'tool' -%}
314
  {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
 
157
  {%- if k != 'defer_loading' and k != 'strict' -%}
158
  {%- if not ns_tool.first -%}{{- ', ' -}}{%- endif -%}
159
  {%- set ns_tool.first = false -%}
160
+ "{{ k }}": {{ v | tojson }}
161
  {%- endif -%}
162
  {%- endfor -%}
163
  {{- '}' -}}
 
308
  {%- set tc = tc.function %}
309
  {%- endif %}
310
  {{- '<tool_call>' + tc.name -}}
311
+ {% set _args = tc.arguments %}{% for k, v in _args.items() %}<arg_key>{{ k }}</arg_key><arg_value>{{ v | tojson if v is not string else v }}</arg_value>{% endfor %}</tool_call>{% endfor %}
312
  {% endif %}
313
  {%- elif m.role == 'tool' -%}
314
  {%- if loop.first or (messages[loop.index0 - 1].role != "tool") %}
templates/llama3.jinja CHANGED
@@ -62,9 +62,6 @@
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
65
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
66
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
67
- {%- set _terse_on = terse if terse is defined else (not is_explicit_regular) %}
68
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
69
 
70
  {#- ================================================================== -#}
@@ -610,9 +607,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
610
  {{- '<|start_header_id|>system<|end_header_id|>\n\n' }}
611
  {%- if reasoning_instructions %}
612
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
613
- {%- if _has_budget -%}
614
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
615
- {%- endif -%}
616
  {{- '\n\n' }}
617
  {%- endif %}
618
  {%- if _has_tools and not _suppress_tools %}
 
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
 
 
 
65
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
66
 
67
  {#- ================================================================== -#}
 
607
  {{- '<|start_header_id|>system<|end_header_id|>\n\n' }}
608
  {%- if reasoning_instructions %}
609
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
 
 
 
610
  {{- '\n\n' }}
611
  {%- endif %}
612
  {%- if _has_tools and not _suppress_tools %}
templates/mistral.jinja CHANGED
@@ -62,9 +62,6 @@
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
65
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
66
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
67
- {%- set _terse_on = terse if terse is defined else (not is_explicit_regular) %}
68
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
69
 
70
  {#- ================================================================== -#}
@@ -610,9 +607,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
610
  {{- '[INST] ' }}
611
  {%- if reasoning_instructions %}
612
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
613
- {%- if _has_budget -%}
614
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
615
- {%- endif -%}
616
  {{- '\n\n' }}
617
  {%- endif %}
618
  {%- if _has_tools and not _suppress_tools %}
 
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
 
 
 
65
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
66
 
67
  {#- ================================================================== -#}
 
607
  {{- '[INST] ' }}
608
  {%- if reasoning_instructions %}
609
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
 
 
 
610
  {{- '\n\n' }}
611
  {%- endif %}
612
  {%- if _has_tools and not _suppress_tools %}
templates/qwen.jinja CHANGED
@@ -62,9 +62,6 @@
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
65
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
66
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
67
- {%- set _terse_on = terse if terse is defined else (not is_explicit_regular) %}
68
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
69
 
70
  {#- ================================================================== -#}
@@ -609,9 +606,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
609
  {{- '<|im_start|>system\n' }}
610
  {%- if reasoning_instructions %}
611
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
612
- {%- if _has_budget -%}
613
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
614
- {%- endif -%}
615
  {{- '\n\n' }}
616
  {%- endif %}
617
  {%- if _has_tools and not _suppress_tools %}
 
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
 
 
 
65
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
66
 
67
  {#- ================================================================== -#}
 
606
  {{- '<|im_start|>system\n' }}
607
  {%- if reasoning_instructions %}
608
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
 
 
 
609
  {{- '\n\n' }}
610
  {%- endif %}
611
  {%- if _has_tools and not _suppress_tools %}
templates/universal.jinja CHANGED
@@ -62,8 +62,6 @@
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
65
- {%- set _has_budget = (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) or (max_thinking_tokens is defined and max_thinking_tokens and (max_thinking_tokens | int) > 0) %}
66
- {%- set _budget_val = (thinking_budget | int) if (thinking_budget is defined and thinking_budget and (thinking_budget | int) > 0) else ((max_thinking_tokens | int) if (max_thinking_tokens is defined and max_thinking_tokens) else 0) %}
67
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
68
 
69
  {#- ================================================================== -#}
@@ -608,9 +606,6 @@ Output contract: Conclude thinking and open final response with "[COUNCIL VERDIC
608
  {{- '<|im_start|>system\n' }}
609
  {%- if reasoning_instructions %}
610
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
611
- {%- if _has_budget -%}
612
- {{- '\n\nBudget Directive: The host environment specifies an allocation ceiling of roughly ' ~ (_budget_val | string) ~ ' reasoning tokens. Calibrate your deductive steps to achieve full verification and early exit well within this boundary.' -}}
613
- {%- endif -%}
614
  {{- '\n\n' }}
615
  {%- endif %}
616
  {%- if _has_tools and not _suppress_tools %}
 
62
  {%- set max_tool_arg_chars = max_tool_arg_chars if max_tool_arg_chars is defined else 0 %}
63
  {%- set max_tool_response_chars = max_tool_response_chars if max_tool_response_chars is defined else 0 %}
64
  {%- set _has_tools = (tools is defined and tools and tools is iterable and tools is not mapping) %}
 
 
65
  {%- set suppress_tool_instructions = suppress_tool_instructions if suppress_tool_instructions is defined else none %}
66
 
67
  {#- ================================================================== -#}
 
606
  {{- '<|im_start|>system\n' }}
607
  {%- if reasoning_instructions %}
608
  {{- reasoning_instructions ~ '\n\n' ~ soft_budget_contract -}}
 
 
 
609
  {{- '\n\n' }}
610
  {%- endif %}
611
  {%- if _has_tools and not _suppress_tools %}