tcsenpai/ollama
1
0
Fork 0
mirror of https://github.com/tcsenpai/ollama.git synced 2025-06-09 04:35:21 +00:00
Code Issues Packages Projects Releases 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

3
server/routes.go
View File

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