e2037ad756
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.
90 lines
2.6 KiB
Go
90 lines
2.6 KiB
Go
package jimeng
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"one-api/dto"
|
|
relaycommon "one-api/relay/common"
|
|
"one-api/service"
|
|
"one-api/types"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type ImageResponse struct {
|
|
Code int `json:"code"`
|
|
Message string `json:"message"`
|
|
Data struct {
|
|
BinaryDataBase64 []string `json:"binary_data_base64"`
|
|
ImageUrls []string `json:"image_urls"`
|
|
RephraseResult string `json:"rephraser_result"`
|
|
RequestID string `json:"request_id"`
|
|
// Other fields are omitted for brevity
|
|
} `json:"data"`
|
|
RequestID string `json:"request_id"`
|
|
Status int `json:"status"`
|
|
TimeElapsed string `json:"time_elapsed"`
|
|
}
|
|
|
|
func responseJimeng2OpenAIImage(_ *gin.Context, response *ImageResponse, info *relaycommon.RelayInfo) *dto.ImageResponse {
|
|
imageResponse := dto.ImageResponse{
|
|
Created: info.StartTime.Unix(),
|
|
}
|
|
|
|
for _, base64Data := range response.Data.BinaryDataBase64 {
|
|
imageResponse.Data = append(imageResponse.Data, dto.ImageData{
|
|
B64Json: base64Data,
|
|
})
|
|
}
|
|
for _, imageUrl := range response.Data.ImageUrls {
|
|
imageResponse.Data = append(imageResponse.Data, dto.ImageData{
|
|
Url: imageUrl,
|
|
})
|
|
}
|
|
|
|
return &imageResponse
|
|
}
|
|
|
|
// jimengImageHandler handles the Jimeng image generation response
|
|
func jimengImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.Usage, *types.NewAPIError) {
|
|
var jimengResponse ImageResponse
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
|
|
err = json.Unmarshal(responseBody, &jimengResponse)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
|
|
// Check if the response indicates an error
|
|
if jimengResponse.Code != 10000 {
|
|
return nil, types.WithOpenAIError(types.OpenAIError{
|
|
Message: jimengResponse.Message,
|
|
Type: "jimeng_error",
|
|
Param: "",
|
|
Code: fmt.Sprintf("%d", jimengResponse.Code),
|
|
}, resp.StatusCode)
|
|
}
|
|
|
|
// Convert Jimeng response to OpenAI format
|
|
fullTextResponse := responseJimeng2OpenAIImage(c, &jimengResponse, info)
|
|
jsonResponse, err := json.Marshal(fullTextResponse)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
|
|
c.Writer.Header().Set("Content-Type", "application/json")
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
_, err = c.Writer.Write(jsonResponse)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
|
|
return &dto.Usage{}, nil
|
|
}
|