* refactor: consolidate relay protocol converters * refactor relayconvert text converters * feat: refine relay converters and advanced custom routing * refactor: enhance logging and add thought signature handling for Gemini requests * refactor: enhance channel cache and pricing endpoint handling for advanced custom models * feat: preserve billing usage semantics * feat: add protocol-aware billing usage * Delete useless files * chore: update action versions in workflow files * chore: update Docker action versions in workflow files * fix: harden billing usage settlement and hot-path route matching - estimate Gemini completion tokens locally when billable usageMetadata is prompt-only but output content was received (e.g. client aborts the stream before the final chunk), and rebuild the attached billing_usage as estimated so settlement does not bill zero output tokens - guard NewClaudeMessagesBillingUsage against all-zero ClaudeUsage, matching the OpenAI/Gemini constructors, so a zero billing_usage cannot override a non-zero top-level usage during settlement - cache compiled advanced-custom route model regexes; they run on the request hot path and were recompiled per request - move the effectiveBillingUsage remap to PostTextConsumeQuota only, and document that calculateTextQuotaSummary expects remapped usage - document the updatePricingLock -> channelSyncLock lock ordering that InitChannelCache/CacheUpdateChannel rely on, and the aux-struct pitfall in GeminiChatResponse.UnmarshalJSON
257 lines
6.3 KiB
Go
257 lines
6.3 KiB
Go
package gemini
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/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
|
|
}
|