Update chat_template.jinja

chat_template.jinja

@@ -1,16 +1,20 @@
 {%- macro json_to_python_type(json_spec) -%}
 {%- set basic_type_map = {"string": "str", "number": "float", "integer": "int", "boolean": "bool"} -%}
-{%- if basic_type_map[json_spec.type] is defined -%}
+{%- if json_spec.type is defined and basic_type_map[json_spec.type] is defined -%}
 {{- basic_type_map[json_spec.type] -}}
-{%- elif json_spec.type == "array" -%}
+{%- elif json_spec.type is defined and json_spec.type == "array" -%}
+{%- if json_spec.items is defined -%}
 {{- "list[" + json_to_python_type(json_spec.items) + "]" -}}
-{%- elif json_spec.type == "object" -%}
+{%- else -%}
+{{- "list" -}}
+{%- endif -%}
+{%- elif json_spec.type is defined and json_spec.type == "object" -%}
 {%- if json_spec.additionalProperties is defined -%}
 {{- "dict[str, " + json_to_python_type(json_spec.additionalProperties) + "]" -}}
 {%- else -%}
 {{- "dict" -}}
 {%- endif -%}
-{%- elif json_spec.type is iterable -%}
+{%- elif json_spec.type is defined and json_spec.type is iterable and json_spec.type is not string -%}
 {{- "Union[" -}}
 {%- for t in json_spec.type -%}
 {{- json_to_python_type({"type": t}) -}}
@@ -30,24 +34,41 @@
 {%- for tool in tools -%}
 {%- set t = tool.function if tool.function is defined else tool -%}
 {{- '{"type": "function", "function": {"name": "' + t.name + '", "description": "' + t.name + '(' -}}
+{%- if t.parameters is defined and t.parameters.properties is defined -%}
 {%- for param_name, param_fields in t.parameters.properties.items() -%}
 {{- param_name + ": " + json_to_python_type(param_fields) -}}
 {%- if not loop.last -%}, {%- endif -%}
 {%- endfor -%}
+{%- endif -%}
 {{- ")" -}}
 {%- if t.return is defined -%}
 {{- " -> " + json_to_python_type(t.return) -}}
 {%- endif -%}
-{{- " - " + t.description + "\n\n Args:\n" -}}
+{{- " - " -}}
+{%- if t.description is defined -%}
+{{- t.description -}}
+{%- else -%}
+{{- "No description available" -}}
+{%- endif -%}
+{{- "\n\n Args:\n" -}}
+{%- if t.parameters is defined and t.parameters.properties is defined -%}
 {%- for param_name, param_fields in t.parameters.properties.items() -%}
-{{- " " + param_name + "(" + json_to_python_type(param_fields) + "): " + param_fields.description -}}
+{{- " " + param_name + "(" + json_to_python_type(param_fields) + "): " -}}
+{%- if param_fields.description is defined -%}
+{{- param_fields.description -}}
+{%- else -%}
+{{- "No description available" -}}
+{%- endif -%}
 {%- if not loop.last -%}\n{%- endif -%}
 {%- endfor -%}
+{%- else -%}
+{{- " No parameters" -}}
+{%- endif -%}
 {%- if t.return is defined and t.return.description is defined -%}
 {{- "\n Returns:\n " + t.return.description -}}
 {%- endif -%}
 {{- '", "parameters": ' -}}
-{%- if t.parameters.properties|length > 0 -%}
+{%- if t.parameters is defined and t.parameters.properties is defined and t.parameters.properties|length > 0 -%}
 {{- t.parameters|tojson -}}
 {%- else -%}
 {{- "{}" -}}
@@ -67,6 +88,7 @@
 {{- '<|start_header_id|>' + message.role + '<|end_header_id|>\n\n' + message.content + '<|eot_id|>' -}}
 {%- elif message.role == "assistant" -%}
 {{- '<|start_header_id|>assistant<|end_header_id|>\n\n' -}}
+{%- if message.tool_calls is defined -%}
 {%- for tool_call in message.tool_calls -%}
 {%- set tc = tool_call.function if tool_call.function is defined else tool_call -%}
 {{- '<tool_call>\n{"name": "' + tc.name + '", "arguments": ' -}}
@@ -77,6 +99,7 @@
 {%- endif -%}
 {{- '}\n</tool_call>' -}}
 {%- endfor -%}
+{%- endif -%}
 {{- '<|eot_id|>' -}}
 {%- elif message.role == "tool" -%}
 {%- if loop.previtem and loop.previtem.role != "tool" -%}