mirrors/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-05-11 18:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update routes.go

Browse source
This commit is contained in:
Evariste Galois (Beijing) Technology Inc. 2025-05-10 12:18:28 +08:00 • committed by GitHub
parent 3fa78598a1
commit 51c454b97e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/routes.go
View file

@ -1508,7 +1508,20 @@ func (s *Server) ChatHandler(c *gin.Context) {
return
}
// Merge consecutive user messages (instruction + file content) if present
msgs := append(m.Messages, req.Messages...)
if len(req.Messages) >= 2 &&
req.Messages[0].Role == "user" && req.Messages[1].Role == "user" &&
len(strings.TrimSpace(req.Messages[0].Content)) > 0 && len(strings.TrimSpace(req.Messages[1].Content)) > 0 {
// Merge the first two user messages into one message, preserving order
mergedContent := req.Messages[0].Content + "\n\n" + req.Messages[1].Content
mergedMsg := api.Message{
Role: "user",
Content: mergedContent,
}
msgs = append(m.Messages, append([]api.Message{mergedMsg}, req.Messages[2:]...)...)
}
if req.Messages[0].Role != "system" && m.System != "" {
msgs = append([]api.Message{{Role: "system", Content: m.System}}, msgs...)
}