Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.
thinking: allow `"think": false` for non-thinking models (#12555)
Patrick Devined681cd7c292a
diff --git a/server/routes.go b/server/routes.goindex 79cfb10c8..67eae34c6 100644--- a/server/routes.go+++ b/server/routes.go@@ -332,14 +332,16 @@ func (s *Server) GenerateHandler(c *gin.Context) {}modelCaps := m.Capabilities()- if req.Think != nil {+ if slices.Contains(modelCaps, model.CapabilityThinking) {caps = append(caps, model.CapabilityThinking)- } else {- // add thinking if the model supports it- if slices.Contains(modelCaps, model.CapabilityThinking) {- caps = append(caps, model.CapabilityThinking)+ if req.Think == nil {req.Think = &api.ThinkValue{Value: true}}+ } else {+ if req.Think != nil && req.Think.Bool() {+ c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("%q does not support thinking", req.Model)})+ return+ }}r, m, opts, err := s.scheduleRunner(c.Request.Context(), name.String(), caps, req.Options, req.KeepAlive)@@ -1877,14 +1879,16 @@ func (s *Server) ChatHandler(c *gin.Context) {}modelCaps := m.Capabilities()- if req.Think != nil {+ if slices.Contains(modelCaps, model.CapabilityThinking) {caps = append(caps, model.CapabilityThinking)- } else {- // add thinking if the model supports it- if slices.Contains(modelCaps, model.CapabilityThinking) {- caps = append(caps, model.CapabilityThinking)+ if req.Think == nil {req.Think = &api.ThinkValue{Value: true}}+ } else {+ if req.Think != nil && req.Think.Bool() {+ c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("%q does not support thinking", req.Model)})+ return+ }}r, m, opts, err := s.scheduleRunner(c.Request.Context(), name.String(), caps, req.Options, req.KeepAlive)diff --git a/server/routes_generate_test.go b/server/routes_generate_test.goindex 10f363c6d..f8dc70d64 100644--- a/server/routes_generate_test.go+++ b/server/routes_generate_test.go@@ -158,11 +158,26 @@ func TestGenerateChat(t *testing.T) {t.Errorf("expected status 400, got %d", w.Code)}- if diff := cmp.Diff(w.Body.String(), `{"error":"registry.ollama.ai/library/test:latest does not support thinking"}`); diff != "" {+ if diff := cmp.Diff(w.Body.String(), `{"error":"\"test\" does not support thinking"}`); diff != "" {t.Errorf("mismatch (-got +want):\n%s", diff)}})+ t.Run("model can't think but think set false", func(t *testing.T) {+ think := false+ w := createRequest(t, s.ChatHandler, api.ChatRequest{+ Model: "test",+ Messages: []api.Message{+ {Role: "user", Content: "Hello!"},+ },+ Think: &api.ThinkValue{Value: think},+ })++ if w.Code != http.StatusOK {+ t.Errorf("expected status 200, got %d", w.Code)+ }+ })+t.Run("missing model", func(t *testing.T) {w := createRequest(t, s.ChatHandler, api.ChatRequest{})if w.Code != http.StatusBadRequest {