From 22e8b46159cc8e03eb4d13bf5c69533970f62179 Mon Sep 17 00:00:00 2001 From: CaIon Date: Thu, 3 Jul 2025 15:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20make=20TopN=20field=20in=20?= =?UTF-8?q?RerankRequest=20optional=20in=20JSON=20serialization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dto/rerank.go | 2 +- relay/channel/jina/constant.go | 1 + relay/rerank_handler.go | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dto/rerank.go b/dto/rerank.go index 21f6437c..5ea68cba 100644 --- a/dto/rerank.go +++ b/dto/rerank.go @@ -4,7 +4,7 @@ type RerankRequest struct { Documents []any `json:"documents"` Query string `json:"query"` Model string `json:"model"` - TopN int `json:"top_n"` + 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"` diff --git a/relay/channel/jina/constant.go b/relay/channel/jina/constant.go index 45fc44c9..be290fb6 100644 --- a/relay/channel/jina/constant.go +++ b/relay/channel/jina/constant.go @@ -3,6 +3,7 @@ package jina var ModelList = []string{ "jina-clip-v1", "jina-reranker-v2-base-multilingual", + "jina-reranker-m0", } var ChannelName = "jina" diff --git a/relay/rerank_handler.go b/relay/rerank_handler.go index 319811b8..5cf384a8 100644 --- a/relay/rerank_handler.go +++ b/relay/rerank_handler.go @@ -78,12 +78,15 @@ func RerankHelper(c *gin.Context, relayMode int) (openaiErr *dto.OpenAIErrorWith return service.OpenAIErrorWrapperLocal(err, "json_marshal_failed", http.StatusInternalServerError) } requestBody := bytes.NewBuffer(jsonData) - statusCodeMappingStr := c.GetString("status_code_mapping") + if common.DebugEnabled { + println(fmt.Sprintf("Rerank request body: %s", requestBody.String())) + } resp, err := adaptor.DoRequest(c, relayInfo, requestBody) if err != nil { return service.OpenAIErrorWrapper(err, "do_request_failed", http.StatusInternalServerError) } + statusCodeMappingStr := c.GetString("status_code_mapping") var httpResp *http.Response if resp != nil { httpResp = resp.(*http.Response)