feat: support /v1/rerank router

This commit is contained in:
nongqiqin 2024-04-30 12:29:41 +08:00
parent 2720e1a358
commit 893c9adeb9
8 changed files with 133 additions and 0 deletions

View File

@ -33,6 +33,8 @@ func relayHelper(c *gin.Context, relayMode int) *model.ErrorWithStatusCode {
fallthrough
case relaymode.AudioTranscription:
err = controller.RelayAudioHelper(c, relayMode)
case relaymode.Rerank:
err = controller.RerankHelper(c, relayMode)
default:
err = controller.RelayTextHelper(c)
}

View File

@ -143,3 +143,27 @@ type CompletionsStreamResponse struct {
FinishReason string `json:"finish_reason"`
} `json:"choices"`
}
type Document struct {
Text string `json:"text"`
}
type DocumentResult struct {
Index int `json:"index"`
Score float64 `json:"score"`
Document *Document `json:"document,omitempty"`
}
type RerankRequest struct {
Model string `json:"model"`
Query string `json:"query"`
Documents []Document `json:"documents"`
TopN *int `json:"top_n,omitempty"`
MaxChunksPerDoc *int `json:"max_chunks_per_doc,omitempty"`
ReturnDocuments bool `json:"return_documents"`
}
type RerankResponse struct {
ID string `json:"id,omitempty"`
Results []DocumentResult `json:"results"`
Error *string `json:"error,omitempty"`
}

View File

@ -57,7 +57,37 @@ func getImageRequest(c *gin.Context, relayMode int) (*relaymodel.ImageRequest, e
}
return imageRequest, nil
}
func getRerankRequest(c *gin.Context, relayMode int) (*relaymodel.RerankRequest, error) {
rerankRequest := &relaymodel.RerankRequest{}
err := common.UnmarshalBodyReusable(c, rerankRequest)
if err != nil {
return nil, err
}
if rerankRequest.Model == "" {
return nil, errors.New("model parameter must be provided")
}
// Set default values if necessary
if rerankRequest.TopN == nil {
defaultTopN := 10 // Default to returning top 10 results
rerankRequest.TopN = &defaultTopN
}
if rerankRequest.Query == "" {
return nil, errors.New("query must not be empty")
}
if len(rerankRequest.Documents) == 0 {
return nil, errors.New("document list must not be empty")
}
// if rerankRequest.MaxChunksPerDoc == nil {
// defaultMaxChunks := 5 // Default maximum chunks per document
// rerankRequest.MaxChunksPerDoc = &defaultMaxChunks
// }
if rerankRequest.ReturnDocuments == nil {
defaultReturnDocs := true // Default to returning documents
rerankRequest.ReturnDocuments = &defaultReturnDocs
}
return rerankRequest, nil
}
func isValidImageSize(model string, size string) bool {
if model == "cogview-3" {
return true

View File

@ -0,0 +1,62 @@
package controller
import (
"bytes"
"encoding/json"
"fmt"
"github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/relay"
"github.com/songquanpeng/one-api/relay/adaptor/openai"
"github.com/songquanpeng/one-api/relay/meta"
relaymodel "github.com/songquanpeng/one-api/relay/model"
"io"
"net/http"
)
func RerankHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatusCode {
ctx := c.Request.Context()
meta := meta.GetByContext(c)
rerankRequest, err := getRerankRequest(c, meta.Mode)
if err != nil {
logger.Errorf(ctx, "getRerankRequest failed: %s", err.Error())
return openai.ErrorWrapper(err, "invalid_rerank_request", http.StatusBadRequest)
}
// Map model name
var isModelMapped bool
meta.OriginModelName = rerankRequest.Model
rerankRequest.Model, isModelMapped = getMappedModelName(rerankRequest.Model, meta.ModelMapping)
meta.ActualModelName = rerankRequest.Model
var requestBody io.Reader
if isModelMapped {
jsonStr, err := json.Marshal(rerankRequest)
if err != nil {
return openai.ErrorWrapper(err, "marshal_rerank_request_failed", http.StatusInternalServerError)
}
requestBody = bytes.NewBuffer(jsonStr)
} else {
requestBody = c.Request.Body
}
adaptor := relay.GetAdaptor(meta.APIType)
if adaptor == nil {
return openai.ErrorWrapper(fmt.Errorf("invalid api type: %d", meta.APIType), "invalid_api_type", http.StatusBadRequest)
}
resp, err := adaptor.DoRequest(c, meta, requestBody)
if err != nil {
logger.Errorf(ctx, "DoRequest failed: %s", err.Error())
return openai.ErrorWrapper(err, "do_request_failed", http.StatusInternalServerError)
}
// do response
_, respErr := adaptor.DoResponse(c, resp, meta)
if respErr != nil {
logger.Errorf(ctx, "respErr is not nil: %+v", respErr)
return respErr
}
return nil
}

10
relay/model/rerank.go Normal file
View File

@ -0,0 +1,10 @@
package model
type RerankRequest struct {
Model string `json:"model"`
Documents []string `json:"documents"`
Query string `json:"query"`
TopN *int `json:"top_n,omitempty"`
MaxChunksPerDoc *int `json:"max_chunks_per_doc,omitempty"`
ReturnDocuments *bool `json:"return_documents,omitempty"`
}

View File

@ -11,4 +11,5 @@ const (
AudioSpeech
AudioTranscription
AudioTranslation
Rerank
)

View File

@ -24,6 +24,9 @@ func GetByPath(path string) int {
relayMode = AudioTranscription
} else if strings.HasPrefix(path, "/v1/audio/translations") {
relayMode = AudioTranslation
} else if strings.HasPrefix(path, "/v1/rerank") {
relayMode = Rerank
}
return relayMode
}

View File

@ -30,6 +30,7 @@ func SetRelayRouter(router *gin.Engine) {
relayV1Router.POST("/audio/transcriptions", controller.Relay)
relayV1Router.POST("/audio/translations", controller.Relay)
relayV1Router.POST("/audio/speech", controller.Relay)
relayV1Router.POST("/rerank", controller.Relay)
relayV1Router.GET("/files", controller.RelayNotImplemented)
relayV1Router.POST("/files", controller.RelayNotImplemented)
relayV1Router.DELETE("/files/:id", controller.RelayNotImplemented)