SerialKicked commited on
Commit
e4f8495
·
verified ·
1 Parent(s): 5bc68a4

Update Fixed JINJA Templates/ChatML-Qwen3.5.jinja

Browse files
Fixed JINJA Templates/ChatML-Qwen3.5.jinja CHANGED
@@ -42,6 +42,9 @@
42
  {%- if not messages %}
43
  {{- raise_exception('No messages provided.') }}
44
  {%- endif %}
 
 
 
45
  {%- if tools and tools is iterable and tools is not mapping %}
46
  {{- '<|im_start|>system\n' }}
47
  {{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}
@@ -58,10 +61,12 @@
58
  {%- endif %}
59
  {%- endif %}
60
  {{- '<|im_end|>\n' }}
 
61
  {%- else %}
62
  {%- if messages[0].role == 'system' %}
63
  {%- set content = render_content(messages[0].content, false, true)|trim %}
64
  {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
 
65
  {%- endif %}
66
  {%- endif %}
67
  {%- set ns = namespace(multi_step_tool=true, last_query_index=messages|length - 1) %}
@@ -76,6 +81,9 @@
76
  {%- endif %}
77
  {%- endfor %}
78
  {%- for message in messages %}
 
 
 
79
  {%- set content = render_content(message.content, true)|trim %}
80
  {%- if message.role == "system" %}
81
  {{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>' + '\n' }}
 
42
  {%- if not messages %}
43
  {{- raise_exception('No messages provided.') }}
44
  {%- endif %}
45
+
46
+ {%- set ns = namespace(system_rendered=false) %}
47
+
48
  {%- if tools and tools is iterable and tools is not mapping %}
49
  {{- '<|im_start|>system\n' }}
50
  {{- "# Tools\n\nYou have access to the following functions:\n\n<tools>" }}
 
61
  {%- endif %}
62
  {%- endif %}
63
  {{- '<|im_end|>\n' }}
64
+ {%- set ns.system_rendered = true %}
65
  {%- else %}
66
  {%- if messages[0].role == 'system' %}
67
  {%- set content = render_content(messages[0].content, false, true)|trim %}
68
  {{- '<|im_start|>system\n' + content + '<|im_end|>\n' }}
69
+ {%- set ns.system_rendered = true %}
70
  {%- endif %}
71
  {%- endif %}
72
  {%- set ns = namespace(multi_step_tool=true, last_query_index=messages|length - 1) %}
 
81
  {%- endif %}
82
  {%- endfor %}
83
  {%- for message in messages %}
84
+ {%- if message.role == "system" and ns.system_rendered and loop.first %}
85
+ {%- continue %}
86
+ {%- endif %}
87
  {%- set content = render_content(message.content, true)|trim %}
88
  {%- if message.role == "system" %}
89
  {{- '<|im_start|>' + message.role + '\n' + content + '<|im_end|>' + '\n' }}