up

mirrors2 · Nov 17, 2024 · 0397e4f · 0397e4f
1 parent 78e3be4
commit 0397e4f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/openai/chat.go b/pkg/openai/chat.go
@@ -273,10 +273,10 @@ func ChatProxy(c *gin.Context, chatReq *ChatCompletionRequest) {
 		return
 	}
 	defer resp.Body.Close()
-	teeReader := io.TeeReader(resp.Body, c.Writer)
 
 	var result string
 	if chatReq.Stream {
+		teeReader := io.TeeReader(resp.Body, c.Writer)
 		// 流式响应
 		scanner := bufio.NewScanner(teeReader)
 
@@ -312,8 +312,12 @@ func ChatProxy(c *gin.Context, chatReq *ChatCompletionRequest) {
 
 		}
 	} else {
+		if resp.StatusCode != http.StatusOK {
+			io.Copy(c.Writer, resp.Body)
+			return
+		}
 		// 处理非流式响应
-		body, err := io.ReadAll(teeReader)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			fmt.Println("Error reading response body:", err)
 			return
@@ -337,6 +341,7 @@ func ChatProxy(c *gin.Context, chatReq *ChatCompletionRequest) {
 			}
 
 		}
+		c.JSON(http.StatusOK, string(body))
 	}
 	usagelog.CompletionCount = tokenizer.NumTokensFromStr(result, chatReq.Model)
 	usagelog.Cost = fmt.Sprintf("%.6f", tokenizer.Cost(usagelog.Model, usagelog.PromptCount, usagelog.CompletionCount))