Skip to content

Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.

remove template (#5655)

Patrick Devine057d31861e35
diff --git a/api/types.go b/api/types.go
index 87844c67c..91c97c715 100644
--- a/api/types.go
+++ b/api/types.go
@@ -221,6 +221,8 @@ type DeleteRequest struct {
type ShowRequest struct {
Model string `json:"model"`
System string `json:"system"`
+
+ // Template is deprecated
Template string `json:"template"`
Verbose bool `json:"verbose"`
diff --git a/cmd/cmd.go b/cmd/cmd.go
index c898c7db6..2252a905e 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -843,7 +843,6 @@ type runOptions struct {
WordWrap bool
Format string
System string
- Template string
Images []api.ImageData
Options map[string]interface{}
MultiModal bool
@@ -1037,7 +1036,6 @@ func generate(cmd *cobra.Command, opts runOptions) error {
Images: opts.Images,
Format: opts.Format,
System: opts.System,
- Template: opts.Template,
Options: opts.Options,
KeepAlive: opts.KeepAlive,
}
diff --git a/cmd/interactive.go b/cmd/interactive.go
index 9214f2db5..adbc3e9fb 100644
--- a/cmd/interactive.go
+++ b/cmd/interactive.go
@@ -27,7 +27,6 @@ const (
MultilineNone MultilineState = iota
MultilinePrompt
MultilineSystem
- MultilineTemplate
)
func loadModel(cmd *cobra.Command, opts *runOptions) error {
@@ -94,7 +93,6 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
fmt.Fprintln(os.Stderr, "Available Commands:")
fmt.Fprintln(os.Stderr, " /set parameter ... Set a parameter")
fmt.Fprintln(os.Stderr, " /set system <string> Set system message")
- fmt.Fprintln(os.Stderr, " /set template <string> Set prompt template")
fmt.Fprintln(os.Stderr, " /set history Enable history")
fmt.Fprintln(os.Stderr, " /set nohistory Disable history")
fmt.Fprintln(os.Stderr, " /set wordwrap Enable wordwrap")
@@ -204,10 +202,6 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
opts.Messages = append(opts.Messages, api.Message{Role: "system", Content: opts.System})
fmt.Println("Set system message.")
sb.Reset()
- case MultilineTemplate:
- opts.Template = sb.String()
- fmt.Println("Set prompt template.")
- sb.Reset()
}
multiline = MultilineNone
@@ -326,17 +320,13 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
}
fmt.Printf("Set parameter '%s' to '%s'\n", args[2], strings.Join(params, ", "))
opts.Options[args[2]] = fp[args[2]]
- case "system", "template":
+ case "system":
if len(args) < 3 {
usageSet()
continue
}
- if args[1] == "system" {
- multiline = MultilineSystem
- } else if args[1] == "template" {
- multiline = MultilineTemplate
- }
+ multiline = MultilineSystem
line := strings.Join(args[2:], " ")
line, ok := strings.CutPrefix(line, `"""`)
@@ -356,23 +346,17 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
continue
}
- if args[1] == "system" {
- opts.System = sb.String() // for display in modelfile
- newMessage := api.Message{Role: "system", Content: sb.String()}
- // Check if the slice is not empty and the last message is from 'system'
- if len(opts.Messages) > 0 && opts.Messages[len(opts.Messages)-1].Role == "system" {
- // Replace the last message
- opts.Messages[len(opts.Messages)-1] = newMessage
- } else {
- opts.Messages = append(opts.Messages, newMessage)
- }
- fmt.Println("Set system message.")
- sb.Reset()
- } else if args[1] == "template" {
- opts.Template = sb.String()
- fmt.Println("Set prompt template.")
- sb.Reset()
+ opts.System = sb.String() // for display in modelfile
+ newMessage := api.Message{Role: "system", Content: sb.String()}
+ // Check if the slice is not empty and the last message is from 'system'
+ if len(opts.Messages) > 0 && opts.Messages[len(opts.Messages)-1].Role == "system" {
+ // Replace the last message
+ opts.Messages[len(opts.Messages)-1] = newMessage
+ } else {
+ opts.Messages = append(opts.Messages, newMessage)
}
+ fmt.Println("Set system message.")
+ sb.Reset()
sb.Reset()
continue
@@ -393,7 +377,6 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
req := &api.ShowRequest{
Name: opts.Model,
System: opts.System,
- Template: opts.Template,
Options: opts.Options,
}
resp, err := client.Show(cmd.Context(), req)
@@ -437,12 +420,9 @@ func generateInteractive(cmd *cobra.Command, opts runOptions) error {
fmt.Println("No system message was specified for this model.")
}
case "template":
- switch {
- case opts.Template != "":
- fmt.Println(opts.Template + "\n")
- case resp.Template != "":
+ if resp.Template != "" {
fmt.Println(resp.Template)
- default:
+ } else {
fmt.Println("No prompt template was specified for this model.")
}
default:
@@ -536,10 +516,6 @@ func buildModelfile(opts runOptions) string {
fmt.Fprintf(&mf, "SYSTEM \"\"\"%s\"\"\"\n", opts.System)
}
- if opts.Template != "" {
- fmt.Fprintf(&mf, "TEMPLATE \"\"\"%s\"\"\"\n", opts.Template)
- }
-
keys := make([]string, 0)
for k := range opts.Options {
keys = append(keys, k)
diff --git a/cmd/interactive_test.go b/cmd/interactive_test.go
index d9af01eb8..711f38604 100644
--- a/cmd/interactive_test.go
+++ b/cmd/interactive_test.go
@@ -59,7 +59,6 @@ func TestModelfileBuilder(t *testing.T) {
opts := runOptions{
Model: "hork",
System: "You are part horse and part shark, but all hork. Do horklike things",
- Template: "This is a template.",
Messages: []api.Message{
{Role: "user", Content: "Hey there hork!"},
{Role: "assistant", Content: "Yes it is true, I am half horse, half shark."},
@@ -75,7 +74,6 @@ func TestModelfileBuilder(t *testing.T) {
mf := buildModelfile(opts)
expectedModelfile := `FROM {{.Model}}
SYSTEM """{{.System}}"""
-TEMPLATE """{{.Template}}"""
PARAMETER penalize_newline false
PARAMETER seed 42
PARAMETER stop [hi there]
@@ -97,7 +95,6 @@ MESSAGE assistant """Yes it is true, I am half horse, half shark."""
mf = buildModelfile(opts)
expectedModelfile = `FROM {{.ParentModel}}
SYSTEM """{{.System}}"""
-TEMPLATE """{{.Template}}"""
PARAMETER penalize_newline false
PARAMETER seed 42
PARAMETER stop [hi there]
diff --git a/server/routes.go b/server/routes.go
index edaec6912..0a00d9e23 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -574,13 +574,6 @@ func GetModelInfo(req api.ShowRequest) (*api.ShowResponse, error) {
m.System = req.System
}
- if req.Template != "" {
- m.Template, err = template.Parse(req.Template)
- if err != nil {
- return nil, err
- }
- }
-
msgs := make([]api.Message, len(m.Messages))
for i, msg := range m.Messages {
msgs[i] = api.Message{Role: msg.Role, Content: msg.Content}