upstream-archive/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-07-23 09:10:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

renderers: update gemma4 renderer (#15886)

Browse Source
This commit is contained in:
Parth Sareen
2026-04-29 18:40:23 -07:00
committed by GitHub
parent b6447caebc
commit c7c2837c96
4 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
model/renderers/gemma4.go
View File

@@ -71,7 +71,6 @@ func (r *Gemma4Renderer) Render(messages []api.Message, tools []api.Tool, thinkV
continue
}
messageHadContent := r.messageHasContent(message)
prevMessageType = ""
role := message.Role
if role == "assistant" {
@@ -105,14 +104,18 @@ func (r *Gemma4Renderer) Render(messages []api.Message, tools []api.Tool, thinkV
}
}
messageHadContent := false
switch role {
case "model":
if message.Content != "" || len(message.Images) > 0 {
message.Content = stripThinking(message.Content)
r.renderContent(&sb, message, &imageOffset, false)
messageHadContent = r.messageHasContent(message)
}
default:
r.renderContent(&sb, message, &imageOffset, true)
message.Content = strings.TrimSpace(message.Content)
messageHadContent = r.messageHasContent(message)
}
if prevMessageType == "tool_call" && !toolResponsesEmitted {
@@ -180,7 +183,7 @@ func (r *Gemma4Renderer) previousNonToolRole(messages []api.Message, idx int) st
}
func (r *Gemma4Renderer) messageHasContent(message api.Message) bool {
return message.Content != "" || len(message.Images) > 0
return strings.TrimSpace(message.Content) != "" || len(message.Images) > 0
}
func (r *Gemma4Renderer) toolResponseName(message api.Message, toolCalls []api.ToolCall) string {

48
model/renderers/gemma4_reference_test.go
View File

@@ -739,6 +739,18 @@ func TestGemma4RendererMatchesReference(t *testing.T) {
think: thinkTrue(),
expected: "<bos><|turn>system\n<|think|>\nYou are helpful." + bashDeclRef + "<turn|>\n<|turn>user\nHi<turn|>\n<|turn>model\n",
},
{
name: "developer_tools_thinking_trimmed",
messages: []api.Message{
{Role: "developer", Content: " Prefer terse answers.\nUse tools when needed. "},
{Role: "user", Content: "Hi"},
},
tools: bashAndReadRefTools(),
think: thinkTrue(),
expected: "<bos><|turn>system\n<|think|>\nPrefer terse answers.\nUse tools when needed." +
bashDeclRef + readDeclRef + "<turn|>\n" +
"<|turn>user\nHi<turn|>\n<|turn>model\n",
},
{
name: "thinking_explicitly_disabled",
messages: []api.Message{{Role: "user", Content: "Hi"}},
@@ -845,6 +857,40 @@ func TestGemma4RendererMatchesReference(t *testing.T) {
"<|tool_response>response:read{value:" + q + "module example.com/foo" + q + "}<tool_response|>",
skipJinja2: true,
},
{
// Multiple tool calls in one assistant round, with explicit thinking,
// tool_call_id resolution, out-of-order tool responses, and a final
// assistant continuation in the same model turn.
name: "multiple_tool_calls_with_thinking_ids_and_continuation",
messages: []api.Message{
{Role: "system", Content: "You are a coding assistant."},
{Role: "user", Content: "List files, then read config."},
{Role: "assistant", Thinking: "Need the directory listing before reading the config.", ToolCalls: []api.ToolCall{
{
ID: "call_bash",
Function: api.ToolCallFunction{Name: "bash", Arguments: testArgs(map[string]any{"command": "ls -la"})},
},
{
ID: "call_read",
Function: api.ToolCallFunction{Name: "read", Arguments: testArgs(map[string]any{"path": "config.json"})},
},
}},
{Role: "tool", ToolCallID: "call_read", Content: `{"debug": true}`},
{Role: "tool", ToolCallID: "call_bash", Content: "config.json\nmain.go"},
{Role: "assistant", Content: "Config loaded."},
},
tools: bashAndReadRefTools(),
think: thinkTrue(),
expected: "<bos><|turn>system\n<|think|>\nYou are a coding assistant." + bashDeclRef + readDeclRef + "<turn|>\n" +
"<|turn>user\nList files, then read config.<turn|>\n" +
"<|turn>model\n<|channel>thought\nNeed the directory listing before reading the config.\n<channel|>" +
"<|tool_call>call:bash{command:" + q + "ls -la" + q + "}<tool_call|>" +
"<|tool_call>call:read{path:" + q + "config.json" + q + "}<tool_call|>" +
"<|tool_response>response:read{value:" + q + `{"debug": true}` + q + "}<tool_response|>" +
"<|tool_response>response:bash{value:" + q + "config.json\nmain.go" + q + "}<tool_response|>" +
"Config loaded.<turn|>\n" +
"<|turn>model\n",
},
{
// Thinking content in assistant history should be stripped
name: "strip_thinking_history",
@@ -1338,7 +1384,7 @@ Hi<turn|>
"<|turn>user\nList files<turn|>\n" +
"<|turn>model\n<|tool_call>call:bash{command:" + q + "ls" + q + "}<tool_call|>" +
"<|tool_response>response:bash{value:" + q + "file1.txt" + q + "}<tool_response|>" +
"<turn|>\nHere are the files.<turn|>\n" +
"Here are the files.<turn|>\n" +
"<|turn>user\nThanks<turn|>\n" +
"<|turn>model\n",
},

27
model/renderers/testdata/gemma4_31b_chat_template.jinja2 vendored
View File

@@ -1,9 +1,9 @@
{%- macro format_parameters(properties, required) -%}
{%- macro format_parameters(properties, required, filter_keys=false) -%}
{%- set standard_keys = ['description', 'type', 'properties', 'required', 'nullable'] -%}
{%- set ns = namespace(found_first=false) -%}
{%- for key, value in properties | dictsort -%}
{%- set add_comma = false -%}
{%- if key not in standard_keys -%}
{%- if not filter_keys or key not in standard_keys -%}
{%- if ns.found_first %},{% endif -%}
{%- set ns.found_first = true -%}
{{ key }}:{
@@ -65,7 +65,7 @@
{%- elif value is mapping -%}
{%- if add_comma %},{%- else -%} {%- set add_comma = true -%} {% endif -%}
properties:{
{{- format_parameters(value, value['required'] | default([])) -}}
{{- format_parameters(value, value['required'] | default([]), filter_keys=true) -}}
}
{%- endif -%}
{%- if value['required'] -%}
@@ -178,18 +178,21 @@
{#- Handle System/Tool Definitions Block -#}
{%- if (enable_thinking is defined and enable_thinking) or tools or messages[0]['role'] in ['system', 'developer'] -%}
{{- '<|turn>system\n' -}}
{#- Inject Thinking token at the very top of the FIRST system turn -#}
{%- if enable_thinking is defined and enable_thinking -%}
{{- '<|think|>\n' -}}
{%- set ns.prev_message_type = 'think' -%}
{%- endif -%}
{%- if messages[0]['role'] in ['system', 'developer'] -%}
{{- messages[0]['content'] | trim -}}
{%- if messages[0]['content'] is string -%}
{{- messages[0]['content'] | trim -}}
{%- elif messages[0]['content'] is sequence -%}
{%- for item in messages[0]['content'] -%}
{{- item['text'] | trim + ' '-}}
{%- endfor -%}
{%- endif -%}
{%- set loop_messages = messages[1:] -%}
{%- endif -%}
{%- if tools -%}
{%- for tool in tools %}
{{- '<|tool>' -}}
@@ -198,7 +201,6 @@
{%- endfor %}
{%- set ns.prev_message_type = 'tool' -%}
{%- endif -%}
{{- '<turn|>\n' -}}
{%- endif %}
@@ -302,6 +304,7 @@
{%- endfor -%}
{%- endif -%}
{%- set captured_content -%}
{%- if message['content'] is string -%}
{%- if role == 'model' -%}
{{- strip_thinking(message['content']) -}}
@@ -328,10 +331,14 @@
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endset -%}
{{- captured_content -}}
{%- set has_content = captured_content | trim | length > 0 -%}
{%- if ns.prev_message_type == 'tool_call' and not ns_tr_out.flag -%}
{{- '<|tool_response>' -}}
{%- elif not (ns_tr_out.flag and not message.get('content')) -%}
{%- elif not (ns_tr_out.flag and not has_content) -%}
{{- '<turn|>\n' -}}
{%- endif -%}
{%- endif -%}
@@ -344,4 +351,4 @@
{{- '<|channel>thought\n<channel|>' -}}
{%- endif -%}
{%- endif -%}
{%- endif -%}
{%- endif -%}

27
model/renderers/testdata/gemma4_e2b_chat_template.jinja2 vendored
View File

@@ -1,9 +1,9 @@
{%- macro format_parameters(properties, required) -%}
{%- macro format_parameters(properties, required, filter_keys=false) -%}
{%- set standard_keys = ['description', 'type', 'properties', 'required', 'nullable'] -%}
{%- set ns = namespace(found_first=false) -%}
{%- for key, value in properties | dictsort -%}
{%- set add_comma = false -%}
{%- if key not in standard_keys -%}
{%- if not filter_keys or key not in standard_keys -%}
{%- if ns.found_first %},{% endif -%}
{%- set ns.found_first = true -%}
{{ key }}:{
@@ -65,7 +65,7 @@
{%- elif value is mapping -%}
{%- if add_comma %},{%- else -%} {%- set add_comma = true -%} {% endif -%}
properties:{
{{- format_parameters(value, value['required'] | default([])) -}}
{{- format_parameters(value, value['required'] | default([]), filter_keys=true) -}}
}
{%- endif -%}
{%- if value['required'] -%}
@@ -178,18 +178,21 @@
{#- Handle System/Tool Definitions Block -#}
{%- if (enable_thinking is defined and enable_thinking) or tools or messages[0]['role'] in ['system', 'developer'] -%}
{{- '<|turn>system\n' -}}
{#- Inject Thinking token at the very top of the FIRST system turn -#}
{%- if enable_thinking is defined and enable_thinking -%}
{{- '<|think|>\n' -}}
{%- set ns.prev_message_type = 'think' -%}
{%- endif -%}
{%- if messages[0]['role'] in ['system', 'developer'] -%}
{{- messages[0]['content'] | trim -}}
{%- if messages[0]['content'] is string -%}
{{- messages[0]['content'] | trim -}}
{%- elif messages[0]['content'] is sequence -%}
{%- for item in messages[0]['content'] -%}
{{- item['text'] | trim + ' '-}}
{%- endfor -%}
{%- endif -%}
{%- set loop_messages = messages[1:] -%}
{%- endif -%}
{%- if tools -%}
{%- for tool in tools %}
{{- '<|tool>' -}}
@@ -198,7 +201,6 @@
{%- endfor %}
{%- set ns.prev_message_type = 'tool' -%}
{%- endif -%}
{{- '<turn|>\n' -}}
{%- endif %}
@@ -302,6 +304,7 @@
{%- endfor -%}
{%- endif -%}
{%- set captured_content -%}
{%- if message['content'] is string -%}
{%- if role == 'model' -%}
{{- strip_thinking(message['content']) -}}
@@ -328,10 +331,14 @@
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endset -%}
{{- captured_content -}}
{%- set has_content = captured_content | trim | length > 0 -%}
{%- if ns.prev_message_type == 'tool_call' and not ns_tr_out.flag -%}
{{- '<|tool_response>' -}}
{%- elif not (ns_tr_out.flag and not message.get('content')) -%}
{%- elif not (ns_tr_out.flag and not has_content) -%}
{{- '<turn|>\n' -}}
{%- endif -%}
{%- endif -%}
@@ -341,4 +348,4 @@
{%- if ns.prev_message_type != 'tool_response' and ns.prev_message_type != 'tool_call' -%}
{{- '<|turn>model\n' -}}
{%- endif -%}
{%- endif -%}
{%- endif -%}