Skip to content

GitLab

Commit 57ec6901 authored by Michael Yang's avatar Michael Yang
Browse files

revert embedded templates to use prompt/response 

This reverts commit 19753c18.

for compat. messages will be added at a later date
parent e64f9ebb
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 213 deletions
server/routes_create_test.go
View file @ 57ec6901
...@@ -546,8 +546,8 @@ func TestCreateDetectTemplate(t *testing.T) { ...@@ -546,8 +546,8 @@ func TestCreateDetectTemplate(t *testing.T) {
checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{
filepath.Join(p, "blobs", "sha256-553c4a3f747b3d22a4946875f1cc8ed011c2930d83f864a0c7265f9ec0a20413"), filepath.Join(p, "blobs", "sha256-553c4a3f747b3d22a4946875f1cc8ed011c2930d83f864a0c7265f9ec0a20413"),
filepath.Join(p, "blobs", "sha256-68b0323b2f21572bc09ba07554b16b379a5713ee48ef8c25a7661a1f71cfce77"), filepath.Join(p, "blobs", "sha256-c608dc615584cd20d9d830363dabf8a4783ae5d34245c3d8c115edb3bc7b28e4"),
filepath.Join(p, "blobs", "sha256-eb72fb7c550ee1f1dec4039bd65382acecf5f7536a30fb7ccace39a8d0cb590b"), filepath.Join(p, "blobs", "sha256-f836ee110db21567f826332e4cedd746c06d10664fd5a9ea3659e3683a944510"),
}) })
}) })
......
template/alfred.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}<start_system>{{ .System }}<end_message>
{{- end }}
{{- range .Messages }}<start_{{ .Role }}>{{ .Content }}<end_message>
{{- end }}<start_assistant>
{{- else -}}
{{ if .System }}<start_system>{{ .System }}<end_message>{{ end }}{{ if .Prompt }}<start_user>{{ .Prompt }}<end_message>{{ end }}<start_assistant>{{ .Response }}<end_message> {{ if .System }}<start_system>{{ .System }}<end_message>{{ end }}{{ if .Prompt }}<start_user>{{ .Prompt }}<end_message>{{ end }}<start_assistant>{{ .Response }}<end_message>
\ No newline at end of file
{{- end -}}
\ No newline at end of file
template/alpaca.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}{{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}### Instruction:
{{- else if eq .Role "assistant" }}### Response:
{{- end }}
{{ .Content }}
{{ end }}### Response:
{{ else -}}
{{ if .System }}{{ .System }} {{ if .System }}{{ .System }}
{{ end }}{{ if .Prompt }}### Instruction: {{ end }}{{ if .Prompt }}### Instruction:
...@@ -18,4 +6,3 @@ ...@@ -18,4 +6,3 @@
{{ end }}### Response: {{ end }}### Response:
{{ .Response }} {{ .Response }}
{{ end -}}
\ No newline at end of file
template/chatml.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}<|im_start|>system
{{ .System }}<|im_end|>
{{ end }}
{{- range .Messages }}<|im_start|>{{ .Role }}
{{ .Content }}<|im_end|>
{{ end }}<|im_start|>assistant
{{ else -}}
{{ if .System }}<|im_start|>system {{ if .System }}<|im_start|>system
{{ .System }}<|im_end|> {{ .System }}<|im_end|>
{{ end }}{{ if .Prompt }}<|im_start|>user {{ end }}{{ if .Prompt }}<|im_start|>user
{{ .Prompt }}<|im_end|> {{ .Prompt }}<|im_end|>
{{ end }}<|im_start|>assistant {{ end }}<|im_start|>assistant
{{ .Response }}<|im_end|> {{ .Response }}<|im_end|>
{{ end -}}
\ No newline at end of file
template/chatqa.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}System: {{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}User:
{{- else if eq .Role "assistant" }}Assistant:
{{- end }} {{ .Content }}
{{ end }}Assistant:
{{- else -}}
{{ if .System }}System: {{ .System }} {{ if .System }}System: {{ .System }}
{{ end }}{{ if .Prompt }}User: {{ .Prompt }} {{ end }}{{ if .Prompt }}User: {{ .Prompt }}
{{ end }}Assistant: {{ .Response }} {{ end }}Assistant: {{ .Response }}
{{ end -}}
\ No newline at end of file
template/codellama-70b-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}Source: system
{{ .System }} <step> {{ end }}
{{- range .Messages }}Source: {{ .Role }}
{{ .Content }} <step> {{ end }}Source: assistant
Destination: user
{{ else -}}
{{ if .System }}Source: system {{ if .System }}Source: system
{{ .System }} <step> {{ end }}Source: user {{ .System }} <step> {{ end }}Source: user
{{ .Prompt }} <step> Source: assistant {{ .Prompt }} <step> Source: assistant
{{- if not .Response }}
Destination: user Destination: user
{{- end }}
{{ .Response }} <step> {{ .Response }} <step>
\ No newline at end of file
{{- end -}}
\ No newline at end of file
template/falcon-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}System: {{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}User:
{{ else if eq .Role "assistant" }}Falcon:
{{ end }}{{ .Content }}
{{ end }}Falcon:
{{ else -}}
{{ if .System }}System: {{ .System }} {{ if .System }}System: {{ .System }}
{{ end }}{{ if .Prompt }}User: {{ end }}{{ if .Prompt }}User:
{{ .Prompt }} {{ .Prompt }}
{{ end }}Falcon: {{ end }}Falcon:
{{ .Response }} {{ .Response }}
{{ end -}}
\ No newline at end of file
template/gemma-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- range $index, $_ := .Messages }}<start_of_turn>
{{- if eq .Role "user" }}user
{{- if and $.System (eq $index 0) }}
{{ $.System }}
{{- end }}
{{- else if eq .Role "assistant" }}model
{{- end }}
{{ .Content }}<end_of_turn>
{{ end }}<start_of_turn>model
{{ else -}}
<start_of_turn>user <start_of_turn>user
{{ if .System }}{{ .System }} {{ if .System }}{{ .System }}
{{ end }}{{ .Prompt }}<end_of_turn> {{ end }}{{ .Prompt }}<end_of_turn>
<start_of_turn>model <start_of_turn>model
{{ .Response }}<end_of_turn> {{ .Response }}<end_of_turn>
{{ end -}}
\ No newline at end of file
template/granite-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}System:
{{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}Question:
{{- else if eq .Role "assistant" }}Answer:
{{- end }}
{{ .Content }}
{{ end }}Answer:
{{ else -}}
{{ if .System }}System: {{ if .System }}System:
{{ .System }} {{ .System }}
...@@ -20,4 +7,3 @@ ...@@ -20,4 +7,3 @@
{{ end }}Answer: {{ end }}Answer:
{{ .Response }} {{ .Response }}
{{ end -}}
\ No newline at end of file
template/llama2-chat.gotmpl
View file @ 57ec6901
{{- if .Messages }} [INST] <<SYS>>
{{- range $index, $_ := .Messages }} {{- if .System }}
{{- if eq .Role "user" }}[INST] {{ if eq $index 0 }}<<SYS>> {{ .System }}
{{- if $.System }}
{{ $.System }}
{{ end }}<</SYS>> {{ end }}<</SYS>>
{{ end }}{{ .Content }} {{ .Prompt }} [/INST] {{ .Response }}</s><s>
{{- else }} [/INST] {{ .Content }}</s><s> \ No newline at end of file
{{- end }}
{{- end }} [/INST]
{{- else -}}
[INST] <<SYS>>{{ if .System }}{{ .System }}{{ end }}<</SYS>>
{{ .Prompt }} [/INST] {{ .Response }}</s>
{{- end -}}
\ No newline at end of file
template/llama3-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}<|start_header_id|>system<|end_header_id|>
{{ .System }}<|eot_id|>
{{- end }}
{{- range .Messages }}<|start_header_id|>{{ .Role }}<|end_header_id|>
{{ .Content }}<|eot_id|>
{{- end }}<|start_header_id|>assistant<|end_header_id|>
{{ else -}}
{{ if .System }}<|start_header_id|>system<|end_header_id|> {{ if .System }}<|start_header_id|>system<|end_header_id|>
{{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|> {{ .System }}<|eot_id|>{{ end }}{{ if .Prompt }}<|start_header_id|>user<|end_header_id|>
...@@ -16,4 +5,3 @@ ...@@ -16,4 +5,3 @@
{{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|> {{ .Prompt }}<|eot_id|>{{ end }}<|start_header_id|>assistant<|end_header_id|>
{{ .Response }}<|eot_id|> {{ .Response }}<|eot_id|>
\ No newline at end of file
{{- end -}}
\ No newline at end of file
template/magicoder.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}{{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}@@ Instruction
{{- else if eq .Role "assistant" }}@@ Response
{{- end }}
{{ .Content }}
{{ end }}@@ Response
{{ else -}}
{{ if .System }}{{ .System }} {{ if .System }}{{ .System }}
{{ end }}{{ if .Prompt }}@@ Instruction {{ end }}{{ if .Prompt }}@@ Instruction
...@@ -18,4 +6,3 @@ ...@@ -18,4 +6,3 @@
{{ end }}@@ Response {{ end }}@@ Response
{{ .Response }} {{ .Response }}
{{ end -}}
\ No newline at end of file
template/mistral-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }} [INST] {{ if .System }}{{ .System }}
{{- range $index, $_ := .Messages }}
{{- if eq .Role "user" }}[INST] {{ if and $.System (eq (len (slice $.Messages $index)) 1) }}{{ $.System }} {{ end }}{{ .Prompt }}[/INST] {{ .Response }}</s>
{{ end }}{{ .Content }} \ No newline at end of file
{{- else if eq .Role "assistant" }}[/INST] {{ .Content }}</s>
{{- end }}
{{- end }}[/INST]
{{- else -}}
[INST] {{ if .System }}{{ .System }} {{ end }}{{ .Prompt }}[/INST] {{ .Response }}</s>
{{- end -}}
\ No newline at end of file
template/openchat.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}GPT4 Correct System: {{ .System }}<|end_of_turn|>
{{- end }}
{{- range .Messages }}GPT4 Correct
{{- if eq .Role "user" }} User:
{{- else if eq .Role "assistant" }} Assistant:
{{- end }} {{ .Content }}<|end_of_turn|>
{{- end }}GPT4 Correct Assistant:
{{- else -}}
{{ if .System }}GPT4 Correct System: {{ .System }}<|end_of_turn|>{{ end }}GPT4 Correct User: {{ .Prompt }}<|end_of_turn|>GPT4 Correct Assistant: {{ .Response }}<|end_of_turn|> {{ if .System }}GPT4 Correct System: {{ .System }}<|end_of_turn|>{{ end }}GPT4 Correct User: {{ .Prompt }}<|end_of_turn|>GPT4 Correct Assistant: {{ .Response }}<|end_of_turn|>
\ No newline at end of file
{{- end -}}
\ No newline at end of file
template/phi-3.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}<|system|>
{{ .System }}<|end|>
{{ end }}
{{- range .Messages }}<|{{ .Role }}|>
{{ .Content }}<|end|>
{{ end }}<|assistant|>
{{ else -}}
{{ if .System }}<|system|> {{ if .System }}<|system|>
{{ .System }}<|end|> {{ .System }}<|end|>
{{ end }}{{ if .Prompt }}<|user|> {{ end }}{{ if .Prompt }}<|user|>
{{ .Prompt }}<|end|> {{ .Prompt }}<|end|>
{{ end }}<|assistant|> {{ end }}<|assistant|>
{{ .Response }}<|end|> {{ .Response }}<|end|>
{{ end -}}
\ No newline at end of file
template/solar-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}### System:
{{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}### User:
{{ .Content }}
{{ else if eq .Role "assistant" }}### Assistant:
{{ .Content }}</s>
{{ end }}
{{ end }}### Assistant:
{{ else -}}
{{ if .System }}### System: {{ if .System }}### System:
{{ .System }} {{ .System }}
...@@ -20,4 +7,3 @@ ...@@ -20,4 +7,3 @@
{{ end }}### Assistant: {{ end }}### Assistant:
{{ .Response }}</s> {{ .Response }}</s>
{{ end -}}
\ No newline at end of file
template/starcoder2-instruct.gotmpl
View file @ 57ec6901
{{- if .Messages }}
{{- if .System }}{{ .System }}
{{ end }}
{{- range .Messages }}
{{- if eq .Role "user" }}### Instruction
{{ .Content }}
{{ else if eq .Role "assistant" }}### Response
{{ .Content }}<|endoftext|>
{{ end }}
{{- end }}### Response
{{ else -}}
{{ if .System }}{{ .System }} {{ if .System }}{{ .System }}
{{ end }}{{ if .Prompt }}### Instruction {{ end }}{{ if .Prompt }}### Instruction
...@@ -20,4 +6,3 @@ ...@@ -20,4 +6,3 @@
{{ end }}### Response {{ end }}### Response
{{ .Response }}<|endoftext|> {{ .Response }}<|endoftext|>
{{ end -}}
\ No newline at end of file
template/template_test.go
View file @ 57ec6901
...@@ -116,7 +116,14 @@ func TestTemplate(t *testing.T) { ...@@ -116,7 +116,14 @@ func TestTemplate(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if diff := cmp.Diff(actual.Bytes(), expect); diff != "" { bts := actual.Bytes()
if slices.Contains([]string{"chatqa.gotmpl", "llama2-chat.gotmpl", "mistral-instruct.gotmpl", "openchat.gotmpl", "vicuna.gotmpl"}, match) && bts[len(bts)-1] == ' ' {
t.Log("removing trailing space from output")
bts = bts[:len(bts)-1]
}
if diff := cmp.Diff(bts, expect); diff != "" {
t.Errorf("mismatch (-got +want):\n%s", diff) t.Errorf("mismatch (-got +want):\n%s", diff)
} }
}) })
...@@ -203,11 +210,18 @@ func TestExecuteWithMessages(t *testing.T) { ...@@ -203,11 +210,18 @@ func TestExecuteWithMessages(t *testing.T) {
{ {
"mistral", "mistral",
[]template{ []template{
{"no response", `[INST] {{ if .System }}{{ .System }}{{ "\n\n" }}{{ end }}{{ .Prompt }}[/INST] `}, {"no response", `[INST] {{ if .System }}{{ .System }}
{"response", `[INST] {{ if .System }}{{ .System }}{{ "\n\n" }}{{ end }}{{ .Prompt }}[/INST] {{ .Response }}`},
{"messages", `{{- range $index, $_ := .Messages }} {{ end }}{{ .Prompt }}[/INST] `},
{{- if eq .Role "user" }}[INST] {{ if and (eq $index 0) $.System }}{{ $.System }}{{ "\n\n" }} {"response", `[INST] {{ if .System }}{{ .System }}
{{- end }}{{ .Content }}[/INST] {{ else if eq .Role "assistant" }}{{ .Content }}
{{ end }}{{ .Prompt }}[/INST] {{ .Response }}`},
{"messages", `{{- $system := aggregate $.Messages "system" -}}
{{- range $index, $_ := .Messages }}
{{- if eq .Role "user" }}[INST] {{ if $system }}{{ $system }}
{{- $system = "" }}
{{ end }}{{ .Content }}[/INST] {{ else if eq .Role "assistant" }}{{ .Content }}
{{- end }} {{- end }}
{{- end }}`}, {{- end }}`},
}, },
...@@ -223,12 +237,18 @@ func TestExecuteWithMessages(t *testing.T) { ...@@ -223,12 +237,18 @@ func TestExecuteWithMessages(t *testing.T) {
{ {
"mistral system", "mistral system",
[]template{ []template{
{"no response", `[INST] {{ if .System }}{{ .System }}{{ "\n\n" }}{{ end }}{{ .Prompt }}[/INST] `}, {"no response", `[INST] {{ if .System }}{{ .System }}
{"response", `[INST] {{ if .System }}{{ .System }}{{ "\n\n" }}{{ end }}{{ .Prompt }}[/INST] {{ .Response }}`},
{"messages", ` {{ end }}{{ .Prompt }}[/INST] `},
{"response", `[INST] {{ if .System }}{{ .System }}
{{ end }}{{ .Prompt }}[/INST] {{ .Response }}`},
{"messages", `{{- $system := aggregate $.Messages "system" -}}
{{- range $index, $_ := .Messages }} {{- range $index, $_ := .Messages }}
{{- if eq .Role "user" }}[INST] {{ if and (eq $index 0) $.System }}{{ $.System }}{{ "\n\n" }} {{- if eq .Role "user" }}[INST] {{ if $system }}{{ $system }}
{{- end }}{{ .Content }}[/INST] {{ else if eq .Role "assistant" }}{{ .Content }} {{- $system = "" }}
{{ end }}{{ .Content }}[/INST] {{ else if eq .Role "assistant" }}{{ .Content }}
{{- end }} {{- end }}
{{- end }}`}, {{- end }}`},
}, },
...@@ -256,12 +276,9 @@ Hello friend![/INST] Hello human![INST] What is your name?[/INST] `, ...@@ -256,12 +276,9 @@ Hello friend![/INST] Hello human![INST] What is your name?[/INST] `,
{{ .Response }}<|im_end|> {{ .Response }}<|im_end|>
`}, `},
{"messages", ` {"messages", `
{{- range $index, $_ := .Messages }} {{- range $index, $_ := .Messages }}<|im_start|>{{ .Role }}
{{- if and (eq .Role "user") (eq $index 0) $.System }}<|im_start|>system {{ .Content }}<|im_end|>
{{ $.System }}<|im_end|>{{ "\n" }} {{ end }}<|im_start|>assistant
{{- end }}<|im_start|>{{ .Role }}
{{ .Content }}<|im_end|>{{ "\n" }}
{{- end }}<|im_start|>assistant
`}, `},
}, },
Values{ Values{
...@@ -294,9 +311,11 @@ What is your name?<|im_end|> ...@@ -294,9 +311,11 @@ What is your name?<|im_end|>
`}, `},
{"messages", ` {"messages", `
{{- range .Messages }} {{- range .Messages }}
{{- if eq .Role "user" }}Question: {{ .Content }}{{ "\n\n" }} {{- if eq .Role "user" }}Question: {{ .Content }}
{{- else if eq .Role "assistant" }}Answer: {{ .Content }}{{ "\n\n" }}
{{- end }} {{ else if eq .Role "assistant" }}Answer: {{ .Content }}
{{ end }}
{{- end }}Answer: `}, {{- end }}Answer: `},
}, },
Values{ Values{
......
template/testdata/llama2-chat.gotmpl/system-user-assistant-user
View file @ 57ec6901
...@@ -2,4 +2,6 @@ ...@@ -2,4 +2,6 @@
You are a helpful assistant. You are a helpful assistant.
<</SYS>> <</SYS>>
Hello, how are you? [/INST] I'm doing great. How can I help you today?</s><s>[INST] I'd like to show off how chat templating works! [/INST] Hello, how are you? [/INST] I'm doing great. How can I help you today?</s><s>[INST] <<SYS>><</SYS>>
\ No newline at end of file
I'd like to show off how chat templating works! [/INST]
\ No newline at end of file
template/testdata/llama2-chat.gotmpl/user-assistant-user
View file @ 57ec6901
[INST] <<SYS>><</SYS>> [INST] <<SYS>><</SYS>>
Hello, how are you? [/INST] I'm doing great. How can I help you today?</s><s>[INST] I'd like to show off how chat templating works! [/INST] Hello, how are you? [/INST] I'm doing great. How can I help you today?</s><s>[INST] <<SYS>><</SYS>>
\ No newline at end of file
I'd like to show off how chat templating works! [/INST]
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment