mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-11 14:41:21 +00:00
Calcium-Ion
0ed497f066
* feat(relaykit): preserve hosted tools across conversions - add protocol-neutral hosted-tool DTOs, conversion metadata, and loss policies - bridge citations, grounding metadata, and hosted-tool stream lifecycles - document the public conversion behavior and channel policy controls * refactor(relaykit): normalize reasoning and thinking intent - centralize provider-neutral reasoning intent, effort, and budget mappings - parse model suffixes at the host entry boundary while preserving provider-owned tails - keep adaptive Claude thinking and explicit zero-token compatibility consistent * fix(billing): preserve authoritative usage across relay hops - carry native BillingUsage sidecars through direct and streamed protocol bridges - merge partial and terminal usage monotonically with safe fallback settlement - retain cache metadata, penultimate usage, and per-call Gemini tool surcharges * feat(relay): bridge Responses with Claude and Gemini protocols - add direct request, response, and stream converters across supported relay formats - expose Claude count_tokens and Chat-to-Responses compatibility endpoints - carry conversion diagnostics through the host while retaining the curated public goldens * fix(relay): wire relaykit conversions into host channels - connect handlers, adaptors, and channel settings to the standalone conversion layer - keep model mapping, pricing identity, retries, and provider-specific suffix behavior aligned - ignore local audit artifacts and retain focused public regression coverage
53 lines
2.0 KiB
Go
53 lines
2.0 KiB
Go
package claude
|
|
|
|
import "github.com/QuantumNous/new-api/relaykit/dto"
|
|
|
|
func UsageFromOpenAI(usage *dto.Usage) *dto.ClaudeUsage {
|
|
if usage == nil {
|
|
return nil
|
|
}
|
|
// An existing sidecar snapshots the original provider usage; carry it
|
|
// across this bridge unchanged regardless of its dialect. Only synthesize
|
|
// an OpenAI snapshot when no sidecar exists yet.
|
|
existingBillingUsage := dto.CloneBillingUsage(usage.BillingUsage)
|
|
if existingBillingUsage != nil && existingBillingUsage.ClaudeUsage != nil &&
|
|
(existingBillingUsage.Source == dto.BillingUsageSourceClaudeMessages || existingBillingUsage.Semantic == dto.BillingUsageSemanticAnthropic) {
|
|
result := existingBillingUsage.ClaudeUsage
|
|
result.BillingUsage = dto.CloneBillingUsage(usage.BillingUsage)
|
|
return result
|
|
}
|
|
billingUsage := existingBillingUsage
|
|
if billingUsage == nil {
|
|
billingUsage = dto.NewOpenAIChatBillingUsage(usage)
|
|
}
|
|
cacheCreation5m, cacheCreation1h := NormalizeCacheCreationSplit(
|
|
usage.PromptTokensDetails.CachedCreationTokens,
|
|
usage.ClaudeCacheCreation5mTokens,
|
|
usage.ClaudeCacheCreation1hTokens,
|
|
)
|
|
cacheCreationTokens := usage.PromptTokensDetails.CacheCreationTokensTotal()
|
|
inputTokens := usage.PromptTokens
|
|
if usage.UsageSemantic != dto.BillingUsageSemanticAnthropic {
|
|
// OpenAI-style prompt/input totals include cache reads and writes, while
|
|
// Claude reports both separately from input_tokens.
|
|
inputTokens = usage.PromptTokens - usage.PromptTokensDetails.CachedTokens - cacheCreationTokens
|
|
if inputTokens < 0 {
|
|
inputTokens = 0
|
|
}
|
|
}
|
|
result := &dto.ClaudeUsage{
|
|
InputTokens: inputTokens,
|
|
OutputTokens: usage.CompletionTokens,
|
|
CacheCreationInputTokens: cacheCreationTokens,
|
|
CacheReadInputTokens: usage.PromptTokensDetails.CachedTokens,
|
|
BillingUsage: billingUsage,
|
|
}
|
|
if cacheCreation5m > 0 || cacheCreation1h > 0 {
|
|
result.CacheCreation = &dto.ClaudeCacheCreationUsage{
|
|
Ephemeral5mInputTokens: cacheCreation5m,
|
|
Ephemeral1hInputTokens: cacheCreation1h,
|
|
}
|
|
}
|
|
return result
|
|
}
|