highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-11 18:57:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

thinking: allow "think": false for non-thinking models (#12555)

Browse Source
This commit is contained in:
Patrick Devine
2025-10-09 18:46:00 -07:00
committed by GitHub
parent 47298fce39
commit d681cd7c29
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/routes.go
View File

@@ -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)