This commit introduces a major architectural refactoring to improve quota management, centralize logging, and streamline the relay handling logic. Key changes: - **Pre-consume Quota:** Implements a new mechanism to check and reserve user quota *before* making the request to the upstream provider. This ensures more accurate quota deduction and prevents users from exceeding their limits due to concurrent requests. - **Unified Relay Handlers:** Refactors the relay logic to use generic handlers (e.g., `ChatHandler`, `ImageHandler`) instead of provider-specific implementations. This significantly reduces code duplication and simplifies adding new channels. - **Centralized Logger:** A new dedicated `logger` package is introduced, and all system logging calls are migrated to use it, moving this responsibility out of the `common` package. - **Code Reorganization:** DTOs are generalized (e.g., `dalle.go` -> `openai_image.go`) and utility code is moved to more appropriate packages (e.g., `common/http.go` -> `service/http.go`) for better code structure.
151 lines
4.2 KiB
Go
151 lines
4.2 KiB
Go
package cloudflare
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"one-api/dto"
|
|
"one-api/logger"
|
|
relaycommon "one-api/relay/common"
|
|
"one-api/relay/helper"
|
|
"one-api/service"
|
|
"one-api/types"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func convertCf2CompletionsRequest(textRequest dto.GeneralOpenAIRequest) *CfRequest {
|
|
p, _ := textRequest.Prompt.(string)
|
|
return &CfRequest{
|
|
Prompt: p,
|
|
MaxTokens: textRequest.GetMaxTokens(),
|
|
Stream: textRequest.Stream,
|
|
Temperature: textRequest.Temperature,
|
|
}
|
|
}
|
|
|
|
func cfStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*types.NewAPIError, *dto.Usage) {
|
|
scanner := bufio.NewScanner(resp.Body)
|
|
scanner.Split(bufio.ScanLines)
|
|
|
|
helper.SetEventStreamHeaders(c)
|
|
id := helper.GetResponseID(c)
|
|
var responseText string
|
|
isFirst := true
|
|
|
|
for scanner.Scan() {
|
|
data := scanner.Text()
|
|
if len(data) < len("data: ") {
|
|
continue
|
|
}
|
|
data = strings.TrimPrefix(data, "data: ")
|
|
data = strings.TrimSuffix(data, "\r")
|
|
|
|
if data == "[DONE]" {
|
|
break
|
|
}
|
|
|
|
var response dto.ChatCompletionsStreamResponse
|
|
err := json.Unmarshal([]byte(data), &response)
|
|
if err != nil {
|
|
logger.LogError(c, "error_unmarshalling_stream_response: "+err.Error())
|
|
continue
|
|
}
|
|
for _, choice := range response.Choices {
|
|
choice.Delta.Role = "assistant"
|
|
responseText += choice.Delta.GetContentString()
|
|
}
|
|
response.Id = id
|
|
response.Model = info.UpstreamModelName
|
|
err = helper.ObjectData(c, response)
|
|
if isFirst {
|
|
isFirst = false
|
|
info.FirstResponseTime = time.Now()
|
|
}
|
|
if err != nil {
|
|
logger.LogError(c, "error_rendering_stream_response: "+err.Error())
|
|
}
|
|
}
|
|
|
|
if err := scanner.Err(); err != nil {
|
|
logger.LogError(c, "error_scanning_stream_response: "+err.Error())
|
|
}
|
|
usage := service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
|
|
if info.ShouldIncludeUsage {
|
|
response := helper.GenerateFinalUsageResponse(id, info.StartTime.Unix(), info.UpstreamModelName, *usage)
|
|
err := helper.ObjectData(c, response)
|
|
if err != nil {
|
|
logger.LogError(c, "error_rendering_final_usage_response: "+err.Error())
|
|
}
|
|
}
|
|
helper.Done(c)
|
|
|
|
service.CloseResponseBodyGracefully(resp)
|
|
|
|
return nil, usage
|
|
}
|
|
|
|
func cfHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*types.NewAPIError, *dto.Usage) {
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
var response dto.TextResponse
|
|
err = json.Unmarshal(responseBody, &response)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
response.Model = info.UpstreamModelName
|
|
var responseText string
|
|
for _, choice := range response.Choices {
|
|
responseText += choice.Message.StringContent()
|
|
}
|
|
usage := service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
|
|
response.Usage = *usage
|
|
response.Id = helper.GetResponseID(c)
|
|
jsonResponse, err := json.Marshal(response)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
c.Writer.Header().Set("Content-Type", "application/json")
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
_, _ = c.Writer.Write(jsonResponse)
|
|
return nil, usage
|
|
}
|
|
|
|
func cfSTTHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*types.NewAPIError, *dto.Usage) {
|
|
var cfResp CfAudioResponse
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
err = json.Unmarshal(responseBody, &cfResp)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
|
|
audioResp := &dto.AudioResponse{
|
|
Text: cfResp.Result.Text,
|
|
}
|
|
|
|
jsonResponse, err := json.Marshal(audioResp)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeBadResponseBody), nil
|
|
}
|
|
c.Writer.Header().Set("Content-Type", "application/json")
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
_, _ = c.Writer.Write(jsonResponse)
|
|
|
|
usage := &dto.Usage{}
|
|
usage.PromptTokens = info.PromptTokens
|
|
usage.CompletionTokens = service.CountTextToken(cfResp.Result.Text, info.UpstreamModelName)
|
|
usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
|
|
|
|
return nil, usage
|
|
}
|