Merge branch 'stream-tools-stop' into testing

Author: anuraaga

openai/openai.go

@@ -657,26 +657,22 @@ func (w *ChatWriter) writeResponse(data []byte) (int, error) {
 
 	// chat chunk
 	if w.stream {
-		c := toChunk(w.id, chatResponse)
-		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
-		}
+		// If we've already finished, don't send any more chunks with choices.
+		if !w.finished {
+			c := toChunk(w.id, chatResponse)
+			if w.streamUsage {
+				c.Usage = &nullChunkUsage
+			}
+			d, err := json.Marshal(c)
+			if err != nil {
+				return 0, err
+			}
 
-		w.ResponseWriter.Header().Set("Content-Type", "text/event-stream")
-		_, err = w.ResponseWriter.Write([]byte(fmt.Sprintf("data: %s\n\n", d)))
-		if err != nil {
-			return 0, err
+			w.ResponseWriter.Header().Set("Content-Type", "text/event-stream")
+			_, err = w.ResponseWriter.Write([]byte(fmt.Sprintf("data: %s\n\n", d)))
+			if err != nil {
+				return 0, err
+			}
 		}
 
 		if chatResponse.Done {