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.
72 lines
1.9 KiB
Go
72 lines
1.9 KiB
Go
package dto
|
|
|
|
import (
|
|
"encoding/json"
|
|
"one-api/types"
|
|
"strings"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type ImageRequest struct {
|
|
Model string `json:"model"`
|
|
Prompt string `json:"prompt" binding:"required"`
|
|
N uint `json:"n,omitempty"`
|
|
Size string `json:"size,omitempty"`
|
|
Quality string `json:"quality,omitempty"`
|
|
ResponseFormat string `json:"response_format,omitempty"`
|
|
Style string `json:"style,omitempty"`
|
|
User string `json:"user,omitempty"`
|
|
ExtraFields json.RawMessage `json:"extra_fields,omitempty"`
|
|
Background string `json:"background,omitempty"`
|
|
Moderation string `json:"moderation,omitempty"`
|
|
OutputFormat string `json:"output_format,omitempty"`
|
|
Watermark *bool `json:"watermark,omitempty"`
|
|
}
|
|
|
|
func (i *ImageRequest) GetTokenCountMeta() *types.TokenCountMeta {
|
|
var sizeRatio = 1.0
|
|
var qualityRatio = 1.0
|
|
|
|
if strings.HasPrefix(i.Model, "dall-e") {
|
|
// Size
|
|
if i.Size == "256x256" {
|
|
sizeRatio = 0.4
|
|
} else if i.Size == "512x512" {
|
|
sizeRatio = 0.45
|
|
} else if i.Size == "1024x1024" {
|
|
sizeRatio = 1
|
|
} else if i.Size == "1024x1792" || i.Size == "1792x1024" {
|
|
sizeRatio = 2
|
|
}
|
|
|
|
if i.Model == "dall-e-3" && i.Quality == "hd" {
|
|
qualityRatio = 2.0
|
|
if i.Size == "1024x1792" || i.Size == "1792x1024" {
|
|
qualityRatio = 1.5
|
|
}
|
|
}
|
|
}
|
|
|
|
// not support token count for dalle
|
|
return &types.TokenCountMeta{
|
|
CombineText: i.Prompt,
|
|
MaxTokens: 1584,
|
|
ImagePriceRatio: sizeRatio * qualityRatio * float64(i.N),
|
|
}
|
|
}
|
|
|
|
func (i *ImageRequest) IsStream(c *gin.Context) bool {
|
|
return false
|
|
}
|
|
|
|
type ImageResponse struct {
|
|
Data []ImageData `json:"data"`
|
|
Created int64 `json:"created"`
|
|
}
|
|
type ImageData struct {
|
|
Url string `json:"url"`
|
|
B64Json string `json:"b64_json"`
|
|
RevisedPrompt string `json:"revised_prompt"`
|
|
}
|