Files
new-api/relaykit/relayconvert/response_compat.go
T
Calcium-Ion 0ed497f066 feat(relay): hosted-tool conversion fidelity, reasoning normalization, and billing usage integrity (#7137)
* 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
2026-09-01 21:53:35 +08:00

211 lines
8.2 KiB
Go

package relayconvert
import (
"fmt"
"github.com/QuantumNous/new-api/relaykit/dto"
"github.com/QuantumNous/new-api/relaykit/relayconvert/convmeta"
claudemessages "github.com/QuantumNous/new-api/relaykit/relayconvert/internal/claude_messages"
geminichat "github.com/QuantumNous/new-api/relaykit/relayconvert/internal/gemini_chat"
oaichat "github.com/QuantumNous/new-api/relaykit/relayconvert/internal/oai_chat"
oairesponses "github.com/QuantumNous/new-api/relaykit/relayconvert/internal/oai_responses"
)
type ClaudeResponseInfo = claudemessages.ClaudeResponseInfo
type ClaudeToChatStreamState = claudemessages.ClaudeToChatStreamState
type ChatToResponsesStreamEvent = oaichat.ChatToResponsesStreamEvent
type ChatToResponsesStreamState = oaichat.ChatToResponsesStreamState
type ResponsesToChatStreamState = oairesponses.ResponsesToChatStreamState
type ResponsesBufferedAccumulator = oairesponses.ResponsesBufferedAccumulator
// ClaudeHostedStreamBridge owns Anthropic server-tool input deltas while a
// Claude stream is being converted to the Responses protocol.
type ClaudeHostedStreamBridge struct {
bridge *claudemessages.ClaudeHostedStreamBridge
}
// GeminiHostedStreamBridge accumulates Gemini grounding queries until the
// upstream stream ends, then emits one canonical Responses web-search call.
type GeminiHostedStreamBridge struct {
bridge *geminichat.GeminiHostedStreamBridge
}
func NormalizeCacheCreationSplit(totalTokens int, tokens5m int, tokens1h int) (int, int) {
return oaichat.NormalizeCacheCreationSplit(totalTokens, tokens5m, tokens1h)
}
func ResponseOpenAI2Claude(openAIResponse *dto.OpenAITextResponse, info convmeta.Meta) *dto.ClaudeResponse {
return oaichat.ResponseOpenAI2Claude(openAIResponse, info)
}
func StreamResponseOpenAI2Claude(openAIResponse *dto.ChatCompletionsStreamResponse, info convmeta.Meta) []*dto.ClaudeResponse {
return oaichat.StreamResponseOpenAI2Claude(openAIResponse, info)
}
func StopReasonClaudeToOpenAI(reason string) string {
return claudemessages.StopReasonClaudeToOpenAI(reason)
}
func StreamResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.ChatCompletionsStreamResponse {
return claudemessages.StreamResponseClaude2OpenAI(claudeResponse)
}
func NewClaudeToChatStreamState() *ClaudeToChatStreamState {
return claudemessages.NewClaudeToChatStreamState()
}
func NewClaudeHostedStreamBridge() *ClaudeHostedStreamBridge {
return &ClaudeHostedStreamBridge{bridge: claudemessages.NewClaudeHostedStreamBridge()}
}
func NewGeminiHostedStreamBridge() *GeminiHostedStreamBridge {
return &GeminiHostedStreamBridge{bridge: geminichat.NewGeminiHostedStreamBridge()}
}
func (b *GeminiHostedStreamBridge) Observe(response *dto.GeminiChatResponse) {
if b == nil || b.bridge == nil {
return
}
b.bridge.Observe(response)
}
func (b *GeminiHostedStreamBridge) Finalize(state *ResponseStreamState) ([]ChatToResponsesStreamEvent, error) {
if b == nil || b.bridge == nil || state == nil {
return nil, nil
}
for _, stepState := range state.stepStates {
if streamState, ok := stepState.(*ChatToResponsesStreamState); ok {
return b.bridge.Finalize(streamState)
}
}
return nil, fmt.Errorf("Gemini hosted stream bridge requires a Chat-to-Responses stream state")
}
func (b *ClaudeHostedStreamBridge) Convert(response *dto.ClaudeResponse, state *ResponseStreamState) ([]ChatToResponsesStreamEvent, bool, error) {
if state == nil {
return nil, false, nil
}
if b == nil || b.bridge == nil {
return nil, false, nil
}
for _, stepState := range state.stepStates {
if streamState, ok := stepState.(*ChatToResponsesStreamState); ok {
return b.bridge.Convert(response, streamState)
}
}
return nil, false, nil
}
func ResponseClaude2OpenAI(claudeResponse *dto.ClaudeResponse) *dto.OpenAITextResponse {
return claudemessages.ResponseClaude2OpenAI(claudeResponse)
}
func UsageFromClaudeAPIUsage(usage *dto.ClaudeUsage) *dto.Usage {
return claudemessages.UsageFromClaudeAPIUsage(usage)
}
func UsageFromClaudeUsage(usage *dto.Usage) *dto.Usage {
return claudemessages.UsageFromClaudeUsage(usage)
}
func BuildMessageDeltaPatchUsage(claudeResponse *dto.ClaudeResponse, claudeInfo *ClaudeResponseInfo) *dto.ClaudeUsage {
return claudemessages.BuildMessageDeltaPatchUsage(claudeResponse, claudeInfo)
}
func PatchClaudeMessageDeltaUsageData(data string, usage *dto.ClaudeUsage) string {
return claudemessages.PatchClaudeMessageDeltaUsageData(data, usage)
}
func FormatClaudeResponseInfo(claudeResponse *dto.ClaudeResponse, oaiResponse *dto.ChatCompletionsStreamResponse, claudeInfo *ClaudeResponseInfo) bool {
return claudemessages.FormatClaudeResponseInfo(claudeResponse, oaiResponse, claudeInfo)
}
func FinalizeClaudeStreamBillingUsage(claudeInfo *ClaudeResponseInfo) {
claudemessages.FinalizeClaudeStreamBillingUsage(claudeInfo)
}
func ResponseOpenAI2Gemini(openAIResponse *dto.OpenAITextResponse, info convmeta.Meta) *dto.GeminiChatResponse {
return oaichat.ResponseOpenAI2Gemini(openAIResponse, info)
}
func StreamResponseOpenAI2Gemini(openAIResponse *dto.ChatCompletionsStreamResponse, info convmeta.Meta) *dto.GeminiChatResponse {
return oaichat.StreamResponseOpenAI2Gemini(openAIResponse, info)
}
func UsageFromGeminiMetadata(metadata *dto.GeminiUsageMetadata, fallbackPromptTokens int) *dto.Usage {
return geminichat.UsageFromGeminiMetadata(metadata, fallbackPromptTokens)
}
func ResponseGeminiChat2OpenAI(id string, created int64, response *dto.GeminiChatResponse) *dto.OpenAITextResponse {
return geminichat.ResponseGeminiChat2OpenAI(id, created, response)
}
func StreamResponseGeminiChat2OpenAI(geminiResponse *dto.GeminiChatResponse) (*dto.ChatCompletionsStreamResponse, bool) {
return geminichat.StreamResponseGeminiChat2OpenAI(geminiResponse)
}
func ChatCompletionsResponseToResponsesResponse(resp *dto.OpenAITextResponse, id string) (*dto.OpenAIResponsesResponse, *dto.Usage, error) {
return oaichat.ChatCompletionsResponseToResponsesResponse(resp, id)
}
func ResponsesStatusFromChatFinishReason(finishReason string) (string, *dto.IncompleteDetails) {
return oaichat.ResponsesStatusFromChatFinishReason(finishReason)
}
func UsageFromChatUsage(src *dto.Usage) *dto.Usage {
return oaichat.UsageFromChatUsage(src)
}
func NewChatToResponsesStreamState(id string, model string) *ChatToResponsesStreamState {
return oaichat.NewChatToResponsesStreamState(id, model)
}
func ChatCompletionsStreamChunkToResponsesEvents(chunk *dto.ChatCompletionsStreamResponse, state *ChatToResponsesStreamState) ([]ChatToResponsesStreamEvent, error) {
return oaichat.ChatCompletionsStreamChunkToResponsesEvents(chunk, state)
}
func FinalizeChatCompletionsStreamToResponses(state *ChatToResponsesStreamState) []ChatToResponsesStreamEvent {
return oaichat.FinalizeChatCompletionsStreamToResponses(state)
}
func ResponsesFinishReasonFromStatus(resp *dto.OpenAIResponsesResponse) (string, bool) {
return oairesponses.ResponsesFinishReasonFromStatus(resp)
}
func ResponsesResponseToChatCompletionsResponse(resp *dto.OpenAIResponsesResponse, id string) (*dto.OpenAITextResponse, *dto.Usage, error) {
return oairesponses.ResponsesResponseToChatCompletionsResponse(resp, id)
}
func UsageFromResponsesUsage(src *dto.Usage) *dto.Usage {
return oairesponses.UsageFromResponsesUsage(src)
}
func NormalizeResponsesUsage(src *dto.Usage) *dto.Usage {
return oairesponses.NormalizeResponsesUsage(src)
}
func ExtractOutputTextFromResponses(resp *dto.OpenAIResponsesResponse) string {
return oairesponses.ExtractOutputTextFromResponses(resp)
}
func ExtractReasoningTextFromResponses(resp *dto.OpenAIResponsesResponse) string {
return oairesponses.ExtractReasoningTextFromResponses(resp)
}
func NewResponsesToChatStreamState(model string, includeUsage bool) *ResponsesToChatStreamState {
return oairesponses.NewResponsesToChatStreamState(model, includeUsage)
}
func ResponsesStreamEventToChatChunks(event *dto.ResponsesStreamResponse, state *ResponsesToChatStreamState) ([]dto.ChatCompletionsStreamResponse, error) {
return oairesponses.ResponsesStreamEventToChatChunks(event, state)
}
func FinalizeResponsesToChatStream(state *ResponsesToChatStreamState) []dto.ChatCompletionsStreamResponse {
return oairesponses.FinalizeResponsesToChatStream(state)
}
func NewResponsesBufferedAccumulator() *ResponsesBufferedAccumulator {
return oairesponses.NewResponsesBufferedAccumulator()
}