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

* server: only parse tool calls if tools are provided * still set `resp.Message.Content`
longamu · Jul 18, 2024 · 319fb1c · 319fb1c
1 parent b255445
commit 319fb1c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/server/routes.go b/server/routes.go
@@ -1385,9 +1385,12 @@ func (s *Server) ChatHandler(c *gin.Context) {
 		}
 
 		resp.Message.Content = sb.String()
-		if toolCalls, ok := m.parseToolCalls(sb.String()); ok {
-			resp.Message.ToolCalls = toolCalls
-			resp.Message.Content = ""
+
+		if len(req.Tools) > 0 {
+			if toolCalls, ok := m.parseToolCalls(sb.String()); ok {
+				resp.Message.ToolCalls = toolCalls
+				resp.Message.Content = ""
+			}
 		}
 
 		c.JSON(http.StatusOK, resp)