* 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
257 lines
6.3 KiB
Go
257 lines
6.3 KiB
Go
package gemini
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
)
|
|
|
|
var geminiOpenAPISchemaAllowedFields = map[string]struct{}{
|
|
"anyOf": {},
|
|
"default": {},
|
|
"description": {},
|
|
"enum": {},
|
|
"example": {},
|
|
"format": {},
|
|
"items": {},
|
|
"maxItems": {},
|
|
"maxLength": {},
|
|
"maxProperties": {},
|
|
"maximum": {},
|
|
"minItems": {},
|
|
"minLength": {},
|
|
"minProperties": {},
|
|
"minimum": {},
|
|
"nullable": {},
|
|
"pattern": {},
|
|
"properties": {},
|
|
"propertyOrdering": {},
|
|
"required": {},
|
|
"title": {},
|
|
"type": {},
|
|
}
|
|
|
|
const geminiFunctionSchemaMaxDepth = 64
|
|
|
|
func CleanFunctionParameters(params interface{}) interface{} {
|
|
return cleanGeminiFunctionParametersWithDepth(params, 0)
|
|
}
|
|
|
|
func cleanGeminiFunctionParametersWithDepth(params interface{}, depth int) interface{} {
|
|
if params == nil {
|
|
return nil
|
|
}
|
|
|
|
if depth >= geminiFunctionSchemaMaxDepth {
|
|
return cleanGeminiFunctionParametersShallow(params)
|
|
}
|
|
|
|
switch v := params.(type) {
|
|
case map[string]interface{}:
|
|
cleanedMap := make(map[string]interface{}, len(v))
|
|
for key, val := range v {
|
|
if _, ok := geminiOpenAPISchemaAllowedFields[key]; ok {
|
|
cleanedMap[key] = val
|
|
}
|
|
}
|
|
|
|
normalizeGeminiSchemaTypeAndNullable(cleanedMap)
|
|
|
|
if props, ok := cleanedMap["properties"].(map[string]interface{}); ok && props != nil {
|
|
cleanedProps := make(map[string]interface{})
|
|
for propName, propValue := range props {
|
|
cleanedProps[propName] = cleanGeminiFunctionParametersWithDepth(propValue, depth+1)
|
|
}
|
|
cleanedMap["properties"] = cleanedProps
|
|
}
|
|
|
|
if items, ok := cleanedMap["items"].(map[string]interface{}); ok && items != nil {
|
|
cleanedMap["items"] = cleanGeminiFunctionParametersWithDepth(items, depth+1)
|
|
}
|
|
if itemsArray, ok := cleanedMap["items"].([]interface{}); ok && len(itemsArray) > 0 {
|
|
cleanedMap["items"] = cleanGeminiFunctionParametersWithDepth(itemsArray[0], depth+1)
|
|
}
|
|
|
|
if nested, ok := cleanedMap["anyOf"].([]interface{}); ok && nested != nil {
|
|
cleanedNested := make([]interface{}, len(nested))
|
|
for i, item := range nested {
|
|
cleanedNested[i] = cleanGeminiFunctionParametersWithDepth(item, depth+1)
|
|
}
|
|
cleanedMap["anyOf"] = cleanedNested
|
|
}
|
|
|
|
return cleanedMap
|
|
case []interface{}:
|
|
cleanedArray := make([]interface{}, len(v))
|
|
for i, item := range v {
|
|
cleanedArray[i] = cleanGeminiFunctionParametersWithDepth(item, depth+1)
|
|
}
|
|
return cleanedArray
|
|
default:
|
|
return params
|
|
}
|
|
}
|
|
|
|
func cleanGeminiFunctionParametersShallow(params interface{}) interface{} {
|
|
switch v := params.(type) {
|
|
case map[string]interface{}:
|
|
cleanedMap := make(map[string]interface{}, len(v))
|
|
for key, val := range v {
|
|
if _, ok := geminiOpenAPISchemaAllowedFields[key]; ok {
|
|
cleanedMap[key] = val
|
|
}
|
|
}
|
|
normalizeGeminiSchemaTypeAndNullable(cleanedMap)
|
|
delete(cleanedMap, "properties")
|
|
delete(cleanedMap, "items")
|
|
delete(cleanedMap, "anyOf")
|
|
return cleanedMap
|
|
case []interface{}:
|
|
return []interface{}{}
|
|
default:
|
|
return params
|
|
}
|
|
}
|
|
|
|
func normalizeGeminiSchemaTypeAndNullable(schema map[string]interface{}) {
|
|
rawType, ok := schema["type"]
|
|
if !ok || rawType == nil {
|
|
return
|
|
}
|
|
|
|
normalize := func(t string) (string, bool) {
|
|
switch strings.ToLower(strings.TrimSpace(t)) {
|
|
case "object":
|
|
return "OBJECT", false
|
|
case "array":
|
|
return "ARRAY", false
|
|
case "string":
|
|
return "STRING", false
|
|
case "integer":
|
|
return "INTEGER", false
|
|
case "number":
|
|
return "NUMBER", false
|
|
case "boolean":
|
|
return "BOOLEAN", false
|
|
case "null":
|
|
return "", true
|
|
default:
|
|
return t, false
|
|
}
|
|
}
|
|
|
|
switch typed := rawType.(type) {
|
|
case string:
|
|
normalized, isNull := normalize(typed)
|
|
if isNull {
|
|
schema["nullable"] = true
|
|
delete(schema, "type")
|
|
return
|
|
}
|
|
schema["type"] = normalized
|
|
case []interface{}:
|
|
nullable := false
|
|
var chosen string
|
|
for _, item := range typed {
|
|
if value, ok := item.(string); ok {
|
|
normalized, isNull := normalize(value)
|
|
if isNull {
|
|
nullable = true
|
|
continue
|
|
}
|
|
if chosen == "" {
|
|
chosen = normalized
|
|
}
|
|
}
|
|
}
|
|
if nullable {
|
|
schema["nullable"] = true
|
|
}
|
|
if chosen != "" {
|
|
schema["type"] = chosen
|
|
} else {
|
|
delete(schema, "type")
|
|
}
|
|
}
|
|
}
|
|
|
|
func RemoveAdditionalProperties(schema interface{}, depth int) interface{} {
|
|
if depth >= 5 {
|
|
return schema
|
|
}
|
|
|
|
value, ok := schema.(map[string]interface{})
|
|
if !ok || len(value) == 0 {
|
|
return schema
|
|
}
|
|
delete(value, "title")
|
|
delete(value, "$schema")
|
|
if typeVal, exists := value["type"]; !exists || (typeVal != "object" && typeVal != "array") {
|
|
return schema
|
|
}
|
|
switch value["type"] {
|
|
case "object":
|
|
delete(value, "additionalProperties")
|
|
if properties, ok := value["properties"].(map[string]interface{}); ok {
|
|
for key, nested := range properties {
|
|
properties[key] = RemoveAdditionalProperties(nested, depth+1)
|
|
}
|
|
}
|
|
for _, field := range []string{"allOf", "anyOf", "oneOf"} {
|
|
if nested, ok := value[field].([]interface{}); ok {
|
|
for i, item := range nested {
|
|
nested[i] = RemoveAdditionalProperties(item, depth+1)
|
|
}
|
|
}
|
|
}
|
|
case "array":
|
|
if items, ok := value["items"].(map[string]interface{}); ok {
|
|
value["items"] = RemoveAdditionalProperties(items, depth+1)
|
|
}
|
|
}
|
|
|
|
return value
|
|
}
|
|
|
|
func OpenAIToolChoiceToConfig(toolChoice any) *dto.ToolConfig {
|
|
if toolChoice == nil {
|
|
return nil
|
|
}
|
|
|
|
if toolChoiceStr, ok := toolChoice.(string); ok {
|
|
config := &dto.ToolConfig{
|
|
FunctionCallingConfig: &dto.FunctionCallingConfig{},
|
|
}
|
|
switch toolChoiceStr {
|
|
case "auto":
|
|
config.FunctionCallingConfig.Mode = "AUTO"
|
|
case "none":
|
|
config.FunctionCallingConfig.Mode = "NONE"
|
|
case "required":
|
|
config.FunctionCallingConfig.Mode = "ANY"
|
|
default:
|
|
config.FunctionCallingConfig.Mode = "AUTO"
|
|
}
|
|
return config
|
|
}
|
|
|
|
if toolChoiceMap, ok := toolChoice.(map[string]interface{}); ok {
|
|
if toolChoiceMap["type"] == "function" {
|
|
config := &dto.ToolConfig{
|
|
FunctionCallingConfig: &dto.FunctionCallingConfig{
|
|
Mode: "ANY",
|
|
},
|
|
}
|
|
if function, ok := toolChoiceMap["function"].(map[string]interface{}); ok {
|
|
if name, ok := function["name"].(string); ok && name != "" {
|
|
config.FunctionCallingConfig.AllowedFunctionNames = []string{name}
|
|
}
|
|
}
|
|
return config
|
|
}
|
|
return nil
|
|
}
|
|
|
|
return nil
|
|
}
|