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.
61 lines
1.3 KiB
Go
61 lines
1.3 KiB
Go
package dto
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/gin-gonic/gin"
|
|
"one-api/types"
|
|
"strings"
|
|
)
|
|
|
|
type RerankRequest struct {
|
|
Documents []any `json:"documents"`
|
|
Query string `json:"query"`
|
|
Model string `json:"model"`
|
|
TopN int `json:"top_n,omitempty"`
|
|
ReturnDocuments *bool `json:"return_documents,omitempty"`
|
|
MaxChunkPerDoc int `json:"max_chunk_per_doc,omitempty"`
|
|
OverLapTokens int `json:"overlap_tokens,omitempty"`
|
|
}
|
|
|
|
func (r *RerankRequest) IsStream(c *gin.Context) bool {
|
|
return false
|
|
}
|
|
|
|
func (r *RerankRequest) GetTokenCountMeta() *types.TokenCountMeta {
|
|
var texts = make([]string, 0)
|
|
|
|
for _, document := range r.Documents {
|
|
texts = append(texts, fmt.Sprintf("%v", document))
|
|
}
|
|
|
|
if r.Query != "" {
|
|
texts = append(texts, r.Query)
|
|
}
|
|
|
|
return &types.TokenCountMeta{
|
|
CombineText: strings.Join(texts, "\n"),
|
|
}
|
|
}
|
|
|
|
func (r *RerankRequest) GetReturnDocuments() bool {
|
|
if r.ReturnDocuments == nil {
|
|
return false
|
|
}
|
|
return *r.ReturnDocuments
|
|
}
|
|
|
|
type RerankResponseResult struct {
|
|
Document any `json:"document,omitempty"`
|
|
Index int `json:"index"`
|
|
RelevanceScore float64 `json:"relevance_score"`
|
|
}
|
|
|
|
type RerankDocument struct {
|
|
Text any `json:"text"`
|
|
}
|
|
|
|
type RerankResponse struct {
|
|
Results []RerankResponseResult `json:"results"`
|
|
Usage Usage `json:"usage"`
|
|
}
|