Merge branch 'stream-tools-stop' into testing

Author: anuraaga

openai/openai.go

@@ -293,6 +293,9 @@ func toChunk(id string, r api.ChatResponse) ChatCompletionChunk {
 			Index: 0,
 			Delta: Message{Role: "assistant", Content: r.Message.Content, ToolCalls: toolCalls},
 			FinishReason: func(reason string) *string {
+				if len(toolCalls) > 0 {
+					reason = "tool_calls"
+				}
 				if len(reason) > 0 {
 					return &reason
 				}
@@ -603,6 +606,7 @@ type BaseWriter struct {
 type ChatWriter struct {
 	stream      bool
 	streamUsage bool
+	finished    bool
 	id          string
 	BaseWriter
 }
@@ -657,6 +661,13 @@ func (w *ChatWriter) writeResponse(data []byte) (int, error) {
 		if w.streamUsage {
 			c.Usage = &nullChunkUsage
 		}
+		if w.finished {
+			// we've already finished the chat, usually for tool calls, so do
+			// not continue to send empty choices.
+			c.Choices = nil
+		} else if len(c.Choices) > 0 && c.Choices[0].FinishReason != nil {
+			w.finished = true
+		}
 		d, err := json.Marshal(c)
 		if err != nil {
 			return 0, err