Upload 2 files

api/chatgpt/api.go

@@ -35,7 +35,7 @@ func CreateConversation(c *gin.Context) {
 		c.AbortWithStatusJSON(http.StatusBadRequest, api.ReturnMessage(parseJsonErrorMessage))
 		return
 	}
-	
+
 	if request.ConversationID == nil || *request.ConversationID == "" {
 		request.ConversationID = nil
 	}
@@ -81,15 +81,15 @@ func CreateConversation(c *gin.Context) {
 		return
 	}
 
-	Status, ConversationID := api.HandleConversationResponse(c, resp)
+	Status, ConversationID, part := api.HandleConversationResponse(c, resp, "")
 	if Status {
-		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model)
+		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model, part)
 	}
 }
 
-func ContinueConversation(c *gin.Context, conversationID string, parentMessageID string, model string) {
+func ContinueConversation(c *gin.Context, conversationID string, parentMessageID string, model string, oldpart string) {
 	var request ContinueConversationRequest
-	
+
 	request.ConversationID = &conversationID
 	request.ParentMessageID = parentMessageID
 	request.Model = model
@@ -133,9 +133,9 @@ func ContinueConversation(c *gin.Context, conversationID string, parentMessageID
 		return
 	}
 
-	Status, ConversationID := api.HandleConversationResponse(c, resp)
+	Status, ConversationID, part := api.HandleConversationResponse(c, resp, oldpart)
 	if Status {
-		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model)
+		ContinueConversation(c, ConversationID, request.ParentMessageID, request.Model, part)
 	}
 }
 

api/common.go

@@ -72,19 +72,24 @@ func GetAccessToken(accessToken string) string {
 }
 
 //goland:noinspection GoUnhandledErrorResult
-func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, string) {
+func HandleConversationResponse(c *gin.Context, resp *http.Response, text string) (bool, string, string) {
 	Status := false
 	ConversationID := ""
+	part := ""
 	c.Writer.Header().Set("Content-Type", "text/event-stream; charset=utf-8")
 
 	reader := bufio.NewReader(resp.Body)
 	for {
 		if c.Request.Context().Err() != nil {
+			c.Writer.Write([]byte("data: " + "\n\n"))
+			c.Writer.Flush()
 			break
 		}
 
 		line, err := reader.ReadString('\n')
 		if err != nil {
+			c.Writer.Write([]byte("data: " + "\n\n"))
+			c.Writer.Flush()
 			break
 		}
 
@@ -96,15 +101,28 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 			continue
 		}
 
-		if strings.HasPrefix(line, "[DONE]") ||
-			Status {
+		if strings.HasPrefix(line, "[DONE]") || Status {
 			break
+		} else if text == "" {
+			var result map[string]interface{}
+			err := json.Unmarshal([]byte(line[6:]), &result)
+			if err == nil {
+				message := result["message"].(map[string]interface{})
+				content := message["content"].(map[string]interface{})
+				parts := content["parts"].([]interface{})
+				part = parts[0].(string)
+				parts[0] = text + part
+				resultJSON, err2 := json.Marshal(result)
+				if err2 == nil {
+					line = "data: " + string(resultJSON)
+				}
+			}
 		}
 
 		c.Writer.Write([]byte(line + "\n\n"))
 		c.Writer.Flush()
 		if strings.HasPrefix(line, "[DONE]") {
-			continue
+			break
 		}
 
 		data := line[6:]
@@ -128,7 +146,7 @@ func HandleConversationResponse(c *gin.Context, resp *http.Response) (bool, stri
 			}
 		}
 	}
-	return Status, ConversationID
+	return Status, ConversationID, part
 }
 
 //goland:noinspection GoUnhandledErrorResult,SpellCheckingInspection