From 86a874fcebc84187026ab7431f095b5bd47396d6 Mon Sep 17 00:00:00 2001 From: Josh Yan Date: Mon, 29 Jul 2024 14:37:21 -0700 Subject: [PATCH] fmt --- parser/parser.go | 2 +- server/images.go | 2 +- server/manifest.go | 4 ++-- server/routes_create_test.go | 30 +++++++++++++++--------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/parser/parser.go b/parser/parser.go index 5133e8d43..913891297 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -139,7 +139,7 @@ func ParseFile(r io.Reader) (*File, error) { } continue - } else if isSpace(r){ + } else if isSpace(r) { return nil, errInvalidVersion } else if _, err := semver.NewVersion(s); err != nil { return nil, errInvalidVersion diff --git a/server/images.go b/server/images.go index 295a60768..c606698a6 100644 --- a/server/images.go +++ b/server/images.go @@ -550,7 +550,7 @@ func CreateModel(ctx context.Context, name model.Name, modelFileDir, quantizatio } } } - } + } var err2 error layers = slices.DeleteFunc(layers, func(layer *Layer) bool { diff --git a/server/manifest.go b/server/manifest.go index 9104e257b..954ed7650 100644 --- a/server/manifest.go +++ b/server/manifest.go @@ -18,7 +18,7 @@ type Manifest struct { MediaType string `json:"mediaType"` Config *Layer `json:"config"` Layers []*Layer `json:"layers"` - Ollama string `json:"ollama"` + Ollama string `json:"ollama"` filepath string fi os.FileInfo @@ -116,7 +116,7 @@ func WriteManifest(name model.Name, config *Layer, layers []*Layer, ollama strin MediaType: "application/vnd.docker.distribution.manifest.v2+json", Config: config, Layers: layers, - Ollama: ollama, + Ollama: ollama, } return json.NewEncoder(f).Encode(m) diff --git a/server/routes_create_test.go b/server/routes_create_test.go index 284798e5f..1ca225111 100644 --- a/server/routes_create_test.go +++ b/server/routes_create_test.go @@ -498,7 +498,7 @@ func TestCreateTemplateSystem(t *testing.T) { Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt", createBinFile(t, nil, nil)), Stream: &stream, }) - + if w.Code != http.StatusBadRequest { t.Fatalf("expected status code 400, actual %d", w.Code) } @@ -510,7 +510,7 @@ func TestCreateTemplateSystem(t *testing.T) { Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ if .Prompt }}", createBinFile(t, nil, nil)), Stream: &stream, }) - + if w.Code != http.StatusBadRequest { t.Fatalf("expected status code 400, actual %d", w.Code) } @@ -522,7 +522,7 @@ func TestCreateTemplateSystem(t *testing.T) { Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ Prompt }}", createBinFile(t, nil, nil)), Stream: &stream, }) - + if w.Code != http.StatusBadRequest { t.Fatalf("expected status code 400, actual %d", w.Code) } @@ -624,7 +624,7 @@ func TestCreateDetectTemplate(t *testing.T) { }) } -func TestCreateVersion(t *testing.T){ +func TestCreateVersion(t *testing.T) { gin.SetMode(gin.TestMode) p := t.TempDir() @@ -640,12 +640,12 @@ func TestCreateVersion(t *testing.T){ 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"), }) - + f, err := os.Open(filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest")) if err != nil { t.Fatal(err) @@ -667,11 +667,11 @@ func TestCreateVersion(t *testing.T){ Modelfile: fmt.Sprintf("FROM %s\nLICENSE MIT\nLICENSE Apache-2.0", createBinFile(t, nil, nil)), Stream: &stream, }) - + if w.Code != http.StatusOK { t.Fatalf("expected status code 200, actual %d", w.Code) } - + checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "noversion", "*"), []string{ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "noversion", "latest"), }) @@ -686,7 +686,7 @@ func TestCreateVersion(t *testing.T){ if err := bts.Decode(&m); err != nil { t.Fatal(err) } - + if m.Ollama != "" { t.Errorf("got %s != want \"\"", m.Ollama) } @@ -713,25 +713,25 @@ func TestCreateVersion(t *testing.T){ if w.Code != http.StatusOK { t.Fatalf("expected status code 200, actual %d", w.Code) - } - + } + checkFileExists(t, filepath.Join(p, "manifests", "*", "*", "fromvalid", "*"), []string{ filepath.Join(p, "manifests", "registry.ollama.ai", "library", "fromvalid", "latest"), }) - + f, err := os.Open(filepath.Join(p, "manifests", "registry.ollama.ai", "library", "fromvalid", "latest")) if err != nil { t.Fatal(err) } bts := json.NewDecoder(f) - + var m Manifest if err := bts.Decode(&m); err != nil { t.Fatal(err) } - + if m.Ollama != "0.2.3" { t.Errorf("got %s != want 0.2.3", m.Ollama) } }) -} \ No newline at end of file +}