fix: preserve explicit zero values in native relay requests

This commit is contained in:
Seefs
2026-03-01 15:47:03 +08:00
parent 21cfc1ca38
commit 0e9198e9b5
52 changed files with 523 additions and 232 deletions

View File

@@ -615,7 +615,7 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
return &dto.ImageRequest{
Model: model,
Prompt: "a cute cat",
N: 1,
N: lo.ToPtr(uint(1)),
Size: "1024x1024",
}
case constant.EndpointTypeJinaRerank:
@@ -624,14 +624,14 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
Model: model,
Query: "What is Deep Learning?",
Documents: []any{"Deep Learning is a subset of machine learning.", "Machine learning is a field of artificial intelligence."},
TopN: 2,
TopN: lo.ToPtr(2),
}
case constant.EndpointTypeOpenAIResponse:
// 返回 OpenAIResponsesRequest
return &dto.OpenAIResponsesRequest{
Model: model,
Input: json.RawMessage(`[{"role":"user","content":"hi"}]`),
Stream: isStream,
Stream: lo.ToPtr(isStream),
}
case constant.EndpointTypeOpenAIResponseCompact:
// 返回 OpenAIResponsesCompactionRequest
@@ -647,14 +647,14 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
}
req := &dto.GeneralOpenAIRequest{
Model: model,
Stream: isStream,
Stream: lo.ToPtr(isStream),
Messages: []dto.Message{
{
Role: "user",
Content: "hi",
},
},
MaxTokens: maxTokens,
MaxTokens: lo.ToPtr(maxTokens),
}
if isStream {
req.StreamOptions = &dto.StreamOptions{IncludeUsage: true}
@@ -669,7 +669,7 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
Model: model,
Query: "What is Deep Learning?",
Documents: []any{"Deep Learning is a subset of machine learning.", "Machine learning is a field of artificial intelligence."},
TopN: 2,
TopN: lo.ToPtr(2),
}
}
@@ -697,14 +697,14 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
return &dto.OpenAIResponsesRequest{
Model: model,
Input: json.RawMessage(`[{"role":"user","content":"hi"}]`),
Stream: isStream,
Stream: lo.ToPtr(isStream),
}
}
// Chat/Completion 请求 - 返回 GeneralOpenAIRequest
testRequest := &dto.GeneralOpenAIRequest{
Model: model,
Stream: isStream,
Stream: lo.ToPtr(isStream),
Messages: []dto.Message{
{
Role: "user",
@@ -717,15 +717,15 @@ func buildTestRequest(model string, endpointType string, channel *model.Channel,
}
if strings.HasPrefix(model, "o") {
testRequest.MaxCompletionTokens = 16
testRequest.MaxCompletionTokens = lo.ToPtr(uint(16))
} else if strings.Contains(model, "thinking") {
if !strings.Contains(model, "claude") {
testRequest.MaxTokens = 50
testRequest.MaxTokens = lo.ToPtr(uint(50))
}
} else if strings.Contains(model, "gemini") {
testRequest.MaxTokens = 3000
testRequest.MaxTokens = lo.ToPtr(uint(3000))
} else {
testRequest.MaxTokens = 16
testRequest.MaxTokens = lo.ToPtr(uint(16))
}
return testRequest

View File

@@ -25,6 +25,7 @@ import (
"github.com/QuantumNous/new-api/types"
"github.com/bytedance/gopkg/util/gopool"
"github.com/samber/lo"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
@@ -262,15 +263,17 @@ func fastTokenCountMetaForPricing(request dto.Request) *types.TokenCountMeta {
}
switch r := request.(type) {
case *dto.GeneralOpenAIRequest:
if r.MaxCompletionTokens > r.MaxTokens {
meta.MaxTokens = int(r.MaxCompletionTokens)
maxCompletionTokens := lo.FromPtrOr(r.MaxCompletionTokens, uint(0))
maxTokens := lo.FromPtrOr(r.MaxTokens, uint(0))
if maxCompletionTokens > maxTokens {
meta.MaxTokens = int(maxCompletionTokens)
} else {
meta.MaxTokens = int(r.MaxTokens)
meta.MaxTokens = int(maxTokens)
}
case *dto.OpenAIResponsesRequest:
meta.MaxTokens = int(r.MaxOutputTokens)
meta.MaxTokens = int(lo.FromPtrOr(r.MaxOutputTokens, uint(0)))
case *dto.ClaudeRequest:
meta.MaxTokens = int(r.MaxTokens)
meta.MaxTokens = int(lo.FromPtr(r.MaxTokens))
case *dto.ImageRequest:
// Pricing for image requests depends on ImagePriceRatio; safe to compute even when CountToken is disabled.
return r.GetTokenCountMeta()