jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server/routes: catch when JSON tool was used

Browse Source
This commit is contained in:
ParthSareen 2025-05-02 14:16:39 -07:00
parent 610054a234
commit 7f2f996cd6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/routes.go
View File

@ -1553,12 +1553,13 @@ func (s *Server) ChatHandler(c *gin.Context) {
toolCallIndex++ toolCallIndex++
} }
res.Message.Content = "" res.Message.Content = ""
sb.Reset()
ch <- res ch <- res
// Only way to have multiple calls is to have [] which is derived or provided // Only way to have multiple calls is to have [] which is derived or provided
if templateToolToken == "" { // This case occurs when the tool call is a json block - do not allow tool calls again
if templateToolToken == "" || (templateToolToken != "" && !strings.HasPrefix(sb.String(), templateToolToken)) {
checkToolCall = false checkToolCall = false
} }
sb.Reset()
return return
} }
} }