* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
268 lines
7.2 KiB
Go
268 lines
7.2 KiB
Go
package gemini
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/convmeta"
|
|
kitutil "github.com/QuantumNous/new-api/relaykit/relayconvert/kitutil"
|
|
"github.com/QuantumNous/new-api/relaykit/relayconvert/reasoning"
|
|
)
|
|
|
|
var SupportedMimeTypes = map[string]bool{
|
|
"application/pdf": true,
|
|
"audio/mpeg": true,
|
|
"audio/mp3": true,
|
|
"audio/wav": true,
|
|
"image/png": true,
|
|
"image/jpeg": true,
|
|
"image/jpg": true,
|
|
"image/webp": true,
|
|
"image/heic": true,
|
|
"image/heif": true,
|
|
"text/plain": true,
|
|
"video/mov": true,
|
|
"video/mpeg": true,
|
|
"video/mp4": true,
|
|
"video/mpg": true,
|
|
"video/avi": true,
|
|
"video/wmv": true,
|
|
"video/mpegps": true,
|
|
"video/flv": true,
|
|
}
|
|
|
|
var SafetySettingCategories = []string{
|
|
"HARM_CATEGORY_HARASSMENT",
|
|
"HARM_CATEGORY_HATE_SPEECH",
|
|
"HARM_CATEGORY_SEXUALLY_EXPLICIT",
|
|
"HARM_CATEGORY_DANGEROUS_CONTENT",
|
|
}
|
|
|
|
const ThoughtSignatureBypassValue = "context_engineering_is_the_way_to_go"
|
|
|
|
const (
|
|
pro25MinBudget = 128
|
|
pro25MaxBudget = 32768
|
|
flash25MaxBudget = 24576
|
|
flash25LiteMinBudget = 512
|
|
flash25LiteMaxBudget = 24576
|
|
)
|
|
|
|
func ShouldAttachThoughtSignature(opts *convmeta.Options) bool {
|
|
return opts != nil && opts.Gemini.FunctionCallThoughtSignatureEnabled
|
|
}
|
|
|
|
func AttachThoughtSignatureBypass(opts *convmeta.Options, part *dto.GeminiPart) bool {
|
|
if part == nil || len(part.ThoughtSignature) > 0 || !ShouldAttachThoughtSignature(opts) {
|
|
return false
|
|
}
|
|
part.ThoughtSignature = []byte(strconv.Quote(ThoughtSignatureBypassValue))
|
|
return true
|
|
}
|
|
|
|
func AttachFunctionCallThoughtSignature(opts *convmeta.Options, part *dto.GeminiPart) bool {
|
|
if part == nil || !HasFunctionCallContent(part.FunctionCall) {
|
|
return false
|
|
}
|
|
return AttachThoughtSignatureBypass(opts, part)
|
|
}
|
|
|
|
func AttachFirstTextThoughtSignature(opts *convmeta.Options, parts []dto.GeminiPart) bool {
|
|
if !ShouldAttachThoughtSignature(opts) {
|
|
return false
|
|
}
|
|
for i := range parts {
|
|
if parts[i].Text != "" && len(parts[i].ThoughtSignature) == 0 {
|
|
parts[i].ThoughtSignature = []byte(strconv.Quote(ThoughtSignatureBypassValue))
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func ApplyThinkingConfig(geminiRequest *dto.GeminiChatRequest, info convmeta.Meta, oaiRequest ...dto.GeneralOpenAIRequest) {
|
|
opts := convmeta.OptionsOf(info)
|
|
if geminiRequest == nil || info == nil || !opts.Gemini.ThinkingAdapterEnabled {
|
|
return
|
|
}
|
|
|
|
modelName := convmeta.UpstreamModelName(info)
|
|
isNew25Pro := strings.HasPrefix(modelName, "gemini-2.5-pro") &&
|
|
!strings.HasPrefix(modelName, "gemini-2.5-pro-preview-05-06") &&
|
|
!strings.HasPrefix(modelName, "gemini-2.5-pro-preview-03-25")
|
|
|
|
if strings.Contains(modelName, "-thinking-") {
|
|
parts := strings.SplitN(modelName, "-thinking-", 2)
|
|
if len(parts) == 2 && parts[1] != "" {
|
|
if budgetTokens, err := strconv.Atoi(parts[1]); err == nil {
|
|
clampedBudget := clampThinkingBudget(modelName, budgetTokens)
|
|
geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
|
|
ThinkingBudget: kitutil.GetPointer(clampedBudget),
|
|
IncludeThoughts: true,
|
|
}
|
|
}
|
|
}
|
|
} else if strings.HasSuffix(modelName, "-thinking") {
|
|
unsupportedModels := []string{
|
|
"gemini-2.5-pro-preview-05-06",
|
|
"gemini-2.5-pro-preview-03-25",
|
|
}
|
|
isUnsupported := false
|
|
for _, unsupportedModel := range unsupportedModels {
|
|
if strings.HasPrefix(modelName, unsupportedModel) {
|
|
isUnsupported = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if isUnsupported {
|
|
geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
|
|
IncludeThoughts: true,
|
|
}
|
|
} else {
|
|
geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
|
|
IncludeThoughts: true,
|
|
}
|
|
if geminiRequest.GenerationConfig.MaxOutputTokens != nil && *geminiRequest.GenerationConfig.MaxOutputTokens > 0 {
|
|
budgetTokens := opts.Gemini.ThinkingAdapterBudgetTokensPercentage * float64(*geminiRequest.GenerationConfig.MaxOutputTokens)
|
|
clampedBudget := clampThinkingBudget(modelName, int(budgetTokens))
|
|
geminiRequest.GenerationConfig.ThinkingConfig.ThinkingBudget = kitutil.GetPointer(clampedBudget)
|
|
} else if len(oaiRequest) > 0 {
|
|
geminiRequest.GenerationConfig.ThinkingConfig.ThinkingBudget = kitutil.GetPointer(clampThinkingBudgetByEffort(modelName, oaiRequest[0].ReasoningEffort))
|
|
}
|
|
}
|
|
} else if strings.HasSuffix(modelName, "-nothinking") {
|
|
if !isNew25Pro {
|
|
geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
|
|
ThinkingBudget: kitutil.GetPointer(0),
|
|
}
|
|
}
|
|
} else if _, level, ok := reasoning.TrimEffortSuffix(modelName); ok && level != "" {
|
|
geminiRequest.GenerationConfig.ThinkingConfig = &dto.GeminiThinkingConfig{
|
|
IncludeThoughts: true,
|
|
ThinkingLevel: level,
|
|
}
|
|
info.SetReasoningEffort(level)
|
|
}
|
|
}
|
|
|
|
func ParseStopSequences(stop any) []string {
|
|
if stop == nil {
|
|
return nil
|
|
}
|
|
|
|
switch v := stop.(type) {
|
|
case string:
|
|
if v != "" {
|
|
return []string{v}
|
|
}
|
|
case []string:
|
|
return v
|
|
case []interface{}:
|
|
sequences := make([]string, 0, len(v))
|
|
for _, item := range v {
|
|
if str, ok := item.(string); ok && str != "" {
|
|
sequences = append(sequences, str)
|
|
}
|
|
}
|
|
return sequences
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func HasFunctionCallContent(call *dto.FunctionCall) bool {
|
|
if call == nil {
|
|
return false
|
|
}
|
|
if strings.TrimSpace(call.FunctionName) != "" {
|
|
return true
|
|
}
|
|
|
|
switch v := call.Arguments.(type) {
|
|
case nil:
|
|
return false
|
|
case string:
|
|
return strings.TrimSpace(v) != ""
|
|
case map[string]interface{}:
|
|
return len(v) > 0
|
|
case []interface{}:
|
|
return len(v) > 0
|
|
default:
|
|
return true
|
|
}
|
|
}
|
|
|
|
func SupportedMimeTypesList() []string {
|
|
keys := make([]string, 0, len(SupportedMimeTypes))
|
|
for key := range SupportedMimeTypes {
|
|
keys = append(keys, key)
|
|
}
|
|
return keys
|
|
}
|
|
|
|
func isNew25ProModel(modelName string) bool {
|
|
return strings.HasPrefix(modelName, "gemini-2.5-pro") &&
|
|
!strings.HasPrefix(modelName, "gemini-2.5-pro-preview-05-06") &&
|
|
!strings.HasPrefix(modelName, "gemini-2.5-pro-preview-03-25")
|
|
}
|
|
|
|
func is25FlashLiteModel(modelName string) bool {
|
|
return strings.HasPrefix(modelName, "gemini-2.5-flash-lite")
|
|
}
|
|
|
|
func clampThinkingBudget(modelName string, budget int) int {
|
|
isNew25Pro := isNew25ProModel(modelName)
|
|
is25FlashLite := is25FlashLiteModel(modelName)
|
|
|
|
if is25FlashLite {
|
|
if budget < flash25LiteMinBudget {
|
|
return flash25LiteMinBudget
|
|
}
|
|
if budget > flash25LiteMaxBudget {
|
|
return flash25LiteMaxBudget
|
|
}
|
|
} else if isNew25Pro {
|
|
if budget < pro25MinBudget {
|
|
return pro25MinBudget
|
|
}
|
|
if budget > pro25MaxBudget {
|
|
return pro25MaxBudget
|
|
}
|
|
} else {
|
|
if budget < 0 {
|
|
return 0
|
|
}
|
|
if budget > flash25MaxBudget {
|
|
return flash25MaxBudget
|
|
}
|
|
}
|
|
return budget
|
|
}
|
|
|
|
func clampThinkingBudgetByEffort(modelName string, effort string) int {
|
|
isNew25Pro := isNew25ProModel(modelName)
|
|
is25FlashLite := is25FlashLiteModel(modelName)
|
|
|
|
maxBudget := 0
|
|
if is25FlashLite {
|
|
maxBudget = flash25LiteMaxBudget
|
|
}
|
|
if isNew25Pro {
|
|
maxBudget = pro25MaxBudget
|
|
} else {
|
|
maxBudget = flash25MaxBudget
|
|
}
|
|
switch effort {
|
|
case "high":
|
|
maxBudget = maxBudget * 80 / 100
|
|
case "medium":
|
|
maxBudget = maxBudget * 50 / 100
|
|
case "low":
|
|
maxBudget = maxBudget * 20 / 100
|
|
case "minimal":
|
|
maxBudget = maxBudget * 5 / 100
|
|
}
|
|
return clampThinkingBudget(modelName, maxBudget)
|
|
}
|