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

server: only parse tool calls if tools are provided (#5771)

Browse source 
* server: only parse tool calls if tools are provided

* still set `resp.Message.Content`
This commit is contained in:
Jeffrey Morgan 2024-07-18 08:50:23 -07:00 committed by GitHub
parent b255445557
commit 319fb1ce03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/routes.go
View file

@ -1385,9 +1385,12 @@ func (s *Server) ChatHandler(c *gin.Context) {
} }
resp.Message.Content = sb.String() resp.Message.Content = sb.String()
if toolCalls, ok := m.parseToolCalls(sb.String()); ok {
resp.Message.ToolCalls = toolCalls if len(req.Tools) > 0 {
resp.Message.Content = "" if toolCalls, ok := m.parseToolCalls(sb.String()); ok {
resp.Message.ToolCalls = toolCalls
resp.Message.Content = ""
}
} }
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)