Merge pull request #1369 from RedwindA/fix/xai-non-stream

fix xai-non-stream

relay/channel/xai/dto.go

@@ -8,7 +8,7 @@ type ChatCompletionResponse struct {
 	Object            string                         `json:"object"`
 	Object            string                         `json:"object"`
 	Created           int64                          `json:"created"`
 	Created           int64                          `json:"created"`
 	Model             string                         `json:"model"`
 	Model             string                         `json:"model"`
-	Choices           []dto.ChatCompletionsStreamResponseChoice
+	Choices           []dto.OpenAITextResponseChoice `json:"choices"`
 	Usage             *dto.Usage                     `json:"usage"`
 	Usage             *dto.Usage                     `json:"usage"`
 	SystemFingerprint string                         `json:"system_fingerprint"`
 	SystemFingerprint string                         `json:"system_fingerprint"`
 }
 }

relay/channel/xai/text.go

@@ -82,21 +82,26 @@ func xAIHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response
 	defer common.CloseResponseBodyGracefully(resp)
 	defer common.CloseResponseBodyGracefully(resp)
 
 
 	responseBody, err := io.ReadAll(resp.Body)
 	responseBody, err := io.ReadAll(resp.Body)
-	var response *dto.SimpleResponse
-	err = common.Unmarshal(responseBody, &response)
 	if err != nil {
 	if err != nil {
 		return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
 		return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
 	}
 	}
-	response.Usage.CompletionTokens = response.Usage.TotalTokens - response.Usage.PromptTokens
-	response.Usage.CompletionTokenDetails.TextTokens = response.Usage.CompletionTokens - response.Usage.CompletionTokenDetails.ReasoningTokens
+	var xaiResponse ChatCompletionResponse
+	err = common.Unmarshal(responseBody, &xaiResponse)
+	if err != nil {
+		return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
+	}
+	if xaiResponse.Usage != nil {
+		xaiResponse.Usage.CompletionTokens = xaiResponse.Usage.TotalTokens - xaiResponse.Usage.PromptTokens
+		xaiResponse.Usage.CompletionTokenDetails.TextTokens = xaiResponse.Usage.CompletionTokens - xaiResponse.Usage.CompletionTokenDetails.ReasoningTokens
+	}
 
 
 	// new body
 	// new body
-	encodeJson, err := common.Marshal(response)
+	encodeJson, err := common.Marshal(xaiResponse)
 	if err != nil {
 	if err != nil {
 		return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
 		return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
 	}
 	}
 
 
 	common.IOCopyBytesGracefully(c, resp, encodeJson)
 	common.IOCopyBytesGracefully(c, resp, encodeJson)
 
 
-	return &response.Usage, nil
+	return xaiResponse.Usage, nil
 }
 }