Update chat_template.jinja

chat_template.jinja

@@ -111,9 +111,9 @@
     {%- for tool in tools %}
         {%- set tool = tool.function %}
         {{- "// " + tool.description + "\n" }}
-        {{- "type "+ tool.name + " = (" }}
+        {{- "type "+ tool.name + " = " }}
         {%- if tool.parameters and tool.parameters.properties -%}
-            {{- "_: " }}
+            {{- "(_: " }}
             {{- "{\n" }}
             {%- for param_name, param_spec in tool.parameters.properties.items() %}
                 {{- "// " + param_spec.description + "\n" }}
@@ -124,7 +124,9 @@
                 {{- ": " }}
                 {{- render_typescript_type(param_spec, tool.parameters.required or []) }}
                 {%- if param_spec.default is defined -%}
-                    {%- if param_spec.oneOf %}
+                    {%- if param_spec.enum %}
+                        {{- ", // default: " + param_spec.default }}
+                    {%- elif param_spec.oneOf %}
                         {{- "// default: " + param_spec.default }}
                     {%- else %}
                         {{- ", // default: " + param_spec.default|tojson }}
@@ -132,14 +134,16 @@
                 {%- endif -%}
                 {%- if not loop.last %}
                     {{- ",\n" }}
+                {%- else %}
+                    {{- "\n" }}
                 {%- endif -%}
             {%- endfor %}
-            {{- ",\n}) => any;\n" }}
+            {{- "}) => any;\n\n" }}
         {%- else -%}
-            {{- "\n}) => any;\n" }}
+            {{- "() => any;\n\n" }}
         {%- endif -%}
     {%- endfor %}
-    {{- "\n} // namespace " + namespace_name }}
+    {{- "} // namespace " + namespace_name }}
 {%- endmacro -%}
 
 {%- macro render_builtin_tools(browser_tool, python_tool) -%}
@@ -212,8 +216,10 @@
         {%- endfor %}
         {{- render_builtin_tools(available_builtin_tools.browser, available_builtin_tools.python) }}
     {%- endif -%}
-    {{- "# Valid channels: analysis, commentary, final. Channel must be included for every message.\n" }}
-    {{- "Calls to these tools must go to the commentary channel: 'functions'." }}
+    {{- "# Valid channels: analysis, commentary, final. Channel must be included for every message." }}
+    {%- if tools is defined -%}
+        {{- "\nCalls to these tools must go to the commentary channel: 'functions'." }}
+    {%- endif -%}
 {%- endmacro -%}
 
 {#- Main Template Logic ================================================= #}
@@ -266,7 +272,7 @@
             {{- "<|start|>assistant to=" }}
             {{- "functions." + tool_call.name + "<|channel|>commentary json<|message|>" }}
             {{- tool_call.arguments|tojson }}
-            {{- "<|end|>" }}
+            {{- "<|call|>" }}
             {%- set last_tool_call.name = tool_call.name %}
         {%- elif "thinking" in message and loop.last and not add_generation_prompt %}
             {#- Only render the CoT if the final turn is an assistant turn and add_generation_prompt is false #}
@@ -304,4 +310,4 @@
 {#- Generation prompt #}
 {%- if add_generation_prompt -%}
 <|start|>assistant
-{%- endif -%}
+{%- endif -%}