mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-07 18:18:00 +00:00
* feat(relaykit): preserve hosted tools across conversions - add protocol-neutral hosted-tool DTOs, conversion metadata, and loss policies - bridge citations, grounding metadata, and hosted-tool stream lifecycles - document the public conversion behavior and channel policy controls * refactor(relaykit): normalize reasoning and thinking intent - centralize provider-neutral reasoning intent, effort, and budget mappings - parse model suffixes at the host entry boundary while preserving provider-owned tails - keep adaptive Claude thinking and explicit zero-token compatibility consistent * fix(billing): preserve authoritative usage across relay hops - carry native BillingUsage sidecars through direct and streamed protocol bridges - merge partial and terminal usage monotonically with safe fallback settlement - retain cache metadata, penultimate usage, and per-call Gemini tool surcharges * feat(relay): bridge Responses with Claude and Gemini protocols - add direct request, response, and stream converters across supported relay formats - expose Claude count_tokens and Chat-to-Responses compatibility endpoints - carry conversion diagnostics through the host while retaining the curated public goldens * fix(relay): wire relaykit conversions into host channels - connect handlers, adaptors, and channel settings to the standalone conversion layer - keep model mapping, pricing identity, retries, and provider-specific suffix behavior aligned - ignore local audit artifacts and retain focused public regression coverage
261 lines
8.4 KiB
Go
261 lines
8.4 KiB
Go
package relay
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/constant"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/QuantumNous/new-api/setting/model_setting"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func GeminiHelper(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types.NewAPIError) {
|
|
info.InitChannelMeta(c)
|
|
|
|
geminiReq, ok := info.Request.(*dto.GeminiChatRequest)
|
|
if !ok {
|
|
return types.NewErrorWithStatusCode(fmt.Errorf("invalid request type, expected *dto.GeminiChatRequest, got %T", info.Request), types.ErrorCodeInvalidRequest, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
request, err := common.DeepCopy(geminiReq)
|
|
if err != nil {
|
|
return types.NewError(fmt.Errorf("failed to copy request to GeminiChatRequest: %w", err), types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
// model mapped 模型映射
|
|
err = helper.ModelMappedHelper(c, info, request)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeChannelModelMappedError, types.ErrOptionWithSkipRetry())
|
|
}
|
|
if err = helper.ApplyReasoningModelSuffix(info, request); err != nil {
|
|
return newConvertRequestFailedError(c, info, err)
|
|
}
|
|
|
|
adaptor := GetAdaptor(info.ApiType)
|
|
if adaptor == nil {
|
|
return types.NewError(fmt.Errorf("invalid api type: %d", info.ApiType), types.ErrorCodeInvalidApiType, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
adaptor.Init(info)
|
|
|
|
if info.ChannelSetting.SystemPrompt != "" {
|
|
if request.SystemInstructions == nil {
|
|
request.SystemInstructions = &dto.GeminiChatContent{
|
|
Parts: []dto.GeminiPart{
|
|
{Text: info.ChannelSetting.SystemPrompt},
|
|
},
|
|
}
|
|
} else if len(request.SystemInstructions.Parts) == 0 {
|
|
request.SystemInstructions.Parts = []dto.GeminiPart{{Text: info.ChannelSetting.SystemPrompt}}
|
|
} else if info.ChannelSetting.SystemPromptOverride {
|
|
common.SetContextKey(c, constant.ContextKeySystemPromptOverride, true)
|
|
merged := false
|
|
for i := range request.SystemInstructions.Parts {
|
|
if request.SystemInstructions.Parts[i].Text == "" {
|
|
continue
|
|
}
|
|
request.SystemInstructions.Parts[i].Text = info.ChannelSetting.SystemPrompt + "\n" + request.SystemInstructions.Parts[i].Text
|
|
merged = true
|
|
break
|
|
}
|
|
if !merged {
|
|
request.SystemInstructions.Parts = append([]dto.GeminiPart{{Text: info.ChannelSetting.SystemPrompt}}, request.SystemInstructions.Parts...)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Clean up empty system instruction
|
|
if request.SystemInstructions != nil {
|
|
hasContent := false
|
|
for _, part := range request.SystemInstructions.Parts {
|
|
if part.Text != "" {
|
|
hasContent = true
|
|
break
|
|
}
|
|
}
|
|
if !hasContent {
|
|
request.SystemInstructions = nil
|
|
}
|
|
}
|
|
|
|
var requestBody io.Reader
|
|
if model_setting.GetGlobalSettings().PassThroughRequestEnabled || info.ChannelSetting.PassThroughBodyEnabled {
|
|
storage, err := common.GetBodyStorage(c)
|
|
if err != nil {
|
|
return types.NewErrorWithStatusCode(err, types.ErrorCodeReadRequestBodyFailed, http.StatusBadRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
requestBody = common.NewReplayableBodyReader(storage)
|
|
} else {
|
|
// 使用 ConvertGeminiRequest 转换请求格式
|
|
convertedRequest, err := adaptor.ConvertGeminiRequest(c, info, request)
|
|
if err != nil {
|
|
return newConvertRequestFailedError(c, info, err)
|
|
}
|
|
relaycommon.AppendRequestConversionFromRequest(info, convertedRequest)
|
|
jsonData, err := common.Marshal(convertedRequest)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
// apply param override
|
|
if len(info.ParamOverride) > 0 {
|
|
jsonData, err = relaycommon.ApplyParamOverrideWithRelayInfo(jsonData, info)
|
|
if err != nil {
|
|
return newAPIErrorFromParamOverride(err)
|
|
}
|
|
}
|
|
|
|
logger.LogDebug(c, "Gemini request body: %s", jsonData)
|
|
|
|
body, closer, err := relaycommon.NewOutboundJSONBody(jsonData)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
defer closer.Close()
|
|
jsonData = nil
|
|
requestBody = body
|
|
}
|
|
|
|
resp, err := adaptor.DoRequest(c, info, requestBody)
|
|
if err != nil {
|
|
logger.LogError(c, "Do gemini request failed: "+err.Error())
|
|
return types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
statusCodeMappingStr := c.GetString("status_code_mapping")
|
|
|
|
var httpResp *http.Response
|
|
if resp != nil {
|
|
httpResp = resp.(*http.Response)
|
|
info.IsStream = info.IsStream || strings.HasPrefix(httpResp.Header.Get("Content-Type"), "text/event-stream")
|
|
if httpResp.StatusCode != http.StatusOK {
|
|
newAPIError = service.RelayErrorHandler(c.Request.Context(), httpResp, false)
|
|
// reset status code 重置状态码
|
|
service.ResetStatusCode(newAPIError, statusCodeMappingStr)
|
|
return newAPIError
|
|
}
|
|
}
|
|
|
|
usage, openaiErr := adaptor.DoResponse(c, resp.(*http.Response), info)
|
|
if openaiErr != nil {
|
|
service.ResetStatusCode(openaiErr, statusCodeMappingStr)
|
|
return openaiErr
|
|
}
|
|
|
|
service.PostTextConsumeQuota(c, info, usage.(*dto.Usage), nil)
|
|
return nil
|
|
}
|
|
|
|
func GeminiEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo) (newAPIError *types.NewAPIError) {
|
|
info.InitChannelMeta(c)
|
|
|
|
isBatch := strings.HasSuffix(c.Request.URL.Path, "batchEmbedContents")
|
|
info.IsGeminiBatchEmbedding = isBatch
|
|
|
|
var req dto.Request
|
|
var err error
|
|
var inputTexts []string
|
|
|
|
if isBatch {
|
|
batchRequest := &dto.GeminiBatchEmbeddingRequest{}
|
|
err = common.UnmarshalBodyReusable(c, batchRequest)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
req = batchRequest
|
|
for _, r := range batchRequest.Requests {
|
|
for _, part := range r.Content.Parts {
|
|
if part.Text != "" {
|
|
inputTexts = append(inputTexts, part.Text)
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
singleRequest := &dto.GeminiEmbeddingRequest{}
|
|
err = common.UnmarshalBodyReusable(c, singleRequest)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeInvalidRequest, types.ErrOptionWithSkipRetry())
|
|
}
|
|
req = singleRequest
|
|
for _, part := range singleRequest.Content.Parts {
|
|
if part.Text != "" {
|
|
inputTexts = append(inputTexts, part.Text)
|
|
}
|
|
}
|
|
}
|
|
|
|
err = helper.ModelMappedHelper(c, info, req)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeChannelModelMappedError, types.ErrOptionWithSkipRetry())
|
|
}
|
|
if err = helper.ApplyReasoningModelSuffix(info, req); err != nil {
|
|
return newConvertRequestFailedError(c, info, err)
|
|
}
|
|
|
|
req.SetModelName("models/" + info.UpstreamModelName)
|
|
|
|
adaptor := GetAdaptor(info.ApiType)
|
|
if adaptor == nil {
|
|
return types.NewError(fmt.Errorf("invalid api type: %d", info.ApiType), types.ErrorCodeInvalidApiType, types.ErrOptionWithSkipRetry())
|
|
}
|
|
adaptor.Init(info)
|
|
|
|
var requestBody io.Reader
|
|
jsonData, err := common.Marshal(req)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
|
|
// apply param override
|
|
if len(info.ParamOverride) > 0 {
|
|
jsonData, err = relaycommon.ApplyParamOverrideWithRelayInfo(jsonData, info)
|
|
if err != nil {
|
|
return newAPIErrorFromParamOverride(err)
|
|
}
|
|
}
|
|
logger.LogDebug(c, "Gemini embedding request body: %s", jsonData)
|
|
body, closer, err := relaycommon.NewOutboundJSONBody(jsonData)
|
|
if err != nil {
|
|
return types.NewError(err, types.ErrorCodeConvertRequestFailed, types.ErrOptionWithSkipRetry())
|
|
}
|
|
defer closer.Close()
|
|
jsonData = nil
|
|
requestBody = body
|
|
|
|
resp, err := adaptor.DoRequest(c, info, requestBody)
|
|
if err != nil {
|
|
logger.LogError(c, "Do gemini request failed: "+err.Error())
|
|
return types.NewOpenAIError(err, types.ErrorCodeDoRequestFailed, http.StatusInternalServerError)
|
|
}
|
|
|
|
statusCodeMappingStr := c.GetString("status_code_mapping")
|
|
var httpResp *http.Response
|
|
if resp != nil {
|
|
httpResp = resp.(*http.Response)
|
|
if httpResp.StatusCode != http.StatusOK {
|
|
newAPIError = service.RelayErrorHandler(c.Request.Context(), httpResp, false)
|
|
service.ResetStatusCode(newAPIError, statusCodeMappingStr)
|
|
return newAPIError
|
|
}
|
|
}
|
|
|
|
usage, openaiErr := adaptor.DoResponse(c, resp.(*http.Response), info)
|
|
if openaiErr != nil {
|
|
service.ResetStatusCode(openaiErr, statusCodeMappingStr)
|
|
return openaiErr
|
|
}
|
|
|
|
service.PostTextConsumeQuota(c, info, usage.(*dto.Usage), nil)
|
|
return nil
|
|
}
|