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

* server: only parse tool calls if tools are provided * still set `resp.Message.Content`

server: only parse tool calls if tools are provided (#5771)
* server: only parse tool calls if tools are provided * still set `resp.Message.Content`
319fb1ce · Jeffrey Morgan · GitHub · b2554455 · 319fb1ce
Unverified Commit 319fb1ce authored Jul 18, 2024 by Jeffrey Morgan Committed by GitHub Jul 18, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

server/routes.go server/routes.go +6 -3

No files found.
--- 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)