From 28a136e9a304b5ed913df7a6d798bbfac1efa602 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 17 Jul 2023 12:08:10 -0700 Subject: [PATCH 1/3] modelfile params --- go.mod | 2 +- go.sum | 35 ++----------------- server/images.go | 88 ++++++++++++++++++++++++++++++++++++------------ server/routes.go | 23 ++++++++----- 4 files changed, 85 insertions(+), 63 deletions(-) diff --git a/go.mod b/go.mod index c2e15346..f5fee20d 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( ) require ( + dario.cat/mergo v1.0.0 github.com/bytedance/sonic v1.9.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect @@ -27,7 +28,6 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/leodido/go-urn v1.2.4 // indirect - github.com/lithammer/fuzzysearch v1.1.8 github.com/mattn/go-isatty v0.0.19 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/go.sum b/go.sum index 2adee49d..735413a3 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= @@ -38,8 +40,6 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= -github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= -github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= @@ -80,54 +80,23 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/server/images.go b/server/images.go index 7121b673..a57f27a9 100644 --- a/server/images.go +++ b/server/images.go @@ -14,6 +14,7 @@ import ( "os" "path" "path/filepath" + "reflect" "strconv" "strings" @@ -125,21 +126,17 @@ func GetModel(name string) (*Model, error) { } model.Prompt = string(data) case "application/vnd.ollama.image.params": - /* - f, err = os.Open(filename) - if err != nil { - return nil, err - } - */ + params, err := os.Open(filename) + if err != nil { + return nil, err + } + defer params.Close() var opts api.Options - /* - decoder = json.NewDecoder(f) - err = decoder.Decode(&opts) - if err != nil { - return nil, err - } - */ + if err = json.NewDecoder(params).Decode(&opts); err != nil { + return nil, err + } + model.Options = opts } } @@ -170,7 +167,7 @@ func CreateModel(name string, mf io.Reader, fn func(status string)) error { } var layers []*LayerWithBuffer - param := make(map[string]string) + params := make(map[string]string) for _, c := range commands { log.Printf("[%s] - %s\n", c.Name, c.Arg) @@ -226,15 +223,15 @@ func CreateModel(name string, mf io.Reader, fn func(status string)) error { l.MediaType = "application/vnd.ollama.image.prompt" layers = append(layers, l) default: - param[c.Name] = c.Arg + params[c.Name] = c.Arg } } // Create a single layer for the parameters - fn("creating parameter layer") - if len(param) > 0 { + if len(params) > 0 { + fn("creating parameter layer") layers = removeLayerFromLayers(layers, "application/vnd.ollama.image.params") - paramData, err := paramsToReader(param) + paramData, err := paramsToReader(params) if err != nil { return fmt.Errorf("couldn't create params json: %v", err) } @@ -367,13 +364,62 @@ func GetLayerWithBufferFromLayer(layer *Layer) (*LayerWithBuffer, error) { return newLayer, nil } -func paramsToReader(m map[string]string) (io.Reader, error) { - data, err := json.MarshalIndent(m, "", " ") +func paramsToReader(params map[string]string) (io.Reader, error) { + opts := api.DefaultOptions() + typeOpts := reflect.TypeOf(opts) + + // build map of json struct tags + jsonOpts := make(map[string]reflect.StructField) + for _, field := range reflect.VisibleFields(typeOpts) { + jsonTag := strings.Split(field.Tag.Get("json"), ",")[0] + if jsonTag != "" { + jsonOpts[jsonTag] = field + } + } + + valueOpts := reflect.ValueOf(&opts).Elem() + // iterate params and set values based on json struct tags + for key, val := range params { + if opt, ok := jsonOpts[key]; ok { + field := valueOpts.FieldByName(opt.Name) + if field.IsValid() && field.CanSet() { + switch field.Kind() { + case reflect.Float32: + floatVal, err := strconv.ParseFloat(val, 32) + if err != nil { + return nil, fmt.Errorf("invalid float value %s", val) + } + + field.SetFloat(floatVal) + case reflect.Int: + intVal, err := strconv.ParseInt(val, 10, 0) + if err != nil { + return nil, fmt.Errorf("invalid int value %s", val) + } + + field.SetInt(intVal) + case reflect.Bool: + boolVal, err := strconv.ParseBool(val) + if err != nil { + return nil, fmt.Errorf("invalid bool value %s", val) + } + + field.SetBool(boolVal) + case reflect.String: + field.SetString(val) + default: + return nil, fmt.Errorf("unknown type %s for %s", field.Kind(), key) + } + } + } + } + + bts, err := json.Marshal(opts) if err != nil { return nil, err } - return strings.NewReader(string(data)), nil + return bytes.NewReader(bts), nil } func getLayerDigests(layers []*LayerWithBuffer) ([]string, error) { diff --git a/server/routes.go b/server/routes.go index fea96df8..67c09948 100644 --- a/server/routes.go +++ b/server/routes.go @@ -2,7 +2,6 @@ package server import ( "encoding/json" - "fmt" "io" "log" "net" @@ -13,6 +12,7 @@ import ( "text/template" "time" + "dario.cat/mergo" "github.com/gin-gonic/gin" "github.com/jmorganca/ollama/api" @@ -31,11 +31,7 @@ func cacheDir() string { func generate(c *gin.Context) { start := time.Now() - req := api.GenerateRequest{ - Options: api.DefaultOptions(), - Prompt: "", - } - + var req api.GenerateRequest if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return @@ -47,6 +43,17 @@ func generate(c *gin.Context) { return } + opts := api.DefaultOptions() + if err := mergo.Merge(&opts, model.Options, mergo.WithOverride); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + + if err := mergo.Merge(&opts, req.Options, mergo.WithOverride); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + return + } + templ, err := template.New("").Parse(model.Prompt) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) @@ -60,9 +67,9 @@ func generate(c *gin.Context) { } req.Prompt = sb.String() - fmt.Printf("prompt = >>>%s<<<\n", req.Prompt) + log.Printf("prompt: \n%s", req.Prompt) - llm, err := llama.New(model.ModelPath, req.Options) + llm, err := llama.New(model.ModelPath, opts) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return From 53d0052c6c588cfe91a7cd0622ab4800ccf6f6ad Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 17 Jul 2023 12:33:39 -0700 Subject: [PATCH 2/3] unavoid unnecessary type conversion --- server/images.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/images.go b/server/images.go index a57f27a9..75d970db 100644 --- a/server/images.go +++ b/server/images.go @@ -634,7 +634,7 @@ func pullModelManifest(registryURL, repoName, tag, username, password string) (* // Check for success: For a successful upload, the Docker registry will respond with a 201 Created if resp.StatusCode != http.StatusOK { body, _ := io.ReadAll(resp.Body) - return nil, fmt.Errorf("registry responded with code %d: %v", resp.StatusCode, string(body)) + return nil, fmt.Errorf("registry responded with code %d: %s", resp.StatusCode, body) } var m *ManifestV2 @@ -695,7 +695,7 @@ func startUpload(registryURL string, repositoryName string, username string, pas // Check for success if resp.StatusCode != http.StatusAccepted { body, _ := io.ReadAll(resp.Body) - return "", fmt.Errorf("registry responded with code %d: %v", resp.StatusCode, string(body)) + return "", fmt.Errorf("registry responded with code %d: %s", resp.StatusCode, body) } // Extract UUID location from header From c7dd52271c5ab1d5182549d2a0e8d2340ad68bc0 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Mon, 17 Jul 2023 12:39:55 -0700 Subject: [PATCH 3/3] remove debugging messages --- server/images.go | 6 ++---- server/routes.go | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/images.go b/server/images.go index 75d970db..4a7aa206 100644 --- a/server/images.go +++ b/server/images.go @@ -821,13 +821,11 @@ func downloadBlob(registryURL, repoName, digest string, username, password strin for { fn(fmt.Sprintf("Downloading %s", digest), digest, int(total), int(completed), float64(completed)/float64(total)) if completed >= total { - fmt.Printf("finished downloading\n") - err = os.Rename(fp+"-partial", fp) - if err != nil { - fmt.Printf("error: %v\n", err) + if err := os.Rename(fp+"-partial", fp); err != nil { fn(fmt.Sprintf("error renaming file: %v", err), digest, int(total), int(completed), 1) return err } + break } diff --git a/server/routes.go b/server/routes.go index 67c09948..af7e59fa 100644 --- a/server/routes.go +++ b/server/routes.go @@ -67,8 +67,6 @@ func generate(c *gin.Context) { } req.Prompt = sb.String() - log.Printf("prompt: \n%s", req.Prompt) - llm, err := llama.New(model.ModelPath, opts) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})