From 4dcceeffb7ad9bd656c11c43c8112195f78e6bf8 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Tue, 17 Oct 2023 15:53:46 -0700 Subject: [PATCH] let the template do the work --- server/images.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/server/images.go b/server/images.go index cf1ecf5b..80018efd 100644 --- a/server/images.go +++ b/server/images.go @@ -901,18 +901,17 @@ func ShowModelfile(model *Model) (string, error) { var mt struct { *Model From string - Parameters []string + Parameters map[string][]any } + mt.Parameters = make(map[string][]any) for k, v := range model.Options { - switch v := v.(type) { - case []interface{}: - for _, nv := range v { - mt.Parameters = append(mt.Parameters, fmt.Sprintf("%s %v", k, nv)) - } - default: - mt.Parameters = append(mt.Parameters, fmt.Sprintf("%s %v", k, v)) + if s, ok := v.([]any); ok { + mt.Parameters[k] = s + continue } + + mt.Parameters[k] = []any{v} } mt.Model = model @@ -937,8 +936,10 @@ SYSTEM """{{ .System }}""" ADAPTER {{ $adapter }} {{- end }} -{{- range $parameter := .Parameters }} -PARAMETER {{ $parameter }} +{{- range $k, $v := .Parameters }} +{{- range $parameter := $v }} +PARAMETER {{ $k }} {{ printf "%#v" $parameter }} +{{- end }} {{- end }}` tmpl, err := template.New("").Parse(modelFile)