Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
server: clean up route names for consistency (#6524)
Jeffrey Morgan47fa0839b970
diff --git a/server/routes.go b/server/routes.goindex 6c470c174..5e9f51e12 100644--- a/server/routes.go+++ b/server/routes.go@@ -463,7 +463,7 @@ func (s *Server) EmbeddingsHandler(c *gin.Context) {c.JSON(http.StatusOK, resp)}-func (s *Server) PullModelHandler(c *gin.Context) {+func (s *Server) PullHandler(c *gin.Context) {var req api.PullRequesterr := c.ShouldBindJSON(&req)switch {@@ -513,7 +513,7 @@ func (s *Server) PullModelHandler(c *gin.Context) {streamResponse(c, ch)}-func (s *Server) PushModelHandler(c *gin.Context) {+func (s *Server) PushHandler(c *gin.Context) {var req api.PushRequesterr := c.ShouldBindJSON(&req)switch {@@ -577,7 +577,7 @@ func checkNameExists(name model.Name) error {return nil}-func (s *Server) CreateModelHandler(c *gin.Context) {+func (s *Server) CreateHandler(c *gin.Context) {var r api.CreateRequestif err := c.ShouldBindJSON(&r); errors.Is(err, io.EOF) {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "missing request body"})@@ -647,7 +647,7 @@ func (s *Server) CreateModelHandler(c *gin.Context) {streamResponse(c, ch)}-func (s *Server) DeleteModelHandler(c *gin.Context) {+func (s *Server) DeleteHandler(c *gin.Context) {var r api.DeleteRequestif err := c.ShouldBindJSON(&r); errors.Is(err, io.EOF) {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "missing request body"})@@ -680,7 +680,7 @@ func (s *Server) DeleteModelHandler(c *gin.Context) {}}-func (s *Server) ShowModelHandler(c *gin.Context) {+func (s *Server) ShowHandler(c *gin.Context) {var req api.ShowRequesterr := c.ShouldBindJSON(&req)switch {@@ -829,7 +829,7 @@ func getKVData(digest string, verbose bool) (llm.KV, error) {return kv, nil}-func (s *Server) ListModelsHandler(c *gin.Context) {+func (s *Server) ListHandler(c *gin.Context) {ms, err := Manifests()if err != nil {c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})@@ -879,7 +879,7 @@ func (s *Server) ListModelsHandler(c *gin.Context) {c.JSON(http.StatusOK, api.ListResponse{Models: models})}-func (s *Server) CopyModelHandler(c *gin.Context) {+func (s *Server) CopyHandler(c *gin.Context) {var r api.CopyRequestif err := c.ShouldBindJSON(&r); errors.Is(err, io.EOF) {c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "missing request body"})@@ -1081,33 +1081,33 @@ func (s *Server) GenerateRoutes() http.Handler {allowedHostsMiddleware(s.addr),)- r.POST("/api/pull", s.PullModelHandler)+ r.POST("/api/pull", s.PullHandler)r.POST("/api/generate", s.GenerateHandler)r.POST("/api/chat", s.ChatHandler)r.POST("/api/embed", s.EmbedHandler)r.POST("/api/embeddings", s.EmbeddingsHandler)- r.POST("/api/create", s.CreateModelHandler)- r.POST("/api/push", s.PushModelHandler)- r.POST("/api/copy", s.CopyModelHandler)- r.DELETE("/api/delete", s.DeleteModelHandler)- r.POST("/api/show", s.ShowModelHandler)+ r.POST("/api/create", s.CreateHandler)+ r.POST("/api/push", s.PushHandler)+ r.POST("/api/copy", s.CopyHandler)+ r.DELETE("/api/delete", s.DeleteHandler)+ r.POST("/api/show", s.ShowHandler)r.POST("/api/blobs/:digest", s.CreateBlobHandler)r.HEAD("/api/blobs/:digest", s.HeadBlobHandler)- r.GET("/api/ps", s.ProcessHandler)+ r.GET("/api/ps", s.PsHandler)// Compatibility endpointsr.POST("/v1/chat/completions", openai.ChatMiddleware(), s.ChatHandler)r.POST("/v1/completions", openai.CompletionsMiddleware(), s.GenerateHandler)r.POST("/v1/embeddings", openai.EmbeddingsMiddleware(), s.EmbedHandler)- r.GET("/v1/models", openai.ListMiddleware(), s.ListModelsHandler)- r.GET("/v1/models/:model", openai.RetrieveMiddleware(), s.ShowModelHandler)+ r.GET("/v1/models", openai.ListMiddleware(), s.ListHandler)+ r.GET("/v1/models/:model", openai.RetrieveMiddleware(), s.ShowHandler)for _, method := range []string{http.MethodGet, http.MethodHead} {r.Handle(method, "/", func(c *gin.Context) {c.String(http.StatusOK, "Ollama is running")})- r.Handle(method, "/api/tags", s.ListModelsHandler)+ r.Handle(method, "/api/tags", s.ListHandler)r.Handle(method, "/api/version", func(c *gin.Context) {c.JSON(http.StatusOK, gin.H{"version": version.Version})})@@ -1269,7 +1269,7 @@ func streamResponse(c *gin.Context, ch chan any) {})}-func (s *Server) ProcessHandler(c *gin.Context) {+func (s *Server) PsHandler(c *gin.Context) {models := []api.ProcessModelResponse{}for _, v := range s.sched.loaded {diff --git a/server/routes_create_test.go b/server/routes_create_test.goindex 4de07b252..d436f26cd 100644--- a/server/routes_create_test.go+++ b/server/routes_create_test.go@@ -93,7 +93,7 @@ func TestCreateFromBin(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),Stream: &stream,@@ -120,7 +120,7 @@ func TestCreateFromModel(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),Stream: &stream,@@ -134,7 +134,7 @@ func TestCreateFromModel(t *testing.T) {filepath.Join(p, "manifests", "registry.ollama.ai", "library", "test", "latest"),})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test2",Modelfile: "FROM test",Stream: &stream,@@ -162,7 +162,7 @@ func TestCreateRemovesLayers(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt }}", createBinFile(t, nil, nil)),Stream: &stream,@@ -182,7 +182,7 @@ func TestCreateRemovesLayers(t *testing.T) {filepath.Join(p, "blobs", "sha256-bc80b03733773e0728011b2f4adf34c458b400e1aad48cb28d61170f3a2ad2d6"),})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .System }} {{ .Prompt }}", createBinFile(t, nil, nil)),Stream: &stream,@@ -210,7 +210,7 @@ func TestCreateUnsetsSystem(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nSYSTEM Say hi!", createBinFile(t, nil, nil)),Stream: &stream,@@ -230,7 +230,7 @@ func TestCreateUnsetsSystem(t *testing.T) {filepath.Join(p, "blobs", "sha256-f29e82a8284dbdf5910b1555580ff60b04238b8da9d5e51159ada67a4d0d5851"),})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nSYSTEM \"\"", createBinFile(t, nil, nil)),Stream: &stream,@@ -267,7 +267,7 @@ func TestCreateMergeParameters(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nPARAMETER temperature 1\nPARAMETER top_k 10\nPARAMETER stop USER:\nPARAMETER stop ASSISTANT:", createBinFile(t, nil, nil)),Stream: &stream,@@ -288,7 +288,7 @@ func TestCreateMergeParameters(t *testing.T) {})// in order to merge parameters, the second model must be created FROM the first- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test2",Modelfile: "FROM test\nPARAMETER temperature 0.6\nPARAMETER top_p 0.7",Stream: &stream,@@ -326,7 +326,7 @@ func TestCreateMergeParameters(t *testing.T) {}// slices are replaced- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test2",Modelfile: "FROM test\nPARAMETER temperature 0.6\nPARAMETER top_p 0.7\nPARAMETER stop <|endoftext|>",Stream: &stream,@@ -371,7 +371,7 @@ func TestCreateReplacesMessages(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, 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, nil, nil)),Stream: &stream,@@ -391,7 +391,7 @@ func TestCreateReplacesMessages(t *testing.T) {filepath.Join(p, "blobs", "sha256-e0e27d47045063ccb167ae852c51d49a98eab33fabaee4633fdddf97213e40b5"),})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, 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,@@ -448,7 +448,7 @@ func TestCreateTemplateSystem(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt }}\nSYSTEM Say hello!\nTEMPLATE {{ .System }} {{ .Prompt }}\nSYSTEM Say bye!", createBinFile(t, nil, nil)),Stream: &stream,@@ -488,7 +488,7 @@ func TestCreateTemplateSystem(t *testing.T) {}t.Run("incomplete template", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .Prompt", createBinFile(t, nil, nil)),Stream: &stream,@@ -500,7 +500,7 @@ func TestCreateTemplateSystem(t *testing.T) {})t.Run("template with unclosed if", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ if .Prompt }}", createBinFile(t, nil, nil)),Stream: &stream,@@ -512,7 +512,7 @@ func TestCreateTemplateSystem(t *testing.T) {})t.Run("template with undefined function", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ Prompt }}", createBinFile(t, nil, nil)),Stream: &stream,@@ -531,7 +531,7 @@ func TestCreateLicenses(t *testing.T) {t.Setenv("OLLAMA_MODELS", p)var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s\nLICENSE MIT\nLICENSE Apache-2.0", createBinFile(t, nil, nil)),Stream: &stream,@@ -579,7 +579,7 @@ func TestCreateDetectTemplate(t *testing.T) {var s Servert.Run("matched", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, llm.KV{"tokenizer.chat_template": "{{ bos_token }}{% for message in messages %}{{'<|' + message['role'] + '|>' + '\n' + message['content'] + '<|end|>\n' }}{% endfor %}{% if add_generation_prompt %}{{ '<|assistant|>\n' }}{% else %}{{ eos_token }}{% endif %}",@@ -600,7 +600,7 @@ func TestCreateDetectTemplate(t *testing.T) {})t.Run("unmatched", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),Stream: &stream,diff --git a/server/routes_delete_test.go b/server/routes_delete_test.goindex 82fac9f52..5a337e794 100644--- a/server/routes_delete_test.go+++ b/server/routes_delete_test.go@@ -22,7 +22,7 @@ func TestDelete(t *testing.T) {var s Server- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),})@@ -31,7 +31,7 @@ func TestDelete(t *testing.T) {t.Fatalf("expected status code 200, actual %d", w.Code)}- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: "test2",Modelfile: fmt.Sprintf("FROM %s\nTEMPLATE {{ .System }} {{ .Prompt }}", createBinFile(t, nil, nil)),})@@ -52,7 +52,7 @@ func TestDelete(t *testing.T) {filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),})- w = createRequest(t, s.DeleteModelHandler, api.DeleteRequest{Name: "test"})+ w = createRequest(t, s.DeleteHandler, api.DeleteRequest{Name: "test"})if w.Code != http.StatusOK {t.Fatalf("expected status code 200, actual %d", w.Code)@@ -68,7 +68,7 @@ func TestDelete(t *testing.T) {filepath.Join(p, "blobs", "sha256-fe7ac77b725cda2ccad03f88a880ecdfd7a33192d6cae08fce2c0ee1455991ed"),})- w = createRequest(t, s.DeleteModelHandler, api.DeleteRequest{Name: "test2"})+ w = createRequest(t, s.DeleteHandler, api.DeleteRequest{Name: "test2"})if w.Code != http.StatusOK {t.Fatalf("expected status code 200, actual %d", w.Code)@@ -102,7 +102,7 @@ func TestDeleteDuplicateLayers(t *testing.T) {t.Fatal(err)}- w := createRequest(t, s.DeleteModelHandler, api.DeleteRequest{Name: "test"})+ w := createRequest(t, s.DeleteHandler, api.DeleteRequest{Name: "test"})if w.Code != http.StatusOK {t.Errorf("expected status code 200, actual %d", w.Code)}diff --git a/server/routes_generate_test.go b/server/routes_generate_test.goindex 5c0caff1c..480b96721 100644--- a/server/routes_generate_test.go+++ b/server/routes_generate_test.go@@ -84,7 +84,7 @@ func TestGenerateChat(t *testing.T) {go s.sched.Run(context.TODO())- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Model: "test",Modelfile: fmt.Sprintf(`FROM %sTEMPLATE """@@ -144,7 +144,7 @@ func TestGenerateChat(t *testing.T) {})t.Run("missing capabilities chat", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Model: "bert",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, llm.KV{"general.architecture": "bert",@@ -270,7 +270,7 @@ func TestGenerateChat(t *testing.T) {checkChatResponse(t, w.Body, "test", "Hi!")})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Model: "test-system",Modelfile: "FROM test\nSYSTEM You are a helpful assistant.",})@@ -382,7 +382,7 @@ func TestGenerate(t *testing.T) {go s.sched.Run(context.TODO())- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Model: "test",Modelfile: fmt.Sprintf(`FROM %sTEMPLATE """@@ -442,7 +442,7 @@ func TestGenerate(t *testing.T) {})t.Run("missing capabilities generate", func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Model: "bert",Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, llm.KV{"general.architecture": "bert",@@ -583,7 +583,7 @@ func TestGenerate(t *testing.T) {checkGenerateResponse(t, w.Body, "test", "Hi!")})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Model: "test-system",Modelfile: "FROM test\nSYSTEM You are a helpful assistant.",})@@ -652,7 +652,7 @@ func TestGenerate(t *testing.T) {checkGenerateResponse(t, w.Body, "test-system", "Abra kadabra!")})- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Model: "test-suffix",Modelfile: `FROM testTEMPLATE """{{- if .Suffix }}<PRE> {{ .Prompt }} <SUF>{{ .Suffix }} <MID>diff --git a/server/routes_list_test.go b/server/routes_list_test.goindex 6e92b7a1a..56b408300 100644--- a/server/routes_list_test.go+++ b/server/routes_list_test.go@@ -31,13 +31,13 @@ func TestList(t *testing.T) {var s Serverfor _, n := range expectNames {- createRequest(t, s.CreateModelHandler, api.CreateRequest{+ createRequest(t, s.CreateHandler, api.CreateRequest{Name: n,Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),})}- w := createRequest(t, s.ListModelsHandler, nil)+ w := createRequest(t, s.ListHandler, nil)if w.Code != http.StatusOK {t.Fatalf("expected status code 200, actual %d", w.Code)}diff --git a/server/routes_test.go b/server/routes_test.goindex 242875d6c..bffcea205 100644--- a/server/routes_test.go+++ b/server/routes_test.go@@ -318,7 +318,7 @@ func TestCase(t *testing.T) {var s Serverfor _, tt := range cases {t.Run(tt, func(t *testing.T) {- w := createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w := createRequest(t, s.CreateHandler, api.CreateRequest{Name: tt,Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),Stream: &stream,@@ -334,7 +334,7 @@ func TestCase(t *testing.T) {}t.Run("create", func(t *testing.T) {- w = createRequest(t, s.CreateModelHandler, api.CreateRequest{+ w = createRequest(t, s.CreateHandler, api.CreateRequest{Name: strings.ToUpper(tt),Modelfile: fmt.Sprintf("FROM %s", createBinFile(t, nil, nil)),Stream: &stream,@@ -350,7 +350,7 @@ func TestCase(t *testing.T) {})t.Run("pull", func(t *testing.T) {- w := createRequest(t, s.PullModelHandler, api.PullRequest{+ w := createRequest(t, s.PullHandler, api.PullRequest{Name: strings.ToUpper(tt),Stream: &stream,})@@ -365,7 +365,7 @@ func TestCase(t *testing.T) {})t.Run("copy", func(t *testing.T) {- w := createRequest(t, s.CopyModelHandler, api.CopyRequest{+ w := createRequest(t, s.CopyHandler, api.CopyRequest{Source: tt,Destination: strings.ToUpper(tt),})@@ -387,7 +387,7 @@ func TestShow(t *testing.T) {var s Server- createRequest(t, s.CreateModelHandler, api.CreateRequest{+ createRequest(t, s.CreateHandler, api.CreateRequest{Name: "show-model",Modelfile: fmt.Sprintf("FROM %s\nFROM %s",@@ -396,7 +396,7 @@ func TestShow(t *testing.T) {),})- w := createRequest(t, s.ShowModelHandler, api.ShowRequest{+ w := createRequest(t, s.ShowHandler, api.ShowRequest{Name: "show-model",})