Calcium-Ion
c36418c863
* 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
47 lines
1.1 KiB
Go
47 lines
1.1 KiB
Go
package claude
|
|
|
|
import "github.com/QuantumNous/new-api/dto"
|
|
|
|
func MapOpenAIToolChoice(toolChoice any, parallelToolCalls *bool) *dto.ClaudeToolChoice {
|
|
var claudeToolChoice *dto.ClaudeToolChoice
|
|
|
|
if toolChoiceStr, ok := toolChoice.(string); ok {
|
|
switch toolChoiceStr {
|
|
case "auto":
|
|
claudeToolChoice = &dto.ClaudeToolChoice{
|
|
Type: "auto",
|
|
}
|
|
case "required":
|
|
claudeToolChoice = &dto.ClaudeToolChoice{
|
|
Type: "any",
|
|
}
|
|
case "none":
|
|
claudeToolChoice = &dto.ClaudeToolChoice{
|
|
Type: "none",
|
|
}
|
|
}
|
|
} else if toolChoiceMap, ok := toolChoice.(map[string]interface{}); ok {
|
|
if function, ok := toolChoiceMap["function"].(map[string]interface{}); ok {
|
|
if toolName, ok := function["name"].(string); ok {
|
|
claudeToolChoice = &dto.ClaudeToolChoice{
|
|
Type: "tool",
|
|
Name: toolName,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if parallelToolCalls != nil {
|
|
if claudeToolChoice == nil {
|
|
claudeToolChoice = &dto.ClaudeToolChoice{
|
|
Type: "auto",
|
|
}
|
|
}
|
|
if claudeToolChoice.Type != "none" {
|
|
claudeToolChoice.DisableParallelToolUse = !*parallelToolCalls
|
|
}
|
|
}
|
|
|
|
return claudeToolChoice
|
|
}
|