mirrors/ollama-for-amd
1
0
Fork 0
mirror of https://github.com/likelovewant/ollama-for-amd.git synced 2025-12-21 14:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cloud: don't error sending empty messages (#12724)

Browse Source
This commit is contained in:
Patrick Devine
2025-10-21 18:12:14 -07:00
committed by GitHub
parent 5fe7ba1b9b
commit d515aed6c3
2 changed files with 89 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/routes.go
View File

@@ -1874,10 +1874,14 @@ func (s *Server) ChatHandler(c *gin.Context) {
req.Options = map[string]any{}
}
msgs := append(m.Messages, req.Messages...)
if req.Messages[0].Role != "system" && m.System != "" {
msgs = append([]api.Message{{Role: "system", Content: m.System}}, msgs...)
var msgs []api.Message
if len(req.Messages) > 0 {
msgs = append(m.Messages, req.Messages...)
if req.Messages[0].Role != "system" && m.System != "" {
msgs = append([]api.Message{{Role: "system", Content: m.System}}, msgs...)
}
}
msgs = filterThinkTags(msgs, m)
req.Messages = msgs