Commit e3256db6 by CalciumIon

fix: fix rerank

parent c7ba4a24
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"io" "io"
"log"
"net/http" "net/http"
"one-api/dto" "one-api/dto"
"one-api/relay/channel" "one-api/relay/channel"
...@@ -39,6 +40,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *dto.Gen ...@@ -39,6 +40,7 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *dto.Gen
} }
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) { func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) {
log.Printf("requestBody: %v", requestBody)
return channel.DoApiRequest(a, c, info, requestBody) return channel.DoApiRequest(a, c, info, requestBody)
} }
......
...@@ -48,6 +48,9 @@ func requestOpenAI2Cohere(textRequest dto.GeneralOpenAIRequest) *CohereRequest { ...@@ -48,6 +48,9 @@ func requestOpenAI2Cohere(textRequest dto.GeneralOpenAIRequest) *CohereRequest {
} }
func requestConvertRerank2Cohere(rerankRequest dto.RerankRequest) *CohereRerankRequest { func requestConvertRerank2Cohere(rerankRequest dto.RerankRequest) *CohereRerankRequest {
if rerankRequest.TopN == 0 {
rerankRequest.TopN = 1
}
cohereReq := CohereRerankRequest{ cohereReq := CohereRerankRequest{
Query: rerankRequest.Query, Query: rerankRequest.Query,
Documents: rerankRequest.Documents, Documents: rerankRequest.Documents,
...@@ -55,9 +58,6 @@ func requestConvertRerank2Cohere(rerankRequest dto.RerankRequest) *CohereRerankR ...@@ -55,9 +58,6 @@ func requestConvertRerank2Cohere(rerankRequest dto.RerankRequest) *CohereRerankR
TopN: rerankRequest.TopN, TopN: rerankRequest.TopN,
ReturnDocuments: true, ReturnDocuments: true,
} }
for _, doc := range rerankRequest.Documents {
cohereReq.Documents = append(cohereReq.Documents, doc)
}
return &cohereReq return &cohereReq
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment