Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
update create handler to use model.Name
Michael Yangd61ef8b95402
diff --git a/server/images.go b/server/images.goindex d1d490610..c0fdec597 100644--- a/server/images.go+++ b/server/images.go@@ -314,7 +314,7 @@ func realpath(rel, from string) string {return abspath}-func CreateModel(ctx context.Context, name, modelFileDir, quantization string, modelfile *parser.File, fn func(resp api.ProgressResponse)) (err error) {+func CreateModel(ctx context.Context, name model.Name, modelFileDir, quantization string, modelfile *parser.File, fn func(resp api.ProgressResponse)) (err error) {config := ConfigV2{OS: "linux",Architecture: "amd64",@@ -439,19 +439,27 @@ func CreateModel(ctx context.Context, name, modelFileDir, quantization string, mlayers = append(layers, baseLayer.Layer)}case "license", "template", "system":- blob := strings.NewReader(c.Args)- layer, err := NewLayer(blob, mediatype)- if err != nil {- return err- }-if c.Name != "license" {// replacelayers = slices.DeleteFunc(layers, func(layer *Layer) bool {- return layer.MediaType == mediatype+ if layer.MediaType != mediatype {+ return false+ }++ if err := layer.Remove(); err != nil {+ return false+ }++ return true})}+ blob := strings.NewReader(c.Args)+ layer, err := NewLayer(blob, mediatype)+ if err != nil {+ return err+ }+layers = append(layers, layer)case "message":role, content, ok := strings.Cut(c.Args, ": ")@@ -570,26 +578,15 @@ func CreateModel(ctx context.Context, name, modelFileDir, quantization string, m}}- unref := make(map[string]struct{})- if manifest, _, err := GetManifest(ParseModelPath(name)); err == nil {- for _, layer := range manifest.Layers {- if !slices.Contains(digests, layer.Digest) {- unref[layer.Digest] = struct{}{}- }- }-- if manifest.Config.Digest != layer.Digest {- unref[manifest.Config.Digest] = struct{}{}- }- }+ old, _ := ParseNamedManifest(name)fn(api.ProgressResponse{Status: "writing manifest"})if err := WriteManifest(name, layer, layers); err != nil {return err}- if !envconfig.NoPrune {- if err := deleteUnusedLayers(nil, unref); err != nil {+ if !envconfig.NoPrune && old != nil {+ if err := old.RemoveLayers(); err != nil {return err}}diff --git a/server/manifest.go b/server/manifest.goindex a52512980..d0675724e 100644--- a/server/manifest.go+++ b/server/manifest.go@@ -1,7 +1,6 @@package serverimport (- "bytes""crypto/sha256""encoding/json""fmt"@@ -34,12 +33,6 @@ func (m *Manifest) Remove() error {return err}- for _, layer := range append(m.Layers, m.Config) {- if err := layer.Remove(); err != nil {- return err- }- }-manifests, err := GetManifestPath()if err != nil {return err@@ -48,6 +41,16 @@ func (m *Manifest) Remove() error {return PruneDirectory(manifests)}+func (m *Manifest) RemoveLayers() error {+ for _, layer := range append(m.Layers, m.Config) {+ if err := layer.Remove(); err != nil {+ return err+ }+ }++ return nil+}+func ParseNamedManifest(n model.Name) (*Manifest, error) {if !n.IsFullyQualified() {return nil, model.Unqualified(n)@@ -85,30 +88,31 @@ func ParseNamedManifest(n model.Name) (*Manifest, error) {}, nil}-func WriteManifest(name string, config *Layer, layers []*Layer) error {- manifest := ManifestV2{- SchemaVersion: 2,- MediaType: "application/vnd.docker.distribution.manifest.v2+json",- Config: config,- Layers: layers,+func WriteManifest(name model.Name, config *Layer, layers []*Layer) error {+ manifests, err := GetManifestPath()+ if err != nil {+ return err}- var b bytes.Buffer- if err := json.NewEncoder(&b).Encode(manifest); err != nil {+ p := filepath.Join(manifests, name.Filepath())+ if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {return err}- modelpath := ParseModelPath(name)- manifestPath, err := modelpath.GetManifestPath()+ f, err := os.Create(p)if err != nil {return err}+ defer f.Close()- if err := os.MkdirAll(filepath.Dir(manifestPath), 0o755); err != nil {- return err+ m := ManifestV2{+ SchemaVersion: 2,+ MediaType: "application/vnd.docker.distribution.manifest.v2+json",+ Config: config,+ Layers: layers,}- return os.WriteFile(manifestPath, b.Bytes(), 0o644)+ return json.NewEncoder(f).Encode(m)}func Manifests() (map[model.Name]*Manifest, error) {diff --git a/server/model.go b/server/model.goindex 4f76284df..ee2ae0806 100644--- a/server/model.go+++ b/server/model.go@@ -25,16 +25,14 @@ type layerWithGGML struct {}func parseFromModel(ctx context.Context, name model.Name, fn func(api.ProgressResponse)) (layers []*layerWithGGML, err error) {- modelpath := ParseModelPath(name.String())- manifest, _, err := GetManifest(modelpath)+ m, err := ParseNamedManifest(name)switch {case errors.Is(err, os.ErrNotExist):if err := PullModel(ctx, name.String(), ®istryOptions{}, fn); err != nil {return nil, err}- modelpath = ParseModelPath(name.String())- manifest, _, err = GetManifest(modelpath)+ m, err = ParseNamedManifest(name)if err != nil {return nil, err}@@ -42,8 +40,8 @@ func parseFromModel(ctx context.Context, name model.Name, fn func(api.ProgressRereturn nil, err}- for _, layer := range manifest.Layers {- layer, err := NewLayerFromLayer(layer.Digest, layer.MediaType, modelpath.GetShortTagname())+ for _, layer := range m.Layers {+ layer, err := NewLayerFromLayer(layer.Digest, layer.MediaType, name.DisplayShortest())if err != nil {return nil, err}diff --git a/server/routes.go b/server/routes.goindex cc718156d..56d4307e8 100644--- a/server/routes.go+++ b/server/routes.go@@ -523,8 +523,8 @@ func checkNameExists(name model.Name) error {}func (s *Server) CreateModelHandler(c *gin.Context) {- var req api.CreateRequest- if err := c.ShouldBindJSON(&req); errors.Is(err, io.EOF) {+ var r api.CreateRequest+ if err := c.ShouldBindJSON(&r); errors.Is(err, io.EOF) {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "missing request body"})return} else if err != nil {@@ -532,7 +532,7 @@ func (s *Server) CreateModelHandler(c *gin.Context) {return}- name := model.ParseName(cmp.Or(req.Model, req.Name))+ name := model.ParseName(cmp.Or(r.Model, r.Name))if !name.IsValid() {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": errtypes.InvalidModelNameErrMsg})return@@ -543,24 +543,24 @@ func (s *Server) CreateModelHandler(c *gin.Context) {return}- if req.Path == "" && req.Modelfile == "" {+ if r.Path == "" && r.Modelfile == "" {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "path or modelfile are required"})return}- var r io.Reader = strings.NewReader(req.Modelfile)- if req.Path != "" && req.Modelfile == "" {- f, err := os.Open(req.Path)+ var sr io.Reader = strings.NewReader(r.Modelfile)+ if r.Path != "" && r.Modelfile == "" {+ f, err := os.Open(r.Path)if err != nil {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("error reading modelfile: %s", err)})return}defer f.Close()- r = f+ sr = f}- modelfile, err := parser.ParseFile(r)+ f, err := parser.ParseFile(sr)if err != nil {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": err.Error()})return@@ -576,17 +576,13 @@ func (s *Server) CreateModelHandler(c *gin.Context) {ctx, cancel := context.WithCancel(c.Request.Context())defer cancel()- quantization := req.Quantization- if req.Quantize != "" {- quantization = req.Quantize- }-- if err := CreateModel(ctx, name.String(), filepath.Dir(req.Path), strings.ToUpper(quantization), modelfile, fn); err != nil {+ quantization := cmp.Or(r.Quantize, r.Quantization)+ if err := CreateModel(ctx, name, filepath.Dir(r.Path), strings.ToUpper(quantization), f, fn); err != nil {ch <- gin.H{"error": err.Error()}}}()- if req.Stream != nil && !*req.Stream {+ if r.Stream != nil && !*r.Stream {waitForStream(c, ch)return}@@ -620,6 +616,11 @@ func (s *Server) DeleteModelHandler(c *gin.Context) {c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})return}++ if err := m.RemoveLayers(); err != nil {+ c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})+ return+ }}func (s *Server) ShowModelHandler(c *gin.Context) {diff --git a/server/routes_create_test.go b/server/routes_create_test.goindex e5af1ded2..19bf19ed3 100644--- a/server/routes_create_test.go+++ b/server/routes_create_test.go@@ -158,3 +158,371 @@ func TestCreateFromModel(t *testing.T) {filepath.Join(p, "blobs", "sha256-ca239d7bd8ea90e4a5d2e6bf88f8d74a47b14336e73eb4e18bed4dd325018116"),})}++func TestCreateRemovesLayers(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt }}", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-b507b9c2f6ca642bffcd06665ea7c91f235fd32daeefdf875a0f938db05fb315"),+ filepath.Join(p, "blobs", "sha256-bc80b03733773e0728011b2f4adf34c458b400e1aad48cb28d61170f3a2ad2d6"),+ })++ w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .System }} {{ .Prompt }}", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-8f2c2167d789c6b2302dff965160fa5029f6a24096d262c1cbb469f21a045382"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),+ })+}++func TestCreateUnsetsSystem(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nSYSTEM Say hi!", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-8585df945d1069bc78b79bd10bb73ba07fbc29b0f5479a31a601c0d12731416e"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-f29e82a8284dbdf5910b1555580ff60b04238b8da9d5e51159ada67a4d0d5851"),+ })++ w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nSYSTEM \"\"", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-67d4b8d106af2a5b100a46e9bdc038c71eef2a35c9abac784092654212f97cf5"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"),+ })++ bts, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))+ if err != nil {+ t.Fatal(err)+ }++ if string(bts) != "" {+ t.Fatalf("expected empty string, actual %s", string(bts))+ }+}++func TestCreateMergeParameters(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nPARAMETER temperature 1\nPARAMETER top_k 10\nPARAMETER stop USER:\nPARAMETER stop ASSISTANT:", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),+ filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ })++ // in order to merge parameters, the second model must be created FROM the first+ w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test2",+ Modelfile: "FROM test\nPARAMETER temperature 0.6\nPARAMETER top_p 0.7",+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test2", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),+ filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),+ filepath.Join(p, "blobs", "sha256-4cd9d4ba6b734d9b4cbd1e5caa60374c00722e993fce5e1e2d15a33698f71187"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-e29a7b3c47287a2489c895d21fe413c20f859a85d20e749492f52a838e36e1ba"),+ })++ actual, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-e29a7b3c47287a2489c895d21fe413c20f859a85d20e749492f52a838e36e1ba"))+ if err != nil {+ t.Fatal(err)+ }++ expect, err := json.Marshal(map[string]any{"temperature": 0.6, "top_k": 10, "top_p": 0.7, "stop": []string{"USER:", "ASSISTANT:"}})+ if err != nil {+ t.Fatal(err)+ }++ if !bytes.Equal(bytes.TrimSpace(expect), bytes.TrimSpace(actual)) {+ t.Errorf("expected %s, actual %s", string(expect), string(actual))+ }++ // slices are replaced+ w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test2",+ Modelfile: "FROM test\nPARAMETER temperature 0.6\nPARAMETER top_p 0.7\nPARAMETER stop <|endoftext|>",+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test2", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-12f58bb75cb3042d69a7e013ab87fb3c3c7088f50ddc62f0c77bd332f0d44d35"),+ filepath.Join(p, "blobs", "sha256-1d0ad71299d48c2fb7ae2b98e683643e771f8a5b72be34942af90d97a91c1e37"),+ filepath.Join(p, "blobs", "sha256-257aa726584f24970a4f240765e75a7169bfbe7f4966c1f04513d6b6c860583a"),+ filepath.Join(p, "blobs", "sha256-4a384beaf47a9cbe452dfa5ab70eea691790f3b35a832d12933a1996685bf2b6"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ })++ actual, err = os.ReadFile(filepath.Join(p, "blobs", "sha256-12f58bb75cb3042d69a7e013ab87fb3c3c7088f50ddc62f0c77bd332f0d44d35"))+ if err != nil {+ t.Fatal(err)+ }++ expect, err = json.Marshal(map[string]any{"temperature": 0.6, "top_k": 10, "top_p": 0.7, "stop": []string{"<|endoftext|>"}})+ if err != nil {+ t.Fatal(err)+ }++ if !bytes.Equal(bytes.TrimSpace(expect), bytes.TrimSpace(actual)) {+ t.Errorf("expected %s, actual %s", string(expect), string(actual))+ }+}++func TestCreateReplacesMessages(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nMESSAGE assistant \"What is my purpose?\"\nMESSAGE user \"You run tests.\"\nMESSAGE assistant \"Oh, my god.\"", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-298baeaf6928a60cf666d88d64a1ba606feb43a2865687c39e40652e407bffc4"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-e0e27d47045063ccb167ae852c51d49a98eab33fabaee4633fdddf97213e40b5"),+ })++ w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test2",+ Modelfile: "FROM test\nMESSAGE assistant \"You're a test, Harry.\"\nMESSAGE user \"I-I'm a what?\"\nMESSAGE assistant \"A test. And a thumping good one at that, I'd wager.\"",+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test2", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-298baeaf6928a60cf666d88d64a1ba606feb43a2865687c39e40652e407bffc4"),+ filepath.Join(p, "blobs", "sha256-4f48b25fe9969564c82f58eb1cedbdff6484cc0baf474bc6c2a9b37c8da3362a"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-a60ecc9da299ec7ede453f99236e5577fd125e143689b646d9f0ddc9971bf4db"),+ filepath.Join(p, "blobs", "sha256-e0e27d47045063ccb167ae852c51d49a98eab33fabaee4633fdddf97213e40b5"),+ })++ type message struct {+ Role string `json:"role"`+ Content string `json:"content"`+ }++ f, err := os.Open(filepath.Join(p, "blobs", "sha256-a60ecc9da299ec7ede453f99236e5577fd125e143689b646d9f0ddc9971bf4db"))+ if err != nil {+ t.Fatal(err)+ }+ defer f.Close()++ var actual []message+ if err := json.NewDecoder(f).Decode(&actual); err != nil {+ t.Fatal(err)+ }++ expect := []message{+ {Role: "assistant", Content: "You're a test, Harry."},+ {Role: "user", Content: "I-I'm a what?"},+ {Role: "assistant", Content: "A test. And a thumping good one at that, I'd wager."},+ }++ if !slices.Equal(actual, expect) {+ t.Errorf("expected %s, actual %s", expect, actual)+ }+}++func TestCreateTemplateSystem(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt }}\nSYSTEM Say hello!\nTEMPLATE {{ .System }} {{ .Prompt }}\nSYSTEM Say bye!", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-2b5e330885117c82f3fd75169ea323e141070a2947c11ddb9f79ee0b01c589c1"),+ filepath.Join(p, "blobs", "sha256-4c5f51faac758fecaff8db42f0b7382891a4d0c0bb885f7b86be88c814a7cc86"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),+ })++ template, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"))+ if err != nil {+ t.Fatal(err)+ }++ if string(template) != "{{ .System }} {{ .Prompt }}" {+ t.Errorf("expected \"{{ .System }} {{ .Prompt }}\", actual %s", template)+ }++ system, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-4c5f51faac758fecaff8db42f0b7382891a4d0c0bb885f7b86be88c814a7cc86"))+ if err != nil {+ t.Fatal(err)+ }++ if string(system) != "Say bye!" {+ t.Errorf("expected \"Say bye!\", actual %s", system)+ }+}++func TestCreateLicenses(t *testing.T) {+ p := t.TempDir()+ t.Setenv("OLLAMA_MODELS", p)+ var s Server++ w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ Name: "test",+ Modelfile: fmt.Sprintf("FROM %s\nLICENSE MIT\nLICENSE Apache-2.0", createBinFile(t)),+ Stream: &stream,+ })++ if w.Code != http.StatusOK {+ t.Fatalf("expected status code 200, actual %d", w.Code)+ }++ checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "*", "*"), []string{+ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),+ })++ checkFileExists(t, filepath.Join(p, "blobs", "*"), []string{+ filepath.Join(p, "blobs", "sha256-2af71558e438db0b73a20beab92dc278a94e1bbe974c00c1a33e3ab62d53a608"),+ filepath.Join(p, "blobs", "sha256-79a39c37536ddee29cbadd5d5e2dcba8ed7f03e431f626ff38432c1c866bb7e2"),+ filepath.Join(p, "blobs", "sha256-a4e5e156ddec27e286f75328784d7106b60a4eb1d246e950a001a3f944fbda99"),+ filepath.Join(p, "blobs", "sha256-e5dcffe836b6ec8a58e492419b550e65fb8cbdc308503979e5dacb33ac7ea3b7"),+ })++ mit, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-e5dcffe836b6ec8a58e492419b550e65fb8cbdc308503979e5dacb33ac7ea3b7"))+ if err != nil {+ t.Fatal(err)+ }++ if string(mit) != "MIT" {+ t.Errorf("expected MIT, actual %s", mit)+ }++ apache, err := os.ReadFile(filepath.Join(p, "blobs", "sha256-2af71558e438db0b73a20beab92dc278a94e1bbe974c00c1a33e3ab62d53a608"))+ if err != nil {+ t.Fatal(err)+ }++ if string(apache) != "Apache-2.0" {+ t.Errorf("expected Apache-2.0, actual %s", apache)+ }+}diff --git a/server/routes_test.go b/server/routes_test.goindex 79354017b..8dacaf0a5 100644--- a/server/routes_test.go+++ b/server/routes_test.go@@ -19,6 +19,7 @@ import ("github.com/ollama/ollama/api""github.com/ollama/ollama/parser"+ "github.com/ollama/ollama/types/model""github.com/ollama/ollama/version")@@ -54,6 +55,8 @@ func Test_Routes(t *testing.T) {}createTestModel := func(t *testing.T, name string) {+ t.Helper()+fname := createTestFile(t, "ollama-model")r := strings.NewReader(fmt.Sprintf("FROM %s\nPARAMETER seed 42\nPARAMETER top_p 0.9\nPARAMETER stop foo\nPARAMETER stop bar", fname))@@ -62,7 +65,7 @@ func Test_Routes(t *testing.T) {fn := func(resp api.ProgressResponse) {t.Logf("Status: %s", resp.Status)}- err = CreateModel(context.TODO(), name, "", "", modelfile, fn)+ err = CreateModel(context.TODO(), model.ParseName(name), "", "", modelfile, fn)require.NoError(t, err)}