baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix hanging issue when sending empty content (#2399)

Browse source
This commit is contained in:
Jeffrey Morgan 2024-02-07 19:30:33 -05:00 committed by GitHub
parent ab0d37fde4
commit a0a199b108
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/images.go
View file

@ -181,6 +181,8 @@ func (m *Model) ChatPrompts(msgs []api.Message) (*ChatHistory, error) {
}
currentVars.Prompt = msg.Content
if len(m.ProjectorPaths) > 0 {
for i := range msg.Images {
id := len(images) + i
currentVars.Prompt += fmt.Sprintf(" [img-%d]", id)
@ -191,6 +193,7 @@ func (m *Model) ChatPrompts(msgs []api.Message) (*ChatHistory, error) {
}
images = append(images, currentVars.Images...)
}
case "assistant":
currentVars.Response = msg.Content
prompts = append(prompts, currentVars)

24
server/routes.go
View file

@ -1136,18 +1136,6 @@ func ChatHandler(c *gin.Context) {
return
}
// an empty request loads the model
if len(req.Messages) == 0 {
resp := api.ChatResponse{
CreatedAt: time.Now().UTC(),
Model: req.Model,
Done: true,
Message: api.Message{Role: "assistant"},
}
c.JSON(http.StatusOK, resp)
return
}
checkpointLoaded := time.Now()
chat, err := model.ChatPrompts(req.Messages)
@ -1162,6 +1150,18 @@ func ChatHandler(c *gin.Context) {
return
}
// an empty request loads the model
if len(prompt) == 0 {
resp := api.ChatResponse{
CreatedAt: time.Now().UTC(),
Model: req.Model,
Done: true,
Message: api.Message{Role: "assistant"},
}
c.JSON(http.StatusOK, resp)
return
}
slog.Debug("chat handler", "prompt", prompt)
ch := make(chan any)